307 files changed, 70170 insertions, 23620 deletions

diff --git a/.gitignore b/.gitignore
index f0a5487..91e9be5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .project
 .settings
+.gitignore
 *.csproj
 *.csproj.user
 *.build
@@ -10,6 +11,7 @@
 *.pidb
 *.dll.build
 *.dll
+*.log
 *.VisualState.xml
 */*/obj
 */*/*/obj
@@ -23,6 +25,7 @@
 */*/*/*/*/bin
 */*/*/*/*/*/bin
 */*/*/*/*/*/*/bin
+addon-modules/
 bin/Debug/*.dll
 bin/*.dll.mdb
 bin/*.db
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index a75d10d..49fc566 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -70,6 +70,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
         private string m_name = "RemoteAdminPlugin";
         private string m_version = "0.0";
+        private string m_openSimVersion;
 
         public string Version
         {
@@ -89,6 +90,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
         public void Initialise(OpenSimBase openSim)
         {
+            m_openSimVersion = openSim.GetVersionText();
+
             m_configSource = openSim.ConfigSource.Source;
             try
             {
@@ -131,6 +134,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     availableMethods["admin_region_query"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcRegionQueryMethod);
                     availableMethods["admin_shutdown"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcShutdownMethod);
                     availableMethods["admin_broadcast"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAlertMethod);
+                    availableMethods["admin_dialog"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcDialogMethod);
                     availableMethods["admin_restart"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcRestartMethod);
                     availableMethods["admin_load_heightmap"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcLoadHeightmapMethod);
                     availableMethods["admin_save_heightmap"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcSaveHeightmapMethod);
@@ -156,6 +160,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     availableMethods["admin_acl_remove"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAccessListRemove);
                     availableMethods["admin_acl_list"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAccessListList);
 
+                    // Misc
+                    availableMethods["admin_refresh_search"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcRefreshSearch);
+                    availableMethods["admin_get_opensim_version"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcGetOpenSimVersion);
+
                     // Either enable full remote functionality or just selected features
                     string enabledMethods = m_config.GetString("enabled_methods", "all");
 
@@ -257,23 +265,101 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             {
                 m_log.Info("[RADMIN]: Request to restart Region.");
 
-                CheckRegionParams(requestData, responseData);
-
                 Scene rebootedScene = null;
-                GetSceneFromRegionParams(requestData, responseData, out rebootedScene);
+                bool restartAll = false;
+
+                IConfig startupConfig = m_configSource.Configs["Startup"];
+                if (startupConfig != null)
+                {
+                    if (startupConfig.GetBoolean("InworldRestartShutsDown", false))
+                    {
+                        rebootedScene = m_application.SceneManager.CurrentOrFirstScene;
+                        restartAll = true;
+                    }
+                }
+
+                if (rebootedScene == null)
+                {
+                    CheckRegionParams(requestData, responseData);
+
+                    GetSceneFromRegionParams(requestData, responseData, out rebootedScene);
+                }
+
+                IRestartModule restartModule = rebootedScene.RequestModuleInterface<IRestartModule>();
 
                 responseData["success"] = false;
                 responseData["accepted"] = true;
                 responseData["rebooting"] = true;
 
-                IRestartModule restartModule = rebootedScene.RequestModuleInterface<IRestartModule>();
-                if (restartModule != null)
+                string message;
+                List<int> times = new List<int>();
+
+                if (requestData.ContainsKey("alerts"))
                 {
-                    List<int> times = new List<int> { 30, 15 };
+                    string[] alertTimes = requestData["alerts"].ToString().Split( new char[] {','});
+                    if (alertTimes.Length == 1 && Convert.ToInt32(alertTimes[0]) == -1)
+                    {
+                        if (restartModule != null)
+                        {
+                            message = "Restart has been cancelled";
 
-                    restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), true);
-                    responseData["success"] = true;
+                            if (requestData.ContainsKey("message"))
+                                message = requestData["message"].ToString();
+
+                            restartModule.AbortRestart(message);
+
+                            responseData["success"] = true;
+                            responseData["rebooting"] = false;
+
+                            return;
+                        }
+                    }
+                    foreach (string a in alertTimes)
+                        times.Add(Convert.ToInt32(a));
                 }
+                else
+                {
+                    int timeout = 30;
+                    if (requestData.ContainsKey("milliseconds"))
+                        timeout = Int32.Parse(requestData["milliseconds"].ToString()) / 1000;
+                    while (timeout > 0)
+                    {
+                        times.Add(timeout);
+                        if (timeout > 300)
+                            timeout -= 120;
+                        else if (timeout > 30)
+                            timeout -= 30;
+                        else
+                            timeout -= 15;
+                    }
+                }
+
+                message = "Region is restarting in {0}. Please save what you are doing and log out.";
+
+                if (requestData.ContainsKey("message"))
+                    message = requestData["message"].ToString();
+
+                bool notice = true;
+                if (requestData.ContainsKey("noticetype")
+                    && ((string)requestData["noticetype"] == "dialog"))
+                {
+                    notice = false;
+                }
+
+                List<Scene> restartList;
+
+                if (restartAll)
+                    restartList = m_application.SceneManager.Scenes;
+                else
+                    restartList = new List<Scene>() { rebootedScene };
+
+                foreach (Scene s in m_application.SceneManager.Scenes)
+                {
+                    restartModule = s.RequestModuleInterface<IRestartModule>();
+                    if (restartModule != null)
+                        restartModule.ScheduleRestart(UUID.Zero, message, times.ToArray(), notice);
+                }
+                responseData["success"] = true;
             }
             catch (Exception e)
             {
@@ -310,6 +396,32 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             m_log.Info("[RADMIN]: Alert request complete");
         }
 
+        public void XmlRpcDialogMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)
+        {
+            Hashtable responseData = (Hashtable)response.Value;
+
+            m_log.Info("[RADMIN]: Dialog request started");
+
+            Hashtable requestData = (Hashtable)request.Params[0];
+
+            string message = (string)requestData["message"];
+            string fromuuid = (string)requestData["from"];
+            m_log.InfoFormat("[RADMIN]: Broadcasting: {0}", message);
+
+            responseData["accepted"] = true;
+            responseData["success"] = true;
+
+            m_application.SceneManager.ForEachScene(
+                delegate(Scene scene)
+                {
+                    IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
+                    if (dialogModule != null)
+                        dialogModule.SendNotificationToUsersInRegion(UUID.Zero, fromuuid, message);
+                });
+
+            m_log.Info("[RADMIN]: Dialog request complete");
+        }
+
         private void XmlRpcLoadHeightmapMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)
         {
             m_log.Info("[RADMIN]: Load height maps request started");
@@ -398,13 +510,32 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 message = "Region is going down now.";
             }
 
-            m_application.SceneManager.ForEachScene(
+            if (requestData.ContainsKey("noticetype")
+                && ((string) requestData["noticetype"] == "dialog"))
+            {
+                m_application.SceneManager.ForEachScene(
+
                 delegate(Scene scene)
+                {
+                    IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
+                    if (dialogModule != null)
+                            dialogModule.SendNotificationToUsersInRegion(UUID.Zero, "System", message);
+                });
+            }
+            else
+            {
+                if (!requestData.ContainsKey("noticetype")
+                    || ((string)requestData["noticetype"] != "none"))
+                {
+                    m_application.SceneManager.ForEachScene(
+                    delegate(Scene scene)
                     {
                         IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
                         if (dialogModule != null)
                             dialogModule.SendGeneralAlert(message);
                     });
+                }
+            }
 
             // Perform shutdown
             System.Timers.Timer shutdownTimer = new System.Timers.Timer(timeout); // Wait before firing
@@ -1576,21 +1707,31 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
         private void XmlRpcRegionQueryMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)
         {
-            m_log.Info("[RADMIN]: Received Query XML Administrator Request");
-
             Hashtable responseData = (Hashtable)response.Value;
             Hashtable requestData = (Hashtable)request.Params[0];
 
+            int flags = 0;
+            string text = String.Empty;
+            int health = 0;
+            responseData["success"] = true;
+
             CheckRegionParams(requestData, responseData);
 
             Scene scene = null;
-            GetSceneFromRegionParams(requestData, responseData, out scene);
-
-            int health = scene.GetHealth();
-            responseData["health"] = health;
+            try
+            {
+                GetSceneFromRegionParams(requestData, responseData, out scene);
+                health = scene.GetHealth(out flags, out text);
+            }
+            catch (Exception e)
+            {
+                responseData["error"] = null;
+            }
 
             responseData["success"] = true;
-            m_log.Info("[RADMIN]: Query XML Administrator Request complete");
+            responseData["health"] = health;
+            responseData["flags"] = flags;
+            responseData["message"] = text;
         }
 
         private void XmlRpcConsoleCommandMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)
@@ -1814,6 +1955,44 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             responseData["success"] = true;
         }
 
+        private void XmlRpcRefreshSearch(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)
+        {
+            m_log.Info("[RADMIN]: Received Refresh Search Request");
+
+            Hashtable responseData = (Hashtable)response.Value;
+            Hashtable requestData = (Hashtable)request.Params[0];
+
+            CheckRegionParams(requestData, responseData);
+
+            Scene scene = null;
+            GetSceneFromRegionParams(requestData, responseData, out scene);
+
+            ISearchModule searchModule = scene.RequestModuleInterface<ISearchModule>();
+            if (searchModule != null)
+            {
+                searchModule.Refresh();
+                responseData["success"] = true;
+            }
+            else
+            {
+                responseData["success"] = false;
+            }
+
+            m_log.Info("[RADMIN]: Refresh Search Request complete");
+        }
+
+        private void XmlRpcGetOpenSimVersion(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)
+        {
+            m_log.Info("[RADMIN]: Received Get OpenSim Version Request");
+
+            Hashtable responseData = (Hashtable)response.Value;
+
+            responseData["version"] = m_openSimVersion;
+            responseData["success"] = true;
+
+            m_log.Info("[RADMIN]: Get OpenSim Version Request complete");
+        }
+
         /// <summary>
         /// Parse a float with the given parameter name from a request data hash table.
         /// </summary>
diff --git a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs
index 720640e..ec574a3 100644
--- a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs
@@ -45,16 +45,54 @@ namespace OpenSim.Capabilities.Handlers
 {
     public class GetMeshHandler 
     {
-//        private static readonly ILog m_log =
-//            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log =
+                   LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         private IAssetService m_assetService;
 
+        public const string DefaultFormat = "vnd.ll.mesh";
+        
         public GetMeshHandler(IAssetService assService)
         {
             m_assetService = assService;
         }
+        public Hashtable Handle(Hashtable request)
+        {
+            Hashtable ret = new Hashtable();
+            ret["int_response_code"] = (int)System.Net.HttpStatusCode.NotFound;
+            ret["content_type"] = "text/plain";
+            ret["keepalive"] = false;
+            ret["reusecontext"] = false;
+            ret["int_bytes"] = 0;
+            ret["int_lod"] = 0;
+            string MeshStr = (string)request["mesh_id"];
+            
+
+            //m_log.DebugFormat("[GETMESH]: called {0}", MeshStr);
+
+            if (m_assetService == null)
+            {
+                m_log.Error("[GETMESH]: Cannot fetch mesh " + MeshStr + " without an asset service");
+            }
+
+            UUID meshID;
+            if (!String.IsNullOrEmpty(MeshStr) && UUID.TryParse(MeshStr, out meshID))
+            {
+                //                m_log.DebugFormat("[GETMESH]: Received request for mesh id {0}", meshID);
 
+               
+                ret = ProcessGetMesh(request, UUID.Zero, null);
+                       
+                
+            }
+            else
+            {
+                m_log.Warn("[GETMESH]: Failed to parse a mesh_id from GetMesh request: " + (string)request["uri"]);
+            }
+
+            
+            return ret;
+        }
         public Hashtable ProcessGetMesh(Hashtable request, UUID AgentId, Caps cap)
         {
             Hashtable responsedata = new Hashtable();
@@ -62,6 +100,9 @@ namespace OpenSim.Capabilities.Handlers
             responsedata["content_type"] = "text/plain";
             responsedata["keepalive"] = false;
             responsedata["str_response_string"] = "Request wasn't what was expected";
+            responsedata["reusecontext"] = false;
+            responsedata["int_lod"] = 0;
+            responsedata["int_bytes"] = 0;
 
             string meshStr = string.Empty;
 
@@ -77,6 +118,7 @@ namespace OpenSim.Capabilities.Handlers
                     responsedata["content_type"] = "text/plain";
                     responsedata["keepalive"] = false;
                     responsedata["str_response_string"] = "The asset service is unavailable.  So is your mesh.";
+                    responsedata["reusecontext"] = false;
                     return responsedata;
                 }
 
@@ -86,9 +128,100 @@ namespace OpenSim.Capabilities.Handlers
                 {
                     if (mesh.Type == (SByte)AssetType.Mesh)
                     {
-                        responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data);
-                        responsedata["content_type"] = "application/vnd.ll.mesh";
-                        responsedata["int_response_code"] = 200;
+
+                        Hashtable headers = new Hashtable();
+                        responsedata["headers"] = headers;
+
+                        string range = String.Empty;
+
+                        if (((Hashtable)request["headers"])["range"] != null)
+                            range = (string)((Hashtable)request["headers"])["range"];
+
+                        else if (((Hashtable)request["headers"])["Range"] != null)
+                            range = (string)((Hashtable)request["headers"])["Range"];
+
+                        if (!String.IsNullOrEmpty(range)) // Mesh Asset LOD // Physics
+                        {
+                             // Range request
+                            int start, end;
+                            if (TryParseRange(range, out start, out end))
+                            {
+                                 // Before clamping start make sure we can satisfy it in order to avoid
+                    // sending back the last byte instead of an error status
+                                if (start >= mesh.Data.Length)
+                                {
+                                    responsedata["int_response_code"] = 404; //501; //410; //404;
+                                    responsedata["content_type"] = "text/plain";
+                                    responsedata["keepalive"] = false;
+                                    responsedata["str_response_string"] = "This range doesnt exist.";
+                                    responsedata["reusecontext"] = false;
+                                    responsedata["int_lod"] = 3;
+                                    return responsedata;
+                                }
+                                else
+                                {
+                                    end = Utils.Clamp(end, 0, mesh.Data.Length - 1);
+                                    start = Utils.Clamp(start, 0, end);
+                                    int len = end - start + 1;
+
+                                    //m_log.Debug("Serving " + start + " to " + end + " of " + texture.Data.Length + " bytes for texture " + texture.ID);
+
+                                    if (start > 20000)
+                                    {
+                                        responsedata["int_lod"] = 3;
+                                    }
+                                    else if (start < 4097)
+                                    {
+                                        responsedata["int_lod"] = 1;
+                                    }
+                                    else
+                                    {
+                                        responsedata["int_lod"] = 2;
+                                    }
+
+                                    
+                                    if (start == 0 && len == mesh.Data.Length) // well redudante maybe
+                                    {
+                                        responsedata["int_response_code"] = (int) System.Net.HttpStatusCode.OK;
+                                        responsedata["bin_response_data"] = mesh.Data;
+                                        responsedata["int_bytes"] = mesh.Data.Length;
+                                        responsedata["reusecontext"] = false;
+                                        responsedata["int_lod"] = 3;
+                                        
+                                    }
+                                    else
+                                    {
+                                        responsedata["int_response_code"] =
+                                            (int) System.Net.HttpStatusCode.PartialContent;
+                                        headers["Content-Range"] = String.Format("bytes {0}-{1}/{2}", start, end,
+                                                                                 mesh.Data.Length);
+
+                                        byte[] d = new byte[len];
+                                        Array.Copy(mesh.Data, start, d, 0, len);
+                                        responsedata["bin_response_data"] = d;
+                                        responsedata["int_bytes"] = len;
+                                        responsedata["reusecontext"] = false;
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                m_log.Warn("[GETMESH]: Failed to parse a range from GetMesh request, sending full asset: " + (string)request["uri"]);
+                                responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data);
+                                responsedata["content_type"] = "application/vnd.ll.mesh";
+                                responsedata["int_response_code"] = 200;
+                                responsedata["reusecontext"] = false;
+                                responsedata["int_lod"] = 3;
+                            }
+                        }
+                        else
+                        {
+                            responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data);
+                            responsedata["content_type"] = "application/vnd.ll.mesh";
+                            responsedata["int_response_code"] = 200;
+                            responsedata["reusecontext"] = false;
+                            responsedata["int_lod"] = 3;
+                        }
                     }
                     // Optionally add additional mesh types here
                     else
@@ -97,6 +230,8 @@ namespace OpenSim.Capabilities.Handlers
                         responsedata["content_type"] = "text/plain";
                         responsedata["keepalive"] = false;
                         responsedata["str_response_string"] = "Unfortunately, this asset isn't a mesh.";
+                        responsedata["reusecontext"] = false;
+                        responsedata["int_lod"] = 1;
                         return responsedata;
                     }
                 }
@@ -106,11 +241,28 @@ namespace OpenSim.Capabilities.Handlers
                     responsedata["content_type"] = "text/plain";
                     responsedata["keepalive"] = false;
                     responsedata["str_response_string"] = "Your Mesh wasn't found.  Sorry!";
+                    responsedata["reusecontext"] = false;
+                    responsedata["int_lod"] = 0;
                     return responsedata;
                 }
             }
 
             return responsedata;
         }
+        private bool TryParseRange(string header, out int start, out int end)
+        {
+            if (header.StartsWith("bytes="))
+            {
+                string[] rangeValues = header.Substring(6).Split('-');
+                if (rangeValues.Length == 2)
+                {
+                    if (Int32.TryParse(rangeValues[0], out start) && Int32.TryParse(rangeValues[1], out end))
+                        return true;
+                }
+            }
+
+            start = end = 0;
+            return false;
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
index b497fde..aa6203b 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
@@ -47,36 +47,36 @@ using Caps = OpenSim.Framework.Capabilities.Caps;
 
 namespace OpenSim.Capabilities.Handlers
 {
-    public class GetTextureHandler : BaseStreamHandler
+    public class GetTextureHandler
     {
         private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         private IAssetService m_assetService;
 
         public const string DefaultFormat = "x-j2c";
 
-        // TODO: Change this to a config option
-        const string REDIRECT_URL = null;
-
-        public GetTextureHandler(string path, IAssetService assService, string name, string description)
-            : base("GET", path, name, description)
+        public GetTextureHandler(IAssetService assService)
         {
             m_assetService = assService;
         }
 
-        public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        public Hashtable Handle(Hashtable request)
         {
-            // Try to parse the texture ID from the request URL
-            NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query);
-            string textureStr = query.GetOne("texture_id");
-            string format = query.GetOne("format");
+            Hashtable ret = new Hashtable();
+            ret["int_response_code"] = (int)System.Net.HttpStatusCode.NotFound;
+            ret["content_type"] = "text/plain";
+            ret["keepalive"] = false;
+            ret["reusecontext"] = false;
+            ret["int_bytes"] = 0;
+            string textureStr = (string)request["texture_id"];
+            string format = (string)request["format"];
 
             //m_log.DebugFormat("[GETTEXTURE]: called {0}", textureStr);
 
             if (m_assetService == null)
             {
                 m_log.Error("[GETTEXTURE]: Cannot fetch texture " + textureStr + " without an asset service");
-                httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
             }
 
             UUID textureID;
@@ -91,30 +91,41 @@ namespace OpenSim.Capabilities.Handlers
                 }
                 else
                 {
-                    formats = WebUtil.GetPreferredImageTypes(httpRequest.Headers.Get("Accept"));
+                    formats = new string[1] { DefaultFormat }; // default
+                    if (((Hashtable)request["headers"])["Accept"] != null)
+                        formats = WebUtil.GetPreferredImageTypes((string)((Hashtable)request["headers"])["Accept"]);
                     if (formats.Length == 0)
                         formats = new string[1] { DefaultFormat }; // default
 
                 }
                 // OK, we have an array with preferred formats, possibly with only one entry
-
-                httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
+                bool foundtexture = false;
                 foreach (string f in formats)
                 {
-                    if (FetchTexture(httpRequest, httpResponse, textureID, f))
+                    foundtexture = FetchTexture(request, ret, textureID, f);
+                    if (foundtexture)
                         break;
                 }
+                if (!foundtexture)
+                {
+                    ret["int_response_code"] = 404;
+                    ret["error_status_text"] = "not found";
+                    ret["str_response_string"] = "not found";
+                    ret["content_type"] = "text/plain";
+                    ret["keepalive"] = false;
+                    ret["reusecontext"] = false;
+                    ret["int_bytes"] = 0;
+                }
             }
             else
             {
-                m_log.Warn("[GETTEXTURE]: Failed to parse a texture_id from GetTexture request: " + httpRequest.Url);
+                m_log.Warn("[GETTEXTURE]: Failed to parse a texture_id from GetTexture request: " + (string)request["uri"]);
             }
 
 //            m_log.DebugFormat(
 //                "[GETTEXTURE]: For texture {0} sending back response {1}, data length {2}",
 //                textureID, httpResponse.StatusCode, httpResponse.ContentLength);
-
-            return null;
+            return ret;
         }
 
         /// <summary>
@@ -125,7 +136,7 @@ namespace OpenSim.Capabilities.Handlers
         /// <param name="textureID"></param>
         /// <param name="format"></param>
         /// <returns>False for "caller try another codec"; true otherwise</returns>
-        private bool FetchTexture(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse, UUID textureID, string format)
+        private bool FetchTexture(Hashtable request, Hashtable response, UUID textureID, string format)
         {
 //            m_log.DebugFormat("[GETTEXTURE]: {0} with requested format {1}", textureID, format);
             AssetBase texture;
@@ -134,84 +145,69 @@ namespace OpenSim.Capabilities.Handlers
             if (format != DefaultFormat)
                 fullID = fullID + "-" + format;
 
-            if (!String.IsNullOrEmpty(REDIRECT_URL))
+            // try the cache
+            texture = m_assetService.GetCached(fullID);
+
+            if (texture == null)
             {
-                // Only try to fetch locally cached textures. Misses are redirected
-                texture = m_assetService.GetCached(fullID);
+                //m_log.DebugFormat("[GETTEXTURE]: texture was not in the cache");
+
+                // Fetch locally or remotely. Misses return a 404
+                texture = m_assetService.Get(textureID.ToString());
 
                 if (texture != null)
                 {
                     if (texture.Type != (sbyte)AssetType.Texture)
+                        return true;
+
+                    if (format == DefaultFormat)
                     {
-                        httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
+                        WriteTextureData(request, response, texture, format);
                         return true;
                     }
-                    WriteTextureData(httpRequest, httpResponse, texture, format);
-                }
-                else
-                {
-                    string textureUrl = REDIRECT_URL + textureID.ToString();
-                    m_log.Debug("[GETTEXTURE]: Redirecting texture request to " + textureUrl);
-                    httpResponse.RedirectLocation = textureUrl;
-                    return true;
-                }
-            }
-            else // no redirect
-            {
-                // try the cache
-                texture = m_assetService.GetCached(fullID);
-
-                if (texture == null)
-                {
-//                    m_log.DebugFormat("[GETTEXTURE]: texture was not in the cache");
-
-                    // Fetch locally or remotely. Misses return a 404
-                    texture = m_assetService.Get(textureID.ToString());
-
-                    if (texture != null)
+                    else
                     {
-                        if (texture.Type != (sbyte)AssetType.Texture)
-                        {
-                            httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
-                            return true;
-                        }
-                        if (format == DefaultFormat)
-                        {
-                            WriteTextureData(httpRequest, httpResponse, texture, format);
-                            return true;
-                        }
-                        else
-                        {
-                            AssetBase newTexture = new AssetBase(texture.ID + "-" + format, texture.Name, (sbyte)AssetType.Texture, texture.Metadata.CreatorID);
-                            newTexture.Data = ConvertTextureData(texture, format);
-                            if (newTexture.Data.Length == 0)
-                                return false; // !!! Caller try another codec, please!
-
-                            newTexture.Flags = AssetFlags.Collectable;
-                            newTexture.Temporary = true;
-                            m_assetService.Store(newTexture);
-                            WriteTextureData(httpRequest, httpResponse, newTexture, format);
-                            return true;
-                        }
+                        AssetBase newTexture = new AssetBase(texture.ID + "-" + format, texture.Name, (sbyte)AssetType.Texture, texture.Metadata.CreatorID);
+                        newTexture.Data = ConvertTextureData(texture, format);
+                        if (newTexture.Data.Length == 0)
+                            return false; // !!! Caller try another codec, please!
+
+                        newTexture.Flags = AssetFlags.Collectable;
+                        newTexture.Temporary = true;
+                        m_assetService.Store(newTexture);
+                        WriteTextureData(request, response, newTexture, format);
+                        return true;
                     }
-               }
-               else // it was on the cache
-               {
-//                   m_log.DebugFormat("[GETTEXTURE]: texture was in the cache");
-                   WriteTextureData(httpRequest, httpResponse, texture, format);
-                   return true;
-               }
-            }
-
+                }
+           }
+           else // it was on the cache
+           {
+               //m_log.DebugFormat("[GETTEXTURE]: texture was in the cache");
+               WriteTextureData(request, response, texture, format);
+               return true;
+           }
+
+            //response = new Hashtable();
+
+           
+            //WriteTextureData(request,response,null,format);
             // not found
-//            m_log.Warn("[GETTEXTURE]: Texture " + textureID + " not found");
-            httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
-            return true;
+            //m_log.Warn("[GETTEXTURE]: Texture " + textureID + " not found");
+            return false;
         }
 
-        private void WriteTextureData(IOSHttpRequest request, IOSHttpResponse response, AssetBase texture, string format)
+        private void WriteTextureData(Hashtable request, Hashtable response, AssetBase texture, string format)
         {
-            string range = request.Headers.GetOne("Range");
+            Hashtable headers = new Hashtable();
+            response["headers"] = headers;
+
+            string range = String.Empty;
+
+            if (((Hashtable)request["headers"])["range"] != null)
+                range = (string)((Hashtable)request["headers"])["range"];
+
+            else if (((Hashtable)request["headers"])["Range"] != null)
+                range = (string)((Hashtable)request["headers"])["Range"];
 
             if (!String.IsNullOrEmpty(range)) // JP2's only
             {
@@ -239,10 +235,8 @@ namespace OpenSim.Capabilities.Handlers
                         // However, if we return PartialContent (or OK) instead, the viewer will display that resolution.
 
 //                        response.StatusCode = (int)System.Net.HttpStatusCode.RequestedRangeNotSatisfiable;
-//                        response.AddHeader("Content-Range", String.Format("bytes */{0}", texture.Data.Length));
-//                        response.StatusCode = (int)System.Net.HttpStatusCode.OK;
-                        response.StatusCode = (int)System.Net.HttpStatusCode.PartialContent;
-                        response.ContentType = texture.Metadata.ContentType;
+                        // viewers don't seem to handle RequestedRangeNotSatisfiable and keep retrying with same parameters
+                        response["int_response_code"] = (int)System.Net.HttpStatusCode.NotFound;
                     }
                     else
                     {
@@ -257,41 +251,46 @@ namespace OpenSim.Capabilities.Handlers
 
 //                        m_log.Debug("Serving " + start + " to " + end + " of " + texture.Data.Length + " bytes for texture " + texture.ID);
 
-                        // Always return PartialContent, even if the range covered the entire data length
-                        // We were accidentally sending back 404 before in this situation
-                        // https://issues.apache.org/bugzilla/show_bug.cgi?id=51878 supports sending 206 even if the
-                        // entire range is requested, and viewer 3.2.2 (and very probably earlier) seems fine with this.
-                        //
-                        // We also do not want to send back OK even if the whole range was satisfiable since this causes
-                        // HTTP textures on at least Imprudence 1.4.0-beta2 to never display the final texture quality.
-//                        if (end > maxEnd)
-//                            response.StatusCode = (int)System.Net.HttpStatusCode.OK;
-//                        else
-                        response.StatusCode = (int)System.Net.HttpStatusCode.PartialContent;
-
-                        response.ContentLength = len;
-                        response.ContentType = texture.Metadata.ContentType;
-                        response.AddHeader("Content-Range", String.Format("bytes {0}-{1}/{2}", start, end, texture.Data.Length));
-    
-                        response.Body.Write(texture.Data, start, len);
+                        response["content-type"] = texture.Metadata.ContentType;
+
+                        if (start == 0 && len == texture.Data.Length) // well redudante maybe
+                        {
+                            response["int_response_code"] = (int)System.Net.HttpStatusCode.OK;
+                            response["bin_response_data"] = texture.Data;
+                            response["int_bytes"] = texture.Data.Length;
+                        }
+                        else
+                        {
+                            response["int_response_code"] = (int)System.Net.HttpStatusCode.PartialContent;
+                            headers["Content-Range"] = String.Format("bytes {0}-{1}/{2}", start, end, texture.Data.Length);
+
+                            byte[] d = new byte[len];
+                            Array.Copy(texture.Data, start, d, 0, len);
+                            response["bin_response_data"] = d;
+                            response["int_bytes"] = len;
+                        }
+//                        response.Body.Write(texture.Data, start, len);
                     }
                 }
                 else
                 {
                     m_log.Warn("[GETTEXTURE]: Malformed Range header: " + range);
-                    response.StatusCode = (int)System.Net.HttpStatusCode.BadRequest;
+                    response["int_response_code"] = (int)System.Net.HttpStatusCode.BadRequest;
                 }
             }
             else // JP2's or other formats
             {
                 // Full content request
-                response.StatusCode = (int)System.Net.HttpStatusCode.OK;
-                response.ContentLength = texture.Data.Length;
+                response["int_response_code"] = (int)System.Net.HttpStatusCode.OK;
                 if (format == DefaultFormat)
-                    response.ContentType = texture.Metadata.ContentType;
+                    response["content_type"] = texture.Metadata.ContentType;
                 else
-                    response.ContentType = "image/" + format;
-                response.Body.Write(texture.Data, 0, texture.Data.Length);
+                    response["content_type"] = "image/" + format;
+                
+                response["bin_response_data"] = texture.Data;
+                response["int_bytes"] = texture.Data.Length;
+
+//                response.Body.Write(texture.Data, 0, texture.Data.Length);
             }
 
 //            if (response.StatusCode < 200 || response.StatusCode > 299)
@@ -423,4 +422,4 @@ namespace OpenSim.Capabilities.Handlers
             return null;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs
index 71cf033..bf66acb 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs
@@ -33,6 +33,7 @@ using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Server.Handlers.Base;
 using OpenMetaverse;
 
+/*
 namespace OpenSim.Capabilities.Handlers
 {
     public class GetTextureServerConnector : ServiceConnector
@@ -63,7 +64,8 @@ namespace OpenSim.Capabilities.Handlers
                 throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName));
 
             server.AddStreamHandler(
-                new GetTextureHandler("/CAPS/GetTexture/" /*+ UUID.Random() */, m_AssetService, "GetTexture", null));
+                new GetTextureHandler("/CAPS/GetTexture/", m_AssetService, "GetTexture", null));
         }
     }
-}
\ No newline at end of file
+}
+*/
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs b/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs
index d4d6d10..217a265 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs
@@ -39,6 +39,7 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
 
+/*
 namespace OpenSim.Capabilities.Handlers.GetTexture.Tests
 {
     [TestFixture]
@@ -60,4 +61,5 @@ namespace OpenSim.Capabilities.Handlers.GetTexture.Tests
             Assert.That(resp.StatusCode, Is.EqualTo((int)System.Net.HttpStatusCode.NotFound));
         }
     }
-}
\ No newline at end of file
+}
+*/
diff --git a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
index 8849a59..5536564 100644
--- a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Drawing;
 using System.Drawing.Imaging;
@@ -50,6 +51,7 @@ namespace OpenSim.Capabilities.Handlers
 {
     public class UploadBakedTextureHandler
     {
+      
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private Caps m_HostCapsObj;
@@ -79,9 +81,9 @@ namespace OpenSim.Capabilities.Handlers
             {
                 string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath;
                 string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
-
+                
                 BakedTextureUploader uploader =
-                    new BakedTextureUploader(capsBase + uploaderPath, m_HostCapsObj.HttpListener);
+                    new BakedTextureUploader(capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_HostCapsObj.AgentID);
                 uploader.OnUpLoad += BakedTextureUploaded;
 
                 m_HostCapsObj.HttpListener.AddStreamHandler(
@@ -117,7 +119,7 @@ namespace OpenSim.Capabilities.Handlers
         /// <param name="data"></param>
         private void BakedTextureUploaded(UUID assetID, byte[] data)
         {
-//            m_log.DebugFormat("[UPLOAD BAKED TEXTURE HANDLER]: Received baked texture {0}", assetID.ToString());
+            m_log.DebugFormat("[UPLOAD BAKED TEXTURE HANDLER]: Received baked texture {0}", assetID.ToString());
 
             AssetBase asset;
             asset = new AssetBase(assetID, "Baked Texture", (sbyte)AssetType.Texture, m_HostCapsObj.AgentID.ToString());
@@ -125,6 +127,7 @@ namespace OpenSim.Capabilities.Handlers
             asset.Temporary = true;
             asset.Local = !m_persistBakedTextures; // Local assets aren't persisted, non-local are
             m_assetService.Store(asset);
+            
         }
     }
 
@@ -137,15 +140,19 @@ namespace OpenSim.Capabilities.Handlers
         private string uploaderPath = String.Empty;
         private UUID newAssetID;
         private IHttpServer httpListener;
+        private UUID AgentId = UUID.Zero;
 
-        public BakedTextureUploader(string path, IHttpServer httpServer)
+        public BakedTextureUploader(string path, IHttpServer httpServer, UUID uUID)
         {
             newAssetID = UUID.Random();
             uploaderPath = path;
             httpListener = httpServer;
+            AgentId = uUID;
             //                m_log.InfoFormat("[CAPS] baked texture upload starting for {0}",newAssetID);
         }
 
+       
+
         /// <summary>
         /// Handle raw uploaded baked texture data.
         /// </summary>
diff --git a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
index 9a6ca86..11a2698 100644
--- a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
+++ b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
@@ -435,4 +435,4 @@ namespace OpenSim.Capabilities.Handlers
             return llsdItem;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Capabilities/LLSDAssetUploadComplete.cs b/OpenSim/Capabilities/LLSDAssetUploadComplete.cs
index ab6cee5..ae8eb09 100644
--- a/OpenSim/Capabilities/LLSDAssetUploadComplete.cs
+++ b/OpenSim/Capabilities/LLSDAssetUploadComplete.cs
@@ -30,12 +30,15 @@ using OpenMetaverse;
 
 namespace OpenSim.Framework.Capabilities
 {
+
     [LLSDType("MAP")]
     public class LLSDAssetUploadComplete
     {
         public string new_asset = String.Empty;
         public UUID new_inventory_item = UUID.Zero;
+//        public UUID new_texture_folder_id = UUID.Zero;
         public string state = String.Empty;
+        public LLSDAssetUploadError error = null;
         //public bool success = false;
 
         public LLSDAssetUploadComplete()
diff --git a/OpenSim/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Capabilities/LLSDAssetUploadRequest.cs
index 6e66f0a..6779cc1 100644
--- a/OpenSim/Capabilities/LLSDAssetUploadRequest.cs
+++ b/OpenSim/Capabilities/LLSDAssetUploadRequest.cs
@@ -31,14 +31,27 @@ using OpenMetaverse;
 namespace OpenSim.Framework.Capabilities
 {
     [OSDMap]
+    public class LLSDAssetResource
+    {
+        public OSDArray instance_list = new OSDArray();
+        public OSDArray texture_list = new OSDArray();
+        public OSDArray mesh_list = new OSDArray();
+        public string metric = String.Empty;
+    }
+
+    [OSDMap]
     public class LLSDAssetUploadRequest
     {
         public string asset_type = String.Empty;
         public string description = String.Empty;
         public UUID folder_id = UUID.Zero;
+        public UUID texture_folder_id = UUID.Zero;
+        public int next_owner_mask = 0;
+        public int group_mask = 0;
+        public int everyone_mask = 0;
         public string inventory_type = String.Empty;
         public string name = String.Empty;
-
+        public LLSDAssetResource asset_resources = new LLSDAssetResource();
         public LLSDAssetUploadRequest()
         {
         }
diff --git a/OpenSim/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Capabilities/LLSDAssetUploadResponse.cs
index 0d6f7f9..7c4bc97 100644
--- a/OpenSim/Capabilities/LLSDAssetUploadResponse.cs
+++ b/OpenSim/Capabilities/LLSDAssetUploadResponse.cs
@@ -26,20 +26,51 @@
  */
 
 using System;
+using OpenMetaverse;
 
 namespace OpenSim.Framework.Capabilities
 {
     [OSDMap]
+    public class LLSDAssetUploadError
+    {
+        public string message = String.Empty;
+        public UUID identifier = UUID.Zero;
+    }
+
+    [OSDMap]
+    public class LLSDAssetUploadResponsePricebrkDown
+    {
+        public int mesh_streaming;
+        public int mesh_physics;
+        public int mesh_instance;
+        public int texture;
+        public int model;
+    }
+
+    [OSDMap]
+    public class LLSDAssetUploadResponseData
+    {
+        public double resource_cost;
+        public double model_streaming_cost;
+        public double simulation_cost;
+        public double physics_cost;
+        public LLSDAssetUploadResponsePricebrkDown upload_price_breakdown = new LLSDAssetUploadResponsePricebrkDown();
+    }
+
+    [OSDMap]
     public class LLSDAssetUploadResponse
     {
         public string uploader = String.Empty;
         public string state = String.Empty;
-
+        public int upload_price = 0;
+        public LLSDAssetUploadResponseData data = null;
+        public LLSDAssetUploadError error = null;
         public LLSDAssetUploadResponse()
         {
         }
     }
 
+
     [OSDMap]
     public class LLSDNewFileAngentInventoryVariablePriceReplyResponse
     {
diff --git a/OpenSim/Data/AssetDataBase.cs b/OpenSim/Data/AssetDataBase.cs
index e1a810c..b4ae913 100644
--- a/OpenSim/Data/AssetDataBase.cs
+++ b/OpenSim/Data/AssetDataBase.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Data
     {
         public abstract AssetBase GetAsset(UUID uuid);
         
-        public abstract void StoreAsset(AssetBase asset);
+        public abstract bool StoreAsset(AssetBase asset);
         public abstract bool ExistsAsset(UUID uuid);
 
         public abstract List<AssetMetadata> FetchAssetMetadataSet(int start, int count);
diff --git a/OpenSim/Data/IAssetData.cs b/OpenSim/Data/IAssetData.cs
index f31b215c..0c8eadd 100644
--- a/OpenSim/Data/IAssetData.cs
+++ b/OpenSim/Data/IAssetData.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Data
     public interface IAssetDataPlugin : IPlugin
     {
         AssetBase GetAsset(UUID uuid);
-        void StoreAsset(AssetBase asset);
+        bool StoreAsset(AssetBase asset);
         bool ExistsAsset(UUID uuid);
         List<AssetMetadata> FetchAssetMetadataSet(int start, int count);
         void Initialise(string connect);
diff --git a/OpenSim/Data/IUserAccountData.cs b/OpenSim/Data/IUserAccountData.cs
index 906ba6c..bc7eda7 100644
--- a/OpenSim/Data/IUserAccountData.cs
+++ b/OpenSim/Data/IUserAccountData.cs
@@ -50,5 +50,6 @@ namespace OpenSim.Data
         bool Store(UserAccountData data);
         bool Delete(string field, string val);
         UserAccountData[] GetUsers(UUID scopeID, string query);
+        UserAccountData[] GetUsersWhere(UUID scopeID, string where);
     }
 }
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
index c7488d8..c882555 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
@@ -143,7 +143,7 @@ namespace OpenSim.Data.MSSQL
         /// Create asset in m_database
         /// </summary>
         /// <param name="asset">the asset</param>
-        override public void StoreAsset(AssetBase asset)
+        override public bool StoreAsset(AssetBase asset)
         {
            
             string sql =
@@ -192,10 +192,12 @@ namespace OpenSim.Data.MSSQL
                 try
                 {
                     command.ExecuteNonQuery();
+                    return true;
                 }
                 catch(Exception e)
                 {
                     m_log.Error("[ASSET DB]: Error storing item :" + e.Message);
+                    return false;
                 }
             }
         }
diff --git a/OpenSim/Data/MSSQL/MSSQLAvatarData.cs b/OpenSim/Data/MSSQL/MSSQLAvatarData.cs
index 301b424..49a6b09 100644
--- a/OpenSim/Data/MSSQL/MSSQLAvatarData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAvatarData.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Data.MSSQL
     public class MSSQLAvatarData : MSSQLGenericTableHandler<AvatarBaseData>,
             IAvatarData
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         public MSSQLAvatarData(string connectionString, string realm) :
                 base(connectionString, realm, "Avatar")
diff --git a/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs b/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
index 4145d95..8f471c4 100644
--- a/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGenericTableHandler.cs
@@ -40,8 +40,8 @@ namespace OpenSim.Data.MSSQL
 {
     public class MSSQLGenericTableHandler<T> where T : class, new()
     {
-//        private static readonly ILog m_log =
-//            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         protected string m_ConnectionString;
         protected MSSQLManager m_database; //used for parameter type translation
diff --git a/OpenSim/Data/MSSQL/MSSQLGridUserData.cs b/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
index 9e215f9..1870273 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Data.MSSQL
     public class MSSQLGridUserData : MSSQLGenericTableHandler<GridUserData>,
             IGridUserData
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public MSSQLGridUserData(string connectionString, string realm) :
             base(connectionString, realm, "GridUserStore")
diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs
index 9a0015c..62c38d3 100644
--- a/OpenSim/Data/MSSQL/MSSQLManager.cs
+++ b/OpenSim/Data/MSSQL/MSSQLManager.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Data.MSSQL
     /// </summary>
     public class MSSQLManager
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         /// <summary>
         /// Connection string for ADO.net
@@ -185,6 +185,8 @@ namespace OpenSim.Data.MSSQL
             return parameter;
         }
 
+        private static readonly Dictionary<string, string> emptyDictionary = new Dictionary<string, string>();
+
         /// <summary>
         /// Checks if we need to do some migrations to the database
         /// </summary>
diff --git a/OpenSim/Data/MSSQL/MSSQLPresenceData.cs b/OpenSim/Data/MSSQL/MSSQLPresenceData.cs
index 0c71e79..deff2ed 100644
--- a/OpenSim/Data/MSSQL/MSSQLPresenceData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLPresenceData.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Data.MSSQL
     public class MSSQLPresenceData : MSSQLGenericTableHandler<PresenceData>,
             IPresenceData
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public MSSQLPresenceData(string connectionString, string realm) :
                 base(connectionString, realm, "Presence")
diff --git a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
index 476f57a..00af3a0 100644
--- a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
@@ -2226,6 +2226,11 @@ VALUES
             }
         }
 
+        public UUID[] GetObjectIDs(UUID regionID)
+        {
+            return new UUID[0];
+        }
+
         public void SaveExtra(UUID regionID, string name, string value)
         {
         }
diff --git a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
index 7feec91..dd0689c 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs
@@ -242,5 +242,10 @@ namespace OpenSim.Data.MSSQL
                 return DoQuery(cmd);
             }
         }
+
+        public UserAccountData[] GetUsersWhere(UUID scopeID, string where)
+        {
+            return null;
+        }
     }
 }
diff --git a/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs
index 9164ffe..e261aba 100644
--- a/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs
@@ -40,8 +40,8 @@ namespace OpenSim.Data.MSSQL
 {
     public class MSSQLXInventoryData : IXInventoryData
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(
-//                MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
 
         private MSSQLFolderHandler m_Folders;
         private MSSQLItemHandler m_Items;
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 73de64b..20df234 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -155,7 +155,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="asset">Asset UUID to create</param>
         /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks>
-        override public void StoreAsset(AssetBase asset)
+        override public bool StoreAsset(AssetBase asset)
         {
             lock (m_dbLock)
             {
@@ -201,12 +201,14 @@ namespace OpenSim.Data.MySQL
                                 cmd.Parameters.AddWithValue("?asset_flags", (int)asset.Flags);
                                 cmd.Parameters.AddWithValue("?data", asset.Data);
                                 cmd.ExecuteNonQuery();
+                                return true;
                             }
                         }
                         catch (Exception e)
                         {
                             m_log.ErrorFormat("[ASSET DB]: MySQL failure creating asset {0} with name \"{1}\". Error: {2}",
                                 asset.FullID, asset.Name, e.Message);
+                            return false;
                         }
                     }
                 }
@@ -370,4 +372,4 @@ namespace OpenSim.Data.MySQL
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
index 995c6a5..f6731c0 100644
--- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
+++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
@@ -175,6 +175,11 @@ namespace OpenSim.Data.MySQL
                                 int v = Convert.ToInt32(reader[name]);
                                 m_Fields[name].SetValue(row, v);
                             }
+                            else if (m_Fields[name].FieldType == typeof(uint))
+                            {
+                                uint v = Convert.ToUInt32(reader[name]);
+                                m_Fields[name].SetValue(row, v);
+                            }
                             else
                             {
                                 m_Fields[name].SetValue(row, reader[name]);
@@ -302,4 +307,4 @@ namespace OpenSim.Data.MySQL
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 9cc6f40..5320543 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Data.MySQL
         private string m_connectionString;
         private object m_dbLock = new object();
 
-        protected Assembly Assembly
+        protected virtual Assembly Assembly
         {
             get { return GetType().Assembly; }
         }
@@ -66,7 +66,7 @@ namespace OpenSim.Data.MySQL
             Initialise(connectionString);
         }
 
-        public void Initialise(string connectionString)
+        public virtual void Initialise(string connectionString)
         {
             m_connectionString = connectionString;
 
@@ -113,7 +113,7 @@ namespace OpenSim.Data.MySQL
 
         public void Dispose() {}
 
-        public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
+        public virtual void StoreObject(SceneObjectGroup obj, UUID regionUUID)
         {
             uint flags = obj.RootPart.GetEffectiveObjectFlags();
 
@@ -173,9 +173,10 @@ namespace OpenSim.Data.MySQL
                                     "ParticleSystem, ClickAction, Material, " +
                                     "CollisionSound, CollisionSoundVolume, " +
                                     "PassTouches, " +
-                                    "LinkNumber, MediaURL, DynAttrs, " +
+                                    "PassCollisions, " +
+                                    "LinkNumber, MediaURL, KeyframeMotion, " +
                                     "PhysicsShapeType, Density, GravityModifier, " +
-                                    "Friction, Restitution " +
+                                    "Friction, Restitution, Vehicle, DynAttrs " +
                                     ") values (" + "?UUID, " +
                                     "?CreationDate, ?Name, ?Text, " +
                                     "?Description, ?SitName, ?TouchName, " +
@@ -207,10 +208,10 @@ namespace OpenSim.Data.MySQL
                                     "?SaleType, ?ColorR, ?ColorG, " +
                                     "?ColorB, ?ColorA, ?ParticleSystem, " +
                                     "?ClickAction, ?Material, ?CollisionSound, " +
-                                    "?CollisionSoundVolume, ?PassTouches, " +
-                                    "?LinkNumber, ?MediaURL, ?DynAttrs, " +
+                                    "?CollisionSoundVolume, ?PassTouches, ?PassCollisions, " +
+                                    "?LinkNumber, ?MediaURL, ?KeyframeMotion, " +
                                     "?PhysicsShapeType, ?Density, ?GravityModifier, " +
-                                    "?Friction, ?Restitution)";
+                                    "?Friction, ?Restitution, ?Vehicle, ?DynAttrs)";
 
                             FillPrimCommand(cmd, prim, obj.UUID, regionUUID);
 
@@ -250,7 +251,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public void RemoveObject(UUID obj, UUID regionUUID)
+        public virtual void RemoveObject(UUID obj, UUID regionUUID)
         {
 //            m_log.DebugFormat("[REGION DB]: Deleting scene object {0} from {1} in database", obj, regionUUID);
             
@@ -399,7 +400,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public List<SceneObjectGroup> LoadObjects(UUID regionID)
+        public virtual List<SceneObjectGroup> LoadObjects(UUID regionID)
         {
             const int ROWS_PER_QUERY = 5000;
 
@@ -455,7 +456,11 @@ namespace OpenSim.Data.MySQL
             foreach (SceneObjectPart prim in prims.Values)
             {
                 if (prim.ParentUUID == UUID.Zero)
+                {
                     objects[prim.UUID] = new SceneObjectGroup(prim);
+                    if (prim.KeyframeMotion != null)
+                        prim.KeyframeMotion.UpdateSceneObject(objects[prim.UUID]);
+                }
             }
 
             // Add all of the children objects to the SOGs
@@ -568,36 +573,51 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public void StoreTerrain(double[,] ter, UUID regionID)
+        public virtual void StoreTerrain(double[,] ter, UUID regionID)
         {
-            m_log.Info("[REGION DB]: Storing terrain");
-
-            lock (m_dbLock)
+            Util.FireAndForget(delegate(object x)
             {
-                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
-                {
-                    dbcon.Open();
+                double[,] oldTerrain = LoadTerrain(regionID);
 
-                    using (MySqlCommand cmd = dbcon.CreateCommand())
+                m_log.Info("[REGION DB]: Storing terrain");
+
+                lock (m_dbLock)
+                {
+                    using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
                     {
-                        cmd.CommandText = "delete from terrain where RegionUUID = ?RegionUUID";
-                        cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
+                        dbcon.Open();
 
-                        ExecuteNonQuery(cmd);
+                        using (MySqlCommand cmd = dbcon.CreateCommand())
+                        {
+                            cmd.CommandText = "delete from terrain where RegionUUID = ?RegionUUID";
+                            cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
 
-                        cmd.CommandText = "insert into terrain (RegionUUID, " +
-                            "Revision, Heightfield) values (?RegionUUID, " +
-                            "1, ?Heightfield)";
- 
-                        cmd.Parameters.AddWithValue("Heightfield", SerializeTerrain(ter));
+                            using (MySqlCommand cmd2 = dbcon.CreateCommand())
+                            {
+                                try
+                                {
+                                    cmd2.CommandText = "insert into terrain (RegionUUID, " +
+                                            "Revision, Heightfield) values (?RegionUUID, " +
+                                            "1, ?Heightfield)";
 
-                        ExecuteNonQuery(cmd);
+                                    cmd2.Parameters.AddWithValue("RegionUUID", regionID.ToString());
+                                    cmd2.Parameters.AddWithValue("Heightfield", SerializeTerrain(ter, oldTerrain));
+
+                                    ExecuteNonQuery(cmd);
+                                    ExecuteNonQuery(cmd2);
+                                }
+                                catch (Exception e)
+                                {
+                                    m_log.ErrorFormat(e.ToString());
+                                }
+                            }
+                        }
                     }
                 }
-            }
+            });
         }
 
-        public double[,] LoadTerrain(UUID regionID)
+        public virtual double[,] LoadTerrain(UUID regionID)
         {
             double[,] terrain = null;
 
@@ -647,7 +667,7 @@ namespace OpenSim.Data.MySQL
             return terrain;
         }
 
-        public void RemoveLandObject(UUID globalID)
+        public virtual void RemoveLandObject(UUID globalID)
         {
             lock (m_dbLock)
             {
@@ -666,7 +686,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public void StoreLandObject(ILandObject parcel)
+        public virtual void StoreLandObject(ILandObject parcel)
         {
             lock (m_dbLock)
             {
@@ -723,7 +743,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
+        public virtual RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID)
         {
             RegionLightShareData nWP = new RegionLightShareData();
             nWP.OnSave += StoreRegionWindlightSettings;
@@ -824,7 +844,7 @@ namespace OpenSim.Data.MySQL
             return nWP;
         }
 
-        public RegionSettings LoadRegionSettings(UUID regionUUID)
+        public virtual RegionSettings LoadRegionSettings(UUID regionUUID)
         {
             RegionSettings rs = null;
 
@@ -864,7 +884,7 @@ namespace OpenSim.Data.MySQL
             return rs;
         }
 
-        public void StoreRegionWindlightSettings(RegionLightShareData wl)
+        public virtual void StoreRegionWindlightSettings(RegionLightShareData wl)
         {
             lock (m_dbLock)
             {
@@ -970,7 +990,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public void RemoveRegionWindlightSettings(UUID regionID)
+        public virtual void RemoveRegionWindlightSettings(UUID regionID)
         {
             lock (m_dbLock)
             {
@@ -1059,7 +1079,7 @@ namespace OpenSim.Data.MySQL
         }
         #endregion
 
-        public void StoreRegionSettings(RegionSettings rs)
+        public virtual void StoreRegionSettings(RegionSettings rs)
         {
             lock (m_dbLock)
             {
@@ -1086,7 +1106,7 @@ namespace OpenSim.Data.MySQL
                             "use_estate_sun, fixed_sun, sun_position, " +
                             "covenant, covenant_datetime, Sandbox, sunvectorx, sunvectory, " +
                             "sunvectorz, loaded_creation_datetime, " +
-                            "loaded_creation_id, map_tile_ID, " +
+                            "loaded_creation_id, map_tile_ID, block_search, casino, " +
                             "TelehubObject, parcel_tile_ID) " +
                              "values (?RegionUUID, ?BlockTerraform, " +
                             "?BlockFly, ?AllowDamage, ?RestrictPushing, " +
@@ -1103,7 +1123,7 @@ namespace OpenSim.Data.MySQL
                             "?SunPosition, ?Covenant, ?CovenantChangedDateTime, ?Sandbox, " +
                             "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
                             "?LoadedCreationDateTime, ?LoadedCreationID, " +
-                            "?TerrainImageID, " +
+                            "?TerrainImageID, ?block_search, ?casino, " +
                             "?TelehubObject, ?ParcelImageID)";
 
                         FillRegionSettingsCommand(cmd, rs);
@@ -1115,7 +1135,7 @@ namespace OpenSim.Data.MySQL
             SaveSpawnPoints(rs);
         }
 
-        public List<LandData> LoadLandObjects(UUID regionUUID)
+        public virtual List<LandData> LoadLandObjects(UUID regionUUID)
         {
             List<LandData> landData = new List<LandData>();
 
@@ -1297,6 +1317,7 @@ namespace OpenSim.Data.MySQL
             prim.CollisionSoundVolume = (float)(double)row["CollisionSoundVolume"];
             
             prim.PassTouches = ((sbyte)row["PassTouches"] != 0);
+            prim.PassCollisions = ((sbyte)row["PassCollisions"] != 0);
             prim.LinkNum = (int)row["LinkNumber"];
             
             if (!(row["MediaURL"] is System.DBNull))
@@ -1307,12 +1328,34 @@ namespace OpenSim.Data.MySQL
             else
                 prim.DynAttrs = new DAMap();        
 
+            if (!(row["KeyframeMotion"] is DBNull))
+            {
+                Byte[] data = (byte[])row["KeyframeMotion"];
+                if (data.Length > 0)
+                    prim.KeyframeMotion = KeyframeMotion.FromData(null, data);
+                else
+                    prim.KeyframeMotion = null;
+            }
+            else
+            {
+                prim.KeyframeMotion = null;
+            }
+
             prim.PhysicsShapeType = (byte)Convert.ToInt32(row["PhysicsShapeType"].ToString());
             prim.Density = (float)(double)row["Density"];
             prim.GravityModifier = (float)(double)row["GravityModifier"];
             prim.Friction = (float)(double)row["Friction"];
             prim.Restitution = (float)(double)row["Restitution"];
             
+            SOPVehicle vehicle = null;
+
+            if (row["Vehicle"].ToString() != String.Empty)
+            {
+                vehicle = SOPVehicle.FromXml2(row["Vehicle"].ToString());
+                if (vehicle != null)
+                    prim.VehicleParams = vehicle;
+            }
+
             return prim;
         }
 
@@ -1323,32 +1366,40 @@ namespace OpenSim.Data.MySQL
         /// <returns></returns>
         private static TaskInventoryItem BuildItem(IDataReader row)
         {
-            TaskInventoryItem taskItem = new TaskInventoryItem();
-
-            taskItem.ItemID        = DBGuid.FromDB(row["itemID"]);
-            taskItem.ParentPartID  = DBGuid.FromDB(row["primID"]);
-            taskItem.AssetID       = DBGuid.FromDB(row["assetID"]);
-            taskItem.ParentID      = DBGuid.FromDB(row["parentFolderID"]);
-
-            taskItem.InvType       = Convert.ToInt32(row["invType"]);
-            taskItem.Type          = Convert.ToInt32(row["assetType"]);
-
-            taskItem.Name          = (String)row["name"];
-            taskItem.Description   = (String)row["description"];
-            taskItem.CreationDate  = Convert.ToUInt32(row["creationDate"]);
-            taskItem.CreatorIdentification = (String)row["creatorID"];
-            taskItem.OwnerID       = DBGuid.FromDB(row["ownerID"]);
-            taskItem.LastOwnerID   = DBGuid.FromDB(row["lastOwnerID"]);
-            taskItem.GroupID       = DBGuid.FromDB(row["groupID"]);
-
-            taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]);
-            taskItem.CurrentPermissions     = Convert.ToUInt32(row["currentPermissions"]);
-            taskItem.BasePermissions      = Convert.ToUInt32(row["basePermissions"]);
-            taskItem.EveryonePermissions  = Convert.ToUInt32(row["everyonePermissions"]);
-            taskItem.GroupPermissions     = Convert.ToUInt32(row["groupPermissions"]);
-            taskItem.Flags         = Convert.ToUInt32(row["flags"]);
-
-            return taskItem;
+            try
+            {
+                TaskInventoryItem taskItem = new TaskInventoryItem();
+
+                taskItem.ItemID        = DBGuid.FromDB(row["itemID"]);
+                taskItem.ParentPartID  = DBGuid.FromDB(row["primID"]);
+                taskItem.AssetID       = DBGuid.FromDB(row["assetID"]);
+                taskItem.ParentID      = DBGuid.FromDB(row["parentFolderID"]);
+
+                taskItem.InvType       = Convert.ToInt32(row["invType"]);
+                taskItem.Type          = Convert.ToInt32(row["assetType"]);
+
+                taskItem.Name          = (String)row["name"];
+                taskItem.Description   = (String)row["description"];
+                taskItem.CreationDate  = Convert.ToUInt32(row["creationDate"]);
+                taskItem.CreatorIdentification = (String)row["creatorID"];
+                taskItem.OwnerID       = DBGuid.FromDB(row["ownerID"]);
+                taskItem.LastOwnerID   = DBGuid.FromDB(row["lastOwnerID"]);
+                taskItem.GroupID       = DBGuid.FromDB(row["groupID"]);
+
+                taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]);
+                taskItem.CurrentPermissions     = Convert.ToUInt32(row["currentPermissions"]);
+                taskItem.BasePermissions      = Convert.ToUInt32(row["basePermissions"]);
+                taskItem.EveryonePermissions  = Convert.ToUInt32(row["everyonePermissions"]);
+                taskItem.GroupPermissions     = Convert.ToUInt32(row["groupPermissions"]);
+                taskItem.Flags         = Convert.ToUInt32(row["flags"]);
+
+                return taskItem;
+            }
+            catch
+            {
+                m_log.ErrorFormat("[MYSQL DB]: Error reading task inventory: itemID was {0}, primID was {1}", row["itemID"].ToString(), row["primID"].ToString());
+                throw;
+            }
         }
 
         private static RegionSettings BuildRegionSettings(IDataReader row)
@@ -1406,6 +1457,9 @@ namespace OpenSim.Data.MySQL
             newSettings.ParcelImageID = DBGuid.FromDB(row["parcel_tile_ID"]);
             newSettings.TelehubObject = DBGuid.FromDB(row["TelehubObject"]);
 
+            newSettings.GodBlockSearch = Convert.ToBoolean(row["block_search"]);
+            newSettings.Casino = Convert.ToBoolean(row["casino"]);
+
             return newSettings;
         }
 
@@ -1503,7 +1557,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="val"></param>
         /// <returns></returns>
-        private static Array SerializeTerrain(double[,] val)
+        private static Array SerializeTerrain(double[,] val, double[,] oldTerrain)
         {
             MemoryStream str = new MemoryStream(((int)Constants.RegionSize * (int)Constants.RegionSize) *sizeof (double));
             BinaryWriter bw = new BinaryWriter(str);
@@ -1512,7 +1566,11 @@ namespace OpenSim.Data.MySQL
             for (int x = 0; x < (int)Constants.RegionSize; x++)
                 for (int y = 0; y < (int)Constants.RegionSize; y++)
                 {
-                    double height = val[x, y];
+                    double height = 20.0;
+                    if (oldTerrain != null)
+                        height = oldTerrain[x, y];
+                    if (!double.IsNaN(val[x, y]))
+                        height = val[x, y];
                     if (height == 0.0)
                         height = double.Epsilon;
 
@@ -1656,9 +1714,23 @@ namespace OpenSim.Data.MySQL
             else
                 cmd.Parameters.AddWithValue("PassTouches", 0);
 
+            if (prim.PassCollisions)
+                cmd.Parameters.AddWithValue("PassCollisions", 1);
+            else
+                cmd.Parameters.AddWithValue("PassCollisions", 0);
+
             cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum);
             cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl);
 
+            if (prim.KeyframeMotion != null)
+                cmd.Parameters.AddWithValue("KeyframeMotion", prim.KeyframeMotion.Serialize());
+            else
+                cmd.Parameters.AddWithValue("KeyframeMotion", new Byte[0]);
+
+            if (prim.VehicleParams != null)
+                cmd.Parameters.AddWithValue("Vehicle", prim.VehicleParams.ToXml2());
+            else
+                cmd.Parameters.AddWithValue("Vehicle", String.Empty);
 
             if (prim.DynAttrs.Count > 0)
                 cmd.Parameters.AddWithValue("DynAttrs", prim.DynAttrs.ToXml());
@@ -1748,6 +1820,8 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("LoadedCreationDateTime", settings.LoadedCreationDateTime);
             cmd.Parameters.AddWithValue("LoadedCreationID", settings.LoadedCreationID);
             cmd.Parameters.AddWithValue("TerrainImageID", settings.TerrainImageID);
+            cmd.Parameters.AddWithValue("block_search", settings.GodBlockSearch);
+            cmd.Parameters.AddWithValue("casino", settings.Casino);
 
             cmd.Parameters.AddWithValue("ParcelImageID", settings.ParcelImageID);
             cmd.Parameters.AddWithValue("TelehubObject", settings.TelehubObject);
@@ -1909,7 +1983,7 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("Media", null == s.Media ? null : s.Media.ToXml());
         }
 
-        public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
+        public virtual void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
         {
             lock (m_dbLock)
             {
@@ -1953,6 +2027,37 @@ namespace OpenSim.Data.MySQL
             }
         }
 
+        public UUID[] GetObjectIDs(UUID regionID)
+        {
+            List<UUID> uuids = new List<UUID>();
+
+            lock (m_dbLock)
+            {
+                using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+                {
+                    dbcon.Open();
+
+                    using (MySqlCommand cmd = dbcon.CreateCommand())
+                    {
+                        cmd.CommandText = "select UUID from prims where RegionUUID = ?RegionUUID and SceneGroupID = UUID";
+                        cmd.Parameters.AddWithValue("RegionUUID", regionID.ToString());
+
+                        using (IDataReader reader = ExecuteReader(cmd))
+                        {
+                            while (reader.Read())
+                            {
+                                UUID id = new UUID(reader["UUID"].ToString());
+
+                                uuids.Add(id);
+                            }
+                        }
+                    }
+                }
+            }
+
+            return uuids.ToArray();
+        }
+
         private void LoadSpawnPoints(RegionSettings rs)
         {
             rs.ClearSpawnPoints();
diff --git a/OpenSim/Data/MySQL/MySQLUserAccountData.cs b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
index e964295..4ff3175 100644
--- a/OpenSim/Data/MySQL/MySQLUserAccountData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserAccountData.cs
@@ -46,17 +46,21 @@ namespace OpenSim.Data.MySQL
         {
             string[] words = query.Split(new char[] {' '});
 
+            bool valid = false;
+
             for (int i = 0 ; i < words.Length ; i++)
             {
-                if (words[i].Length < 3)
-                {
-                    if (i != words.Length - 1)
-                        Array.Copy(words, i + 1, words, i, words.Length - i - 1);
-                    Array.Resize(ref words, words.Length - 1);
-                }
+                if (words[i].Length > 2)
+                    valid = true;
+//                if (words[i].Length < 3)
+//                {
+//                    if (i != words.Length - 1)
+//                        Array.Copy(words, i + 1, words, i, words.Length - i - 1);
+//                    Array.Resize(ref words, words.Length - 1);
+//                }
             }
 
-            if (words.Length == 0)
+            if ((!valid) || words.Length == 0)
                 return new UserAccountData[0];
 
             if (words.Length > 2)
@@ -66,20 +70,36 @@ namespace OpenSim.Data.MySQL
             {
                 if (words.Length == 1)
                 {
-                    cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?search or LastName like ?search)", m_Realm);
-                    cmd.Parameters.AddWithValue("?search", "%" + words[0] + "%");
+                    cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?search or LastName like ?search) and active=1", m_Realm);
+                    cmd.Parameters.AddWithValue("?search", words[0] + "%");
                     cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
                 }
                 else
                 {
-                    cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?searchFirst or LastName like ?searchLast)", m_Realm);
-                    cmd.Parameters.AddWithValue("?searchFirst", "%" + words[0] + "%");
-                    cmd.Parameters.AddWithValue("?searchLast", "%" + words[1] + "%");
+                    cmd.CommandText = String.Format("select * from {0} where (ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like ?searchFirst and LastName like ?searchLast) and active=1", m_Realm);
+                    cmd.Parameters.AddWithValue("?searchFirst", words[0] + "%");
+                    cmd.Parameters.AddWithValue("?searchLast", words[1] + "%");
                     cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
                 }
 
                 return DoQuery(cmd);
             }
         }
+
+        public UserAccountData[] GetUsersWhere(UUID scopeID, string where)
+        {
+            using (MySqlCommand cmd = new MySqlCommand())
+            {
+                if (scopeID != UUID.Zero)
+                {
+                    where = "(ScopeID=?ScopeID or ScopeID='00000000-0000-0000-0000-000000000000') and (" + where + ")";
+                    cmd.Parameters.AddWithValue("?ScopeID", scopeID.ToString());
+                }
+
+                cmd.CommandText = String.Format("select * from {0} where " + where, m_Realm);
+
+                return DoQuery(cmd);
+            }
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Data/MySQL/MySQLXAssetData.cs b/OpenSim/Data/MySQL/MySQLXAssetData.cs
index e6ac22e..9a50373 100644
--- a/OpenSim/Data/MySQL/MySQLXAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLXAssetData.cs
@@ -497,4 +497,4 @@ namespace OpenSim.Data.MySQL
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index 513c784..bda1b6a 100644
--- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -717,7 +717,7 @@ ALTER TABLE regionsettings ADD COLUMN loaded_creation_datetime int unsigned NOT
 
 COMMIT;
 
-:VERSION 32
+:VERSION 32                     #---------------------
 
 BEGIN;
 CREATE TABLE `regionwindlight` (
@@ -922,4 +922,3 @@ ALTER TABLE prims ADD COLUMN `Friction` double NOT NULL default '0.6';
 ALTER TABLE prims ADD COLUMN `Restitution` double NOT NULL default '0.5';
 
 COMMIT;
-
diff --git a/OpenSim/Data/Null/NullSimulationData.cs b/OpenSim/Data/Null/NullSimulationData.cs
index 4979cf6..e7e5c41 100644
--- a/OpenSim/Data/Null/NullSimulationData.cs
+++ b/OpenSim/Data/Null/NullSimulationData.cs
@@ -152,6 +152,11 @@ namespace OpenSim.Data.Null
         {
         }
 
+        public UUID[] GetObjectIDs(UUID regionID)
+        {
+            return new UUID[0];
+        }
+
         public void SaveExtra(UUID regionID, string name, string value)
         {
         }
diff --git a/OpenSim/Data/Null/NullUserAccountData.cs b/OpenSim/Data/Null/NullUserAccountData.cs
index ec54dba..241616b 100644
--- a/OpenSim/Data/Null/NullUserAccountData.cs
+++ b/OpenSim/Data/Null/NullUserAccountData.cs
@@ -193,5 +193,10 @@ namespace OpenSim.Data.Null
 
             return false;
         }
+
+        public UserAccountData[] GetUsersWhere(UUID scopeID, string where)
+        {
+            return null;
+        }
     }
 }
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 61e7aaf..b94a58c 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -131,7 +131,7 @@ namespace OpenSim.Data.SQLite
         /// Create an asset
         /// </summary>
         /// <param name="asset">Asset Base</param>
-        override public void StoreAsset(AssetBase asset)
+        override public bool StoreAsset(AssetBase asset)
         {
             //m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID.ToString());
             if (ExistsAsset(asset.FullID))
@@ -153,6 +153,7 @@ namespace OpenSim.Data.SQLite
                         cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
 
                         cmd.ExecuteNonQuery();
+                        return true;
                     }
                 }
             }
@@ -173,6 +174,7 @@ namespace OpenSim.Data.SQLite
                         cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
 
                         cmd.ExecuteNonQuery();
+                        return true;
                     }
                 }
             }
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index d4734a6..99a6598 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -2940,6 +2940,11 @@ namespace OpenSim.Data.SQLite
             }
         }
 
+        public UUID[] GetObjectIDs(UUID regionID)
+        {
+            return new UUID[0];
+        }
+
         public void SaveExtra(UUID regionID, string name, string value)
         {
         }
diff --git a/OpenSim/Data/SQLite/SQLiteUserAccountData.cs b/OpenSim/Data/SQLite/SQLiteUserAccountData.cs
index f98d376..91d62ce 100644
--- a/OpenSim/Data/SQLite/SQLiteUserAccountData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserAccountData.cs
@@ -82,5 +82,10 @@ namespace OpenSim.Data.SQLite
                 return DoQuery(cmd);
             }
         }
+
+        public UserAccountData[] GetUsersWhere(UUID scopeID, string where)
+        {
+            return null;
+        }
     }
 }
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index d2c6c57..5da8e11 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -60,6 +60,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()
@@ -148,7 +150,8 @@ namespace OpenSim.Framework
                      Type == (sbyte)AssetType.SnapshotFolder ||
                      Type == (sbyte)AssetType.TrashFolder ||
                      Type == (sbyte)AssetType.ImageJPEG ||
-                     Type == (sbyte) AssetType.ImageTGA ||
+                     Type == (sbyte)AssetType.ImageTGA ||
+                     Type == (sbyte)AssetType.Mesh ||
                      Type == (sbyte) AssetType.LSLBytecode);
             }
         }
@@ -198,6 +201,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>
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 95e9667..041fb94 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -40,8 +40,17 @@ namespace OpenSim.Framework
     /// </summary>
     public class AvatarAppearance
     {
+        // SL box diferent to size
+        const float AVBOXAJUST = 0.2f;
+        // constrains  for ubitode physics
+        const float AVBOXMINX = 0.2f;
+        const float AVBOXMINY = 0.3f;
+        const float AVBOXMINZ = 1.2f;
+
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        // this is viewer capabilities and weared things dependent
+        // should be only used as initial default value ( V1 viewers )
         public readonly static int VISUALPARAM_COUNT = 218;
 
         public readonly static int TEXTURE_COUNT = 21;
@@ -53,6 +62,12 @@ namespace OpenSim.Framework
         protected AvatarWearable[] m_wearables;
         protected Dictionary<int, List<AvatarAttachment>> m_attachments;
         protected float m_avatarHeight = 0;
+        protected Vector3 m_avatarSize = new Vector3(0.45f, 0.6f, 1.9f); // sl Z cloud value
+        protected Vector3 m_avatarBoxSize = new Vector3(0.45f, 0.6f, 1.9f);
+        protected float m_avatarFeetOffset = 0;
+        protected float m_avatarAnimOffset = 0;
+        protected WearableCacheItem[] m_cacheitems;
+        protected bool m_cacheItemsDirty = true;
 
         public virtual int Serial
         {
@@ -66,6 +81,21 @@ namespace OpenSim.Framework
             set { m_visualparams = value; }
         }
 
+        public virtual Vector3 AvatarSize
+        {
+            get { return m_avatarSize; }
+        }
+
+        public virtual Vector3 AvatarBoxSize
+        {
+            get { return m_avatarBoxSize; }
+        }
+
+        public virtual float AvatarFeetOffset
+        {
+            get { return m_avatarFeetOffset + m_avatarAnimOffset; }
+        }
+
         public virtual Primitive.TextureEntry Texture
         {
             get { return m_texture; }
@@ -87,6 +117,18 @@ namespace OpenSim.Framework
             get { return m_avatarHeight; }
             set { m_avatarHeight = value; }
         }
+        
+        public virtual WearableCacheItem[] WearableCacheItems
+        {
+            get { return m_cacheitems; }
+            set { m_cacheitems = value; }
+        }
+
+        public virtual bool WearableCacheItemsDirty
+        {
+            get { return m_cacheItemsDirty; }
+            set { m_cacheItemsDirty = value; }
+        }
 
         public AvatarAppearance()
         {
@@ -96,7 +138,8 @@ namespace OpenSim.Framework
             SetDefaultWearables();
             SetDefaultTexture();
             SetDefaultParams();
-            SetHeight();
+//            SetHeight();
+            SetSize(new Vector3(0.45f,0.6f,1.9f));
             m_attachments = new Dictionary<int, List<AvatarAttachment>>();
         }
 
@@ -105,7 +148,7 @@ namespace OpenSim.Framework
 //            m_log.WarnFormat("[AVATAR APPEARANCE]: create appearance from OSDMap");
 
             Unpack(map);
-            SetHeight();
+//            SetHeight(); done in Unpack
         }
 
         public AvatarAppearance(AvatarWearable[] wearables, Primitive.TextureEntry textureEntry, byte[] visualParams)
@@ -129,7 +172,9 @@ namespace OpenSim.Framework
             else
                 SetDefaultParams();
 
-            SetHeight();
+//            SetHeight();
+            if(m_avatarHeight == 0)
+                SetSize(new Vector3(0.45f,0.6f,1.9f));
 
             m_attachments = new Dictionary<int, List<AvatarAttachment>>();
         }
@@ -148,7 +193,8 @@ namespace OpenSim.Framework
                 SetDefaultWearables();
                 SetDefaultTexture();
                 SetDefaultParams();
-                SetHeight();
+//                SetHeight();
+                SetSize(new Vector3(0.45f, 0.6f, 1.9f));
                 m_attachments = new Dictionary<int, List<AvatarAttachment>>();
 
                 return;
@@ -177,7 +223,8 @@ namespace OpenSim.Framework
             if (appearance.VisualParams != null)
                 m_visualparams = (byte[])appearance.VisualParams.Clone();
 
-            m_avatarHeight = appearance.m_avatarHeight;
+//            m_avatarHeight = appearance.m_avatarHeight;
+            SetSize(appearance.AvatarSize);
 
             // Copy the attachment, force append mode since that ensures consistency
             m_attachments = new Dictionary<int, List<AvatarAttachment>>();
@@ -240,6 +287,21 @@ namespace OpenSim.Framework
 //            }
         }
 
+        /// <summary>
+        /// Invalidate all of the baked textures in the appearance, useful
+        /// if you know that none are valid
+        /// </summary>
+        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));
@@ -304,22 +366,33 @@ namespace OpenSim.Framework
             // made. We determine if any of the visual parameters actually
             // changed to know if the appearance should be saved later
             bool changed = false;
-            for (int i = 0; i < AvatarAppearance.VISUALPARAM_COUNT; i++)
+
+            int newsize = visualParams.Length;
+
+            if (newsize != m_visualparams.Length)
+            {
+                changed = true;
+                m_visualparams = (byte[])visualParams.Clone();
+            }
+            else
             {
-                if (visualParams[i] != m_visualparams[i])
+
+                for (int i = 0; i < newsize; i++)
                 {
-// DEBUG ON
-//                    m_log.WarnFormat("[AVATARAPPEARANCE] vparams changed [{0}] {1} ==> {2}",
-//                                     i,m_visualparams[i],visualParams[i]);
-// DEBUG OFF
-                    m_visualparams[i] = visualParams[i];
-                    changed = true;
+                    if (visualParams[i] != m_visualparams[i])
+                    {
+                        // DEBUG ON
+                        //                    m_log.WarnFormat("[AVATARAPPEARANCE] vparams changed [{0}] {1} ==> {2}",
+                        //                                     i,m_visualparams[i],visualParams[i]);
+                        // DEBUG OFF
+                        m_visualparams[i] = visualParams[i];
+                        changed = true;
+                    }
                 }
             }
-
             // Reset the height if the visual parameters actually changed
-            if (changed)
-                SetHeight();
+//           if (changed)
+//                SetHeight();
 
             return changed;
         }
@@ -335,6 +408,7 @@ namespace OpenSim.Framework
         /// </summary>
         public virtual void SetHeight()
         {
+/*
             // Start with shortest possible female avatar height
             m_avatarHeight = 1.14597f;
             // Add offset for male avatars
@@ -347,6 +421,35 @@ namespace OpenSim.Framework
                             + 0.07f     * (float)m_visualparams[(int)VPElement.SHOES_PLATFORM_HEIGHT] / 255.0f
                             + 0.08f     * (float)m_visualparams[(int)VPElement.SHOES_HEEL_HEIGHT]     / 255.0f
                             + 0.076f    * (float)m_visualparams[(int)VPElement.SHAPE_NECK_LENGTH]     / 255.0f;
+*/
+        }
+
+        public void SetSize(Vector3 avSize)
+        {
+            if (avSize.X > 32f)
+                avSize.X = 32f;
+            else if (avSize.X < 0.1f)
+                avSize.X = 0.1f;
+
+            if (avSize.Y > 32f)
+                avSize.Y = 32f;
+            else if (avSize.Y < 0.1f)
+                avSize.Y = 0.1f;
+            if (avSize.Z > 32f)
+                avSize.Z = 32f;
+            else if (avSize.Z < 0.1f)
+                avSize.Z = 0.1f;
+
+            m_avatarSize = avSize;
+            m_avatarBoxSize = avSize;
+            m_avatarBoxSize.Z += AVBOXAJUST;
+            if (m_avatarBoxSize.X < AVBOXMINX)
+                m_avatarBoxSize.X = AVBOXMINX;
+            if (m_avatarBoxSize.Y < AVBOXMINY)
+                m_avatarBoxSize.Y = AVBOXMINY;
+            if (m_avatarBoxSize.Z < AVBOXMINZ)
+                m_avatarBoxSize.Z = AVBOXMINZ;
+            m_avatarHeight = m_avatarSize.Z;
         }
 
         public virtual void SetWearable(int wearableId, AvatarWearable wearable)
@@ -377,7 +480,8 @@ namespace OpenSim.Framework
             }
 
             s += "Visual Params: ";
-            for (uint j = 0; j < AvatarAppearance.VISUALPARAM_COUNT; j++)
+            //            for (uint j = 0; j < AvatarAppearance.VISUALPARAM_COUNT; j++)
+            for (uint j = 0; j < m_visualparams.Length; j++)
                 s += String.Format("{0},",m_visualparams[j]);
             s += "\n";
 
@@ -393,19 +497,18 @@ namespace OpenSim.Framework
         /// </remarks>
         public List<AvatarAttachment> GetAttachments()
         {
-            List<AvatarAttachment> alist = new List<AvatarAttachment>();
+            
 
             lock (m_attachments)
             {
+                                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)
         {
@@ -534,7 +637,6 @@ namespace OpenSim.Framework
                         return kvp.Key;
                 }
             }
-
             return 0;
         }
 
@@ -601,12 +703,14 @@ namespace OpenSim.Framework
             OSDBinary visualparams = new OSDBinary(m_visualparams);
             data["visualparams"] = visualparams;
 
-            // Attachments
-            List<AvatarAttachment> attachments = GetAttachments();
-            OSDArray attachs = new OSDArray(attachments.Count);
-            foreach (AvatarAttachment attach in GetAttachments())
-                attachs.Add(attach.Pack());
-            data["attachments"] = attachs;
+            lock (m_attachments)
+            {
+                // Attachments
+                OSDArray attachs = new OSDArray(m_attachments.Count);
+                foreach (AvatarAttachment attach in GetAttachments())
+                    attachs.Add(attach.Pack());
+                data["attachments"] = attachs;
+            }
 
             return data;
         }
@@ -620,7 +724,8 @@ namespace OpenSim.Framework
             if ((data != null) && (data["serial"] != null))
                 m_serial = data["serial"].AsInteger();
             if ((data != null) && (data["height"] != null))
-                m_avatarHeight = (float)data["height"].AsReal();
+//                m_avatarHeight = (float)data["height"].AsReal();
+                SetSize(new Vector3(0.45f,0.6f, (float)data["height"].AsReal()));
 
             try
             {
@@ -1453,7 +1558,58 @@ 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 
+            /// </summary>
+            BREAST_PHYSICS_MASS = 218,
+            BREAST_PHYSICS_GRAVITY = 219,
+            BREAST_PHYSICS_DRAG = 220,
+            BREAST_PHYSICS_UPDOWN_MAX_EFFECT = 221,
+            BREAST_PHYSICS_UPDOWN_SPRING = 222,
+            BREAST_PHYSICS_UPDOWN_GAIN = 223,
+            BREAST_PHYSICS_UPDOWN_DAMPING = 224,
+            BREAST_PHYSICS_INOUT_MAX_EFFECT = 225,
+            BREAST_PHYSICS_INOUT_SPRING = 226,
+            BREAST_PHYSICS_INOUT_GAIN = 227,
+            BREAST_PHYSICS_INOUT_DAMPING = 228,
+            /// <summary>
+            /// Belly
+            /// </summary>
+            BELLY_PHYISCS_MASS = 229,
+            BELLY_PHYSICS_GRAVITY = 230,
+            BELLY_PHYSICS_DRAG = 231,
+            BELLY_PHYISCS_UPDOWN_MAX_EFFECT = 232,
+            BELLY_PHYSICS_UPDOWN_SPRING = 233,
+            BELLY_PHYSICS_UPDOWN_GAIN = 234,
+            BELLY_PHYSICS_UPDOWN_DAMPING = 235,
+
+            /// <summary>
+            /// Butt
+            /// </summary>
+            BUTT_PHYSICS_MASS = 236,
+            BUTT_PHYSICS_GRAVITY = 237,
+            BUTT_PHYSICS_DRAG = 238,
+            BUTT_PHYSICS_UPDOWN_MAX_EFFECT = 239,
+            BUTT_PHYSICS_UPDOWN_SPRING = 240,
+            BUTT_PHYSICS_UPDOWN_GAIN = 241,
+            BUTT_PHYSICS_UPDOWN_DAMPING = 242,
+            BUTT_PHYSICS_LEFTRIGHT_MAX_EFFECT = 243,
+            BUTT_PHYSICS_LEFTRIGHT_SPRING = 244,
+            BUTT_PHYSICS_LEFTRIGHT_GAIN = 245,
+            BUTT_PHYSICS_LEFTRIGHT_DAMPING = 246,
+            /// <summary>
+            /// Breast Part 2
+            /// </summary>
+            BREAST_PHYSICS_LEFTRIGHT_MAX_EFFECT = 247,
+            BREAST_PHYSICS_LEFTRIGHT_SPRING= 248,
+            BREAST_PHYSICS_LEFTRIGHT_GAIN = 249,
+            BREAST_PHYSICS_LEFTRIGHT_DAMPING = 250
         }
         #endregion
     }
diff --git a/OpenSim/Framework/AvatarWearable.cs b/OpenSim/Framework/AvatarWearable.cs
index 8e27596..aee295a 100644
--- a/OpenSim/Framework/AvatarWearable.cs
+++ b/OpenSim/Framework/AvatarWearable.cs
@@ -62,9 +62,14 @@ 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 PHYSICS = 15;
 
+        //        public static readonly int MAX_WEARABLES = 16;
         public static readonly int MAX_WEARABLES = 15;
 
         public static readonly UUID DEFAULT_BODY_ITEM = new UUID("66c41e39-38f9-f75a-024e-585989bfaba9");
@@ -219,7 +224,7 @@ namespace OpenSim.Framework
         {
             get
             {
-                AvatarWearable[] defaultWearables = new AvatarWearable[MAX_WEARABLES]; //should be 15 of these
+                AvatarWearable[] defaultWearables = new AvatarWearable[MAX_WEARABLES];
                 for (int i = 0; i < MAX_WEARABLES; i++)
                 {
                     defaultWearables[i] = new AvatarWearable();
@@ -242,10 +247,13 @@ namespace OpenSim.Framework
                 
 //                // Alpha
 //                defaultWearables[ALPHA].Add(DEFAULT_ALPHA_ITEM, DEFAULT_ALPHA_ASSET);
-                
-//                // Tattoo
-//                defaultWearables[TATTOO].Add(DEFAULT_TATTOO_ITEM, DEFAULT_TATTOO_ASSET);
-                
+
+                //                // Tattoo
+                //                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/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index dfe60aa..8c32734 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -229,12 +229,14 @@ namespace OpenSim.Framework
 
     public class ControllerData
     {
+        public UUID ObjectID;
         public UUID ItemID;
         public uint IgnoreControls;
         public uint EventControls;
 
-        public ControllerData(UUID item, uint ignore, uint ev)
+        public ControllerData(UUID obj, UUID item, uint ignore, uint ev)
         {
+            ObjectID = obj;
             ItemID = item;
             IgnoreControls = ignore;
             EventControls = ev;
@@ -248,6 +250,7 @@ namespace OpenSim.Framework
         public OSDMap PackUpdateMessage()
         {
             OSDMap controldata = new OSDMap();
+            controldata["object"] = OSD.FromUUID(ObjectID);
             controldata["item"] = OSD.FromUUID(ItemID);
             controldata["ignore"] = OSD.FromInteger(IgnoreControls);
             controldata["event"] = OSD.FromInteger(EventControls);
@@ -258,6 +261,8 @@ namespace OpenSim.Framework
 
         public void UnpackUpdateMessage(OSDMap args)
         {
+            if (args["object"] != null)
+                ObjectID = args["object"].AsUUID();
             if (args["item"] != null)
                 ItemID = args["item"].AsUUID();
             if (args["ignore"] != null)
@@ -310,6 +315,8 @@ namespace OpenSim.Framework
         public Animation AnimState = null;
 
         public UUID GranterID;
+        public UUID ParentPart;
+        public Vector3 SitOffset;
 
         // Appearance
         public AvatarAppearance Appearance;
@@ -480,6 +487,10 @@ namespace OpenSim.Framework
                 }
                 args["attach_objects"] = attObjs;
             }
+
+            args["parent_part"] = OSD.FromUUID(ParentPart);
+            args["sit_offset"] = OSD.FromString(SitOffset.ToString());
+
             return args;
         }
 
@@ -711,6 +722,11 @@ namespace OpenSim.Framework
                     }
                 }
             }
+
+            if (args["parent_part"] != null)
+                ParentPart = args["parent_part"].AsUUID();
+            if (args["sit_offset"] != null)
+                Vector3.TryParse(args["sit_offset"].AsString(), out SitOffset);
         }
 
         public AgentData()
diff --git a/OpenSim/Framework/Communications/RestClient.cs b/OpenSim/Framework/Communications/RestClient.cs
index 97b3b60..42c0b18 100644
--- a/OpenSim/Framework/Communications/RestClient.cs
+++ b/OpenSim/Framework/Communications/RestClient.cs
@@ -363,7 +363,7 @@ namespace OpenSim.Framework.Communications
             _request = (HttpWebRequest) WebRequest.Create(buildUri());
             _request.KeepAlive = false;
             _request.ContentType = "application/xml";
-            _request.Timeout = 900000;
+            _request.Timeout = 30000;
             _request.Method = RequestMethod;
             _asyncException = null;
             _request.ContentLength = src.Length;
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs
index b9f402a..9490013 100644
--- a/OpenSim/Framework/Console/CommandConsole.cs
+++ b/OpenSim/Framework/Console/CommandConsole.cs
@@ -83,7 +83,7 @@ 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' to get a list of all commands, 
   or type help <item>' where <item> is one of the following:";
 
         /// <value>
@@ -116,12 +116,14 @@ namespace OpenSim.Framework.Console
             if (helpParts.Count == 0)
             {
                 help.Add(GeneralHelpText);
-                help.Add(ItemHelpText);
-                help.AddRange(CollectModulesHelp(tree));
+                help.AddRange(CollectAllCommandsHelp());
             }
-            else if (helpParts.Count == 1 && helpParts[0] == "all")
+            else if (helpParts.Count == 1 && helpParts[0] == "categories")
             {
-                help.AddRange(CollectAllCommandsHelp());
+                help.Add(""); // Will become a newline.
+                help.Add(GeneralHelpText);
+                help.Add(ItemHelpText);
+                help.AddRange(CollectModulesHelp(tree));
             }
             else
             {
@@ -145,8 +147,11 @@ namespace OpenSim.Framework.Console
             {
                 foreach (List<CommandInfo> commands in m_modulesCommands.Values)
                 {
-                    var ourHelpText = commands.ConvertAll(c => string.Format("{0} - {1}", c.help_text, c.long_help));
-                    help.AddRange(ourHelpText);
+                    foreach (CommandInfo c in commands)
+                    {
+                        if (c.long_help != String.Empty)
+                            help.Add(string.Format("{0} - {1}", c.help_text, c.long_help));
+                    }
                 }
             }
 
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index 27edd4b..3e3c2b3 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -234,7 +234,7 @@ namespace OpenSim.Framework.Console
             string uri = "/ReadResponses/" + sessionID.ToString() + "/";
 
             m_Server.AddPollServiceHTTPHandler(
-                uri, new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, sessionID));
+                uri, new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, sessionID,25000)); // 25 secs timeout
 
             XmlDocument xmldoc = new XmlDocument();
             XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration,
@@ -425,7 +425,7 @@ namespace OpenSim.Framework.Console
             return false;
         }
 
-        private Hashtable GetEvents(UUID RequestID, UUID sessionID, string request)
+        private Hashtable GetEvents(UUID RequestID, UUID sessionID)
         {
             ConsoleConnection c = null;
 
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index a92abbf..e03750b 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -58,6 +58,30 @@ namespace OpenSim.Framework
             set { m_EstateName = value; }
         }
 
+        private bool m_AllowLandmark = true;
+
+        public bool AllowLandmark
+        {
+            get { return m_AllowLandmark; }
+            set { m_AllowLandmark = value; }
+        }
+
+        private bool m_AllowParcelChanges = true;
+
+        public bool AllowParcelChanges
+        {
+            get { return m_AllowParcelChanges; }
+            set { m_AllowParcelChanges = value; }
+        }
+
+        private bool m_AllowSetHome = true;
+
+        public bool AllowSetHome
+        {
+            get { return m_AllowSetHome; }
+            set { m_AllowSetHome = value; }
+        }
+
         private uint m_ParentEstateID = 1;
 
         public uint ParentEstateID
@@ -338,11 +362,30 @@ namespace OpenSim.Framework
             return false;
         }
 
-        public bool IsBanned(UUID avatarID)
+        public bool IsBanned(UUID avatarID, int userFlags)
         {
             foreach (EstateBan ban in l_EstateBans)
                 if (ban.BannedUserID == avatarID)
                     return true;
+
+            if (!IsEstateManagerOrOwner(avatarID) && !HasAccess(avatarID))
+            {
+                if (DenyMinors)
+                {
+                    if ((userFlags & 32) == 0)
+                    {
+                        return true;
+                    }
+                }
+                if (DenyAnonymous)
+                {
+                    if ((userFlags & 4) == 0)
+                    {
+                        return true;
+                    }
+                }
+            }
+
             return false;
         }
 
@@ -350,7 +393,7 @@ namespace OpenSim.Framework
         {
             if (ban == null)
                 return;
-            if (!IsBanned(ban.BannedUserID))
+            if (!IsBanned(ban.BannedUserID, 32)) //Ignore age-based bans
                 l_EstateBans.Add(ban);
         }
 
@@ -374,6 +417,15 @@ namespace OpenSim.Framework
             return l_EstateAccess.Contains(user);
         }
 
+        public void SetFromFlags(ulong regionFlags)
+        {
+            ResetHomeOnTeleport = ((regionFlags & (ulong)OpenMetaverse.RegionFlags.ResetHomeOnTeleport) == (ulong)OpenMetaverse.RegionFlags.ResetHomeOnTeleport);
+            BlockDwell = ((regionFlags & (ulong)OpenMetaverse.RegionFlags.BlockDwell) == (ulong)OpenMetaverse.RegionFlags.BlockDwell);
+            AllowLandmark = ((regionFlags & (ulong)OpenMetaverse.RegionFlags.AllowLandmark) == (ulong)OpenMetaverse.RegionFlags.AllowLandmark);
+            AllowParcelChanges = ((regionFlags & (ulong)OpenMetaverse.RegionFlags.AllowParcelChanges) == (ulong)OpenMetaverse.RegionFlags.AllowParcelChanges);
+            AllowSetHome = ((regionFlags & (ulong)OpenMetaverse.RegionFlags.AllowSetHome) == (ulong)OpenMetaverse.RegionFlags.AllowSetHome);
+        }
+
         public bool GroupAccess(UUID groupID)
         {
             return l_EstateGroups.Contains(groupID);
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index f6b7689..0465042 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -64,12 +64,14 @@ namespace OpenSim.Framework
 
     public delegate void NetworkStats(int inPackets, int outPackets, int unAckedBytes);
 
-    public delegate void SetAppearance(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams);
+    public delegate void SetAppearance(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams, Vector3 AvSize, WearableCacheItem[] CacheItems);
 
     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);
@@ -130,6 +132,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);
@@ -266,6 +270,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);
 
@@ -441,6 +448,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);
@@ -463,9 +471,9 @@ namespace OpenSim.Framework
 
     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);
     
@@ -503,6 +511,7 @@ namespace OpenSim.Framework
     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
 
@@ -791,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;
@@ -855,6 +865,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;
@@ -879,6 +890,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;
@@ -997,7 +1009,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;
@@ -1036,11 +1048,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>
@@ -1061,7 +1074,7 @@ 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);
         
@@ -1162,6 +1175,8 @@ namespace OpenSim.Framework
 
         void SetChildAgentThrottle(byte[] throttle);
 
+        void SetAgentThrottleSilent(int throttle, int setting);
+
         void SendAvatarDataImmediate(ISceneEntity avatar);
 
         /// <summary>
@@ -1185,6 +1200,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,7 +1220,7 @@ namespace OpenSim.Framework
         /// <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);
 
diff --git a/OpenSim/Framework/IImprovedAssetCache.cs b/OpenSim/Framework/IImprovedAssetCache.cs
index 251215a..a0b8b55 100644
--- a/OpenSim/Framework/IImprovedAssetCache.cs
+++ b/OpenSim/Framework/IImprovedAssetCache.cs
@@ -33,6 +33,7 @@ namespace OpenSim.Framework
     {
         void Cache(AssetBase asset);
         AssetBase Get(string id);
+        bool Check(string id);
         void Expire(string id);
         void Clear();
     }
diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs
index 4f98d7b..7a24d1e 100644
--- a/OpenSim/Framework/ILandObject.cs
+++ b/OpenSim/Framework/ILandObject.cs
@@ -70,6 +70,7 @@ namespace OpenSim.Framework
         void UpdateLandProperties(LandUpdateArgs args, IClientAPI remote_client);
         bool IsEitherBannedOrRestricted(UUID avatar);
         bool IsBannedFromLand(UUID avatar);
+        bool CanBeOnThisLand(UUID avatar, float posHeight);
         bool IsRestrictedFromLand(UUID avatar);
         bool IsInLandAccessList(UUID avatar);
         void SendLandUpdateToClient(IClientAPI remote_client);
diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs
index 1e09728..7378d2e 100644
--- a/OpenSim/Framework/IMoneyModule.cs
+++ b/OpenSim/Framework/IMoneyModule.cs
@@ -33,13 +33,14 @@ namespace OpenSim.Framework
     public interface IMoneyModule
     {
         bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID,
-                int amount);
+                int amount, UUID txn);
 
         int GetBalance(UUID agentID);
         bool UploadCovered(UUID agentID, int amount);
         bool AmountCovered(UUID agentID, int amount);
         void ApplyCharge(UUID agentID, int amount, string text);
         void ApplyUploadCharge(UUID agentID, int amount, string text);
+        void MoveMoney(UUID fromUser, UUID toUser, int amount, string text);
 
         int UploadCharge { get; }
         int GroupCreationCharge { get; }
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index fc02f33..4dffd3f 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -67,9 +67,9 @@ 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 string _name = "Your Parcel";
diff --git a/OpenSim/Framework/LocklessQueue.cs b/OpenSim/Framework/LocklessQueue.cs
index 84f887c..9bd9baf 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;
@@ -136,4 +136,4 @@ namespace OpenSim.Framework
                 (object)Interlocked.CompareExchange<SingleLinkNode>(ref location, newValue, comparand);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Framework/Monitoring/BaseStatsCollector.cs b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
index 2903b6e..446e3c0 100644
--- a/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
@@ -43,10 +43,9 @@ namespace OpenSim.Framework.Monitoring
             StringBuilder sb = new StringBuilder(Environment.NewLine);
             sb.Append("MEMORY STATISTICS");
             sb.Append(Environment.NewLine);
-
             sb.AppendFormat(
-                "Allocated to OpenSim objects: {0} MB\n",
-                Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0));
+                    "Allocated to OpenSim objects: {0} MB\n",
+                    Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0));
 
             sb.AppendFormat(
                 "OpenSim last object memory churn    : {0} MB/s\n",
@@ -56,9 +55,23 @@ namespace OpenSim.Framework.Monitoring
                 "OpenSim average object memory churn : {0} MB/s\n",
                 Math.Round((MemoryWatchdog.AverageMemoryChurn * 1000) / 1024.0 / 1024, 3));
 
-            sb.AppendFormat(
-                "Process memory              : {0} MB\n",
-                Math.Round(Process.GetCurrentProcess().WorkingSet64 / 1024.0 / 1024.0));
+            Process myprocess = Process.GetCurrentProcess();
+            if (!myprocess.HasExited)
+            {
+                myprocess.Refresh();
+                sb.AppendFormat(
+                        "Process memory:      Physical {0} MB \t Paged {1} MB \t Virtual {2} MB\n",
+                        Math.Round(Process.GetCurrentProcess().WorkingSet64 / 1024.0 / 1024.0),
+                        Math.Round(Process.GetCurrentProcess().PagedMemorySize64 / 1024.0 / 1024.0),
+                        Math.Round(Process.GetCurrentProcess().VirtualMemorySize64 / 1024.0 / 1024.0));
+                sb.AppendFormat(
+                        "Peak process memory: Physical {0} MB \t Paged {1} MB \t Virtual {2} MB\n",
+                        Math.Round(Process.GetCurrentProcess().PeakWorkingSet64 / 1024.0 / 1024.0),
+                        Math.Round(Process.GetCurrentProcess().PeakPagedMemorySize64 / 1024.0 / 1024.0),
+                        Math.Round(Process.GetCurrentProcess().PeakVirtualMemorySize64 / 1024.0 / 1024.0));
+            }
+            else
+                sb.Append("Process reported as Exited \n");
 
             return sb.ToString();
         }
diff --git a/OpenSim/Framework/Monitoring/Watchdog.cs b/OpenSim/Framework/Monitoring/Watchdog.cs
index 3f992b1..69d2db5 100644
--- a/OpenSim/Framework/Monitoring/Watchdog.cs
+++ b/OpenSim/Framework/Monitoring/Watchdog.cs
@@ -385,4 +385,4 @@ namespace OpenSim.Framework.Monitoring
             m_watchdogTimer.Start();
         }
     }
-}
\ No newline at end of file
+}
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>
-        /// The single recipient or all if not set.
-        /// </summary>
-        public UUID TargetUUID
+        public UUID Destination
         {
-            get { return m_toID; }
-            set { m_toID = value; }
+            get { return m_destination; }
+            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/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/PluginLoader.cs b/OpenSim/Framework/PluginLoader.cs
index 819cb7b..cc80943 100644
--- a/OpenSim/Framework/PluginLoader.cs
+++ b/OpenSim/Framework/PluginLoader.cs
@@ -244,13 +244,22 @@ namespace OpenSim.Framework
             // The Mono addin manager (in Mono.Addins.dll version 0.2.0.0)
             // 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("addin-db-000"))
-                    Directory.Delete("addin-db-000", true);
+                if (Directory.Exists(v0))
+                    Directory.Delete(v0, true);
 
-                if (Directory.Exists("addin-db-001"))
-                    Directory.Delete("addin-db-001", true);
+                if (Directory.Exists(v1))
+                    Directory.Delete(v1, true);
             }
             catch (IOException)
             {
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index c1e1a4f..df928dc 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -717,7 +717,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;
             }
         }
 
@@ -726,7 +731,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;
             }
         }
 
@@ -735,7 +745,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;
             }
         }
 
@@ -744,7 +759,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;
             }
         }
 
@@ -858,6 +878,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);
@@ -903,6 +928,9 @@ namespace OpenSim.Framework
                     hash = djb2(hash, scaleBytes[i]);
             }
 
+            if(convex)
+                hash = djb2(hash, 0xa5);
+
             return hash;
         }
 
@@ -1406,7 +1434,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;
diff --git a/OpenSim/Framework/PriorityQueue.cs b/OpenSim/Framework/PriorityQueue.cs
index e7a7f7f..e4f1111 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
@@ -60,7 +61,8 @@ namespace OpenSim.Framework
         // 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};
 
         // 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
@@ -137,7 +139,7 @@ namespace OpenSim.Framework
         /// </summary>
         public bool TryDequeue(out IEntityUpdate 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++)
             {
@@ -172,14 +174,13 @@ namespace OpenSim.Framework
             }
             
             // 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_countFromQueue = m_queueCounts[m_nextQueue];
+                m_nextQueue++;
+                if(m_nextQueue >= NumberOfQueues)
+                    m_nextQueue = NumberOfImmediateQueues;
 
-                // if this is one of the immediate queues, just skip it
-                if (m_nextQueue < NumberOfImmediateQueues)
-                    continue;
+                m_countFromQueue = m_queueCounts[m_nextQueue];
                 
                 if (m_heaps[m_nextQueue].Count > 0)
                 {
@@ -189,7 +190,6 @@ namespace OpenSim.Framework
                     m_lookupTable.Remove(item.Value.Entity.LocalId);
                     timeinqueue = Util.EnvironmentTickCountSubtract(item.EntryTime);
                     value = item.Value;
-
                     return true;
                 }
             }
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 24b9c89..6dde62f 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;
@@ -102,6 +103,7 @@ namespace OpenSim.Framework
 
         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;
@@ -707,6 +709,9 @@ namespace OpenSim.Framework
             string location = String.Format("{0},{1}", m_regionLocX, m_regionLocY);
             config.Set("Location", location);
 
+            if (DataStore != String.Empty)
+                config.Set("Datastore", DataStore);
+
             config.Set("InternalAddress", m_internalEndPoint.Address.ToString());
             config.Set("InternalPort", m_internalEndPoint.Port);
 
@@ -921,6 +926,9 @@ namespace OpenSim.Framework
                 case "sim_location_y":
                     m_regionLocY = (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);
@@ -1077,6 +1085,11 @@ namespace OpenSim.Framework
             return regionInfo;
         }
 
+        public int getInternalEndPointPort()
+        {
+            return m_internalEndPoint.Port;
+        }
+
         public Dictionary<string, object> ToKeyValuePairs()
         {
             Dictionary<string, object> kvp = new Dictionary<string, object>();
diff --git a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
index a2f5d9c..c7caf6f 100644
--- a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
+++ b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
@@ -48,6 +48,9 @@ namespace OpenSim.Framework.RegionLoader.Web
 
         public RegionInfo[] LoadRegions()
         {
+            int tries = 3;
+            int wait = 2000;
+
             if (m_configSource == null)
             {
                 m_log.Error("[WEBLOADER]: Unable to load configuration source!");
@@ -66,63 +69,72 @@ namespace OpenSim.Framework.RegionLoader.Web
                 }
                 else
                 {
-                    RegionInfo[] regionInfos = new RegionInfo[] {};
-                    int regionCount = 0;
-                    HttpWebRequest webRequest = (HttpWebRequest) WebRequest.Create(url);
-                    webRequest.Timeout = 30000; //30 Second Timeout
-                    m_log.DebugFormat("[WEBLOADER]: Sending download request to {0}", url);
+                                        while(tries > 0)
+                                        {
+                                                RegionInfo[] regionInfos = new RegionInfo[] {};
+                                                int regionCount = 0;
+                                                HttpWebRequest webRequest = (HttpWebRequest) WebRequest.Create(url);
+                                                webRequest.Timeout = 30000; //30 Second Timeout
+                                                m_log.DebugFormat("[WEBLOADER]: Sending download request to {0}", url);
 
-                    try
-                    {
-                        HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse();
-                        m_log.Debug("[WEBLOADER]: Downloading region information...");
-                        StreamReader reader = new StreamReader(webResponse.GetResponseStream());
-                        string xmlSource = String.Empty;
-                        string tempStr = reader.ReadLine();
-                        while (tempStr != null)
-                        {
-                            xmlSource = xmlSource + tempStr;
-                            tempStr = reader.ReadLine();
-                        }
-                        m_log.Debug("[WEBLOADER]: Done downloading region information from server. Total Bytes: " +
-                                    xmlSource.Length);
-                        XmlDocument xmlDoc = new XmlDocument();
-                        xmlDoc.LoadXml(xmlSource);
-                        if (xmlDoc.FirstChild.Name == "Regions")
-                        {
-                            regionCount = xmlDoc.FirstChild.ChildNodes.Count;
-    
-                            if (regionCount > 0)
-                            {
-                                regionInfos = new RegionInfo[regionCount];
-                                int i;
-                                for (i = 0; i < xmlDoc.FirstChild.ChildNodes.Count; i++)
-                                {
-                                    m_log.Debug(xmlDoc.FirstChild.ChildNodes[i].OuterXml);
-                                    regionInfos[i] =
-                                        new RegionInfo("REGION CONFIG #" + (i + 1), xmlDoc.FirstChild.ChildNodes[i],false,m_configSource);
-                                }
-                            }
-                        }
-                    }
-                    catch (WebException ex)
-                    {
-                        if (((HttpWebResponse)ex.Response).StatusCode == HttpStatusCode.NotFound)
+                                                try
+                                                {
+                                                        HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse();
+                                                        m_log.Debug("[WEBLOADER]: Downloading region information...");
+                                                        StreamReader reader = new StreamReader(webResponse.GetResponseStream());
+                                                        string xmlSource = String.Empty;
+                                                        string tempStr = reader.ReadLine();
+                                                        while (tempStr != null)
+                                                        {
+                                                                xmlSource = xmlSource + tempStr;
+                                                                tempStr = reader.ReadLine();
+                                                        }
+                                                        m_log.Debug("[WEBLOADER]: Done downloading region information from server. Total Bytes: " +
+                                                                                xmlSource.Length);
+                                                        XmlDocument xmlDoc = new XmlDocument();
+                                                        xmlDoc.LoadXml(xmlSource);
+                                                        if (xmlDoc.FirstChild.Name == "Regions")
+                                                        {
+                                                                regionCount = xmlDoc.FirstChild.ChildNodes.Count;
+                
+                                                                if (regionCount > 0)
+                                                                {
+                                                                        regionInfos = new RegionInfo[regionCount];
+                                                                        int i;
+                                                                        for (i = 0; i < xmlDoc.FirstChild.ChildNodes.Count; i++)
+                                                                        {
+                                                                                m_log.Debug(xmlDoc.FirstChild.ChildNodes[i].OuterXml);
+                                                                                regionInfos[i] =
+                                                                                        new RegionInfo("REGION CONFIG #" + (i + 1), xmlDoc.FirstChild.ChildNodes[i],false,m_configSource);
+                                                                        }
+                                                                }
+                                                        }
+                                                }
+                                                catch (WebException ex)
+                                                {
+                                                        if (((HttpWebResponse)ex.Response).StatusCode == HttpStatusCode.NotFound)
+                                                        {
+                                                                if (!allowRegionless)
+                                                                        throw ex;
+                                                        }
+                                                        else
+                                                                throw ex;
+                                                }
+
+                                                if (regionCount > 0 | allowRegionless)
+                                                        return regionInfos;
+
+                        m_log.Debug("[WEBLOADER]: Request yielded no regions.");
+                        tries--;
+                        if (tries > 0)
                         {
-                            if (!allowRegionless)
-                                throw ex;
+                            m_log.Debug("[WEBLOADER]: Retrying");
+                            System.Threading.Thread.Sleep(wait);
                         }
-                        else
-                            throw ex;
-                    }
+                                        }
 
-                    if (regionCount > 0 | allowRegionless)
-                        return regionInfos;
-                    else
-                    {
-                        m_log.Error("[WEBLOADER]: No region configs were available.");
-                        return null;
-                    }
+                                        m_log.Error("[WEBLOADER]: No region configs were available.");
+                                        return null;
                 }
             }
         }
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index 47dbcec..47a2780 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -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; }
+        }
+
         // Connected Telehub object
         private UUID m_TelehubObject = UUID.Zero;
         public UUID TelehubObject
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index c0dc907..cb47cbf 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -136,7 +136,7 @@ namespace OpenSim.Framework.Servers
         {
             m_log.Info("[STARTUP]: Beginning startup processing");
             
-            m_log.Info("[STARTUP]: OpenSimulator version: " + m_version + Environment.NewLine);
+            m_log.Info("[STARTUP]: Careminster 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);
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 70c531c..27af009 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -395,6 +395,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                         StreamReader reader = new StreamReader(requestStream, encoding);
 
                         string requestBody = reader.ReadToEnd();
+                        reader.Close();
 
                         Hashtable keysvals = new Hashtable();
                         Hashtable headervals = new Hashtable();
@@ -726,7 +727,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(
                         "[BASE HTTP SERVER]: Slow handling of {0} {1} {2} {3} {4} from {5} took {6}ms",
@@ -1647,10 +1648,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)responsedata["int_response_code"];
-            string responseString = (string)responsedata["str_response_string"];
-            string contentType = (string)responsedata["content_type"];
+            int responsecode;
+            string responseString = String.Empty;
+            byte[] responseData = null;
+            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"))
             {
@@ -1695,25 +1726,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, (string)headerdata[header]);
+            }
+
             byte[] buffer;
 
-            if (!(contentType.Contains("image")
-                || contentType.Contains("x-shockwave-flash")
-                || contentType.Contains("application/x-oar")
-                || contentType.Contains("application/vnd.ll.mesh")))
+            if (responseData != null)
             {
-                // Text
-                buffer = Encoding.UTF8.GetBytes(responseString);
+                buffer = responseData;
             }
             else
             {
-                // Binary!
-                buffer = Convert.FromBase64String(responseString);
-            }
+                if (!(contentType.Contains("image")
+                    || contentType.Contains("x-shockwave-flash")
+                    || contentType.Contains("application/x-oar")
+                    || contentType.Contains("application/vnd.ll.mesh")))
+                {
+                    // Text
+                    buffer = Encoding.UTF8.GetBytes(responseString);
+                }
+                else
+                {
+                    // Binary!
+                    buffer = Convert.FromBase64String(responseString);
+                }
 
-            response.SendChunked = false;
-            response.ContentLength64 = buffer.Length;
-            response.ContentEncoding = Encoding.UTF8;
+                response.SendChunked = false;
+                response.ContentLength64 = buffer.Length;
+                response.ContentEncoding = Encoding.UTF8;
+            }
 
             return buffer;
         }
@@ -1793,8 +1839,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
-                m_PollServiceManager = new PollServiceRequestManager(this, 3, 25000);
-                m_PollServiceManager.Start();
+//                m_PollServiceManager = new PollServiceRequestManager(this, 3, 25000);
+                m_PollServiceManager = new PollServiceRequestManager(this, 4, 25000);
                 HTTPDRunning = true;
 
                 //HttpListenerContext context;
@@ -1828,7 +1874,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)
             {
@@ -1845,7 +1893,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             HTTPDRunning = false;
             try
             {
-                m_PollServiceManager.Stop();
+//                m_PollServiceManager.Stop();
 
                 m_httpListener2.ExceptionThrown -= httpServerException;
                 //m_httpListener2.DisconnectHandler = null;
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index 3089351..c19ac32 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Framework.Servers.HttpServer
     public delegate void RequestMethod(UUID requestID, Hashtable request);
     public delegate bool HasEventsMethod(UUID requestID, UUID pId);
 
-    public delegate Hashtable GetEventsMethod(UUID requestID, UUID pId, string request);
+    public delegate Hashtable GetEventsMethod(UUID requestID, UUID pId);
 
     public delegate Hashtable NoEventsMethod(UUID requestID, UUID pId);
 
@@ -45,17 +45,30 @@ namespace OpenSim.Framework.Servers.HttpServer
         public NoEventsMethod NoEvents;
         public RequestMethod Request;
         public UUID Id;
+        public int TimeOutms;
+        public EventType Type;    
+
+        public enum EventType : int
+        {
+            Normal = 0,
+            LslHttp = 1,
+            Inventory = 2,
+            Texture = 3, 
+            Mesh = 4
+        }
 
         public PollServiceEventArgs(
             RequestMethod pRequest,
             HasEventsMethod pHasEvents, GetEventsMethod pGetEvents, NoEventsMethod pNoEvents,
-            UUID pId)
+            UUID pId, int pTimeOutms)
         {
             Request = pRequest;
             HasEvents = pHasEvents;
             GetEvents = pGetEvents;
             NoEvents = pNoEvents;
             Id = pId;
+            TimeOutms = pTimeOutms;
+            Type = EventType.Normal;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 3e84c55..07bd48a 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -33,15 +33,20 @@ using log4net;
 using HttpServer;
 using OpenSim.Framework;
 using OpenSim.Framework.Monitoring;
+using Amib.Threading;
 
+
+/*
 namespace OpenSim.Framework.Servers.HttpServer
 {
+
     public class PollServiceRequestManager
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private readonly BaseHttpServer m_server;
         private static Queue m_requests = Queue.Synchronized(new Queue());
+        private static ManualResetEvent m_ev = new ManualResetEvent(false);
         private uint m_WorkerThreadCount = 0;
         private Thread[] m_workerThreads;
         private PollServiceWorkerThread[] m_PollServiceWorkerThreads;
@@ -74,7 +79,6 @@ namespace OpenSim.Framework.Servers.HttpServer
                         ThreadPriority.Normal,
                         false,
                         true,
-                        null,
                         int.MaxValue);
             }
 
@@ -84,7 +88,6 @@ namespace OpenSim.Framework.Servers.HttpServer
                 ThreadPriority.Normal,
                 false,
                 true,
-                null,
                 1000 * 60 * 10);
         }
 
@@ -98,15 +101,17 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             lock (m_requests)
                 m_requests.Enqueue(req);
+            m_ev.Set();
         }
 
         public void ThreadStart()
         {
             while (m_running)
             {
+                m_ev.WaitOne(1000);
+                m_ev.Reset();
                 Watchdog.UpdateThread();
                 ProcessQueuedRequests();
-                Thread.Sleep(1000);
             }
         }
 
@@ -150,8 +155,9 @@ namespace OpenSim.Framework.Servers.HttpServer
             foreach (object o in m_requests)
             {
                 PollServiceHttpRequest req = (PollServiceHttpRequest) o;
-                PollServiceWorkerThread.DoHTTPGruntWork(
-                    m_server, req, req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
+                m_server.DoHTTPGruntWork(
+                    req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id),
+                    new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext));
             }
 
             m_requests.Clear();
@@ -162,4 +168,271 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
         }
     }
-}
\ No newline at end of file
+}
+ */
+
+using System.IO;
+using System.Text;
+using System.Collections.Generic;
+
+namespace OpenSim.Framework.Servers.HttpServer
+{
+    public class PollServiceRequestManager
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private readonly BaseHttpServer m_server;
+
+        private BlockingQueue<PollServiceHttpRequest> m_requests = new BlockingQueue<PollServiceHttpRequest>();
+        private static Queue<PollServiceHttpRequest> m_slowRequests = new Queue<PollServiceHttpRequest>();
+        private static Queue<PollServiceHttpRequest> m_retryRequests = new Queue<PollServiceHttpRequest>();
+
+        private uint m_WorkerThreadCount = 0;
+        private Thread[] m_workerThreads;
+        private Thread m_retrysThread;
+
+        private bool m_running = true;
+        private int slowCount = 0;
+
+        private SmartThreadPool m_threadPool = new SmartThreadPool(20000, 12, 2);
+
+//        private int m_timeout = 1000;   //  increase timeout 250; now use the event one
+
+        public PollServiceRequestManager(BaseHttpServer pSrv, uint pWorkerThreadCount, int pTimeout)
+        {
+            m_server = pSrv;
+            m_WorkerThreadCount = pWorkerThreadCount;
+            m_workerThreads = new Thread[m_WorkerThreadCount];
+
+            //startup worker threads
+            for (uint i = 0; i < m_WorkerThreadCount; i++)
+            {
+                m_workerThreads[i]
+                    = Watchdog.StartThread(
+                        PoolWorkerJob,
+                        String.Format("PollServiceWorkerThread{0}", i),
+                        ThreadPriority.Normal,
+                        false,
+                        false,
+                        null,
+                        int.MaxValue);
+            }
+
+            m_retrysThread = Watchdog.StartThread(
+                this.CheckRetries,
+                "PollServiceWatcherThread",
+                ThreadPriority.Normal,
+                false,
+                true,
+                null,
+                1000 * 60 * 10);
+        }
+
+
+        private void ReQueueEvent(PollServiceHttpRequest req)
+        {
+            if (m_running)
+            {
+                lock (m_retryRequests)
+                    m_retryRequests.Enqueue(req);
+            }
+        }
+
+        public void Enqueue(PollServiceHttpRequest req)
+        {
+            if (m_running)
+            {
+                if (req.PollServiceArgs.Type != PollServiceEventArgs.EventType.Normal)
+                {
+                    m_requests.Enqueue(req);
+                }
+                else
+                {
+                    lock (m_slowRequests)
+                        m_slowRequests.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());
+                }
+                slowCount++;
+                if (slowCount >= 10)
+                {
+                    slowCount = 0;
+
+                    lock (m_slowRequests)
+                    {
+                        while (m_slowRequests.Count > 0 && m_running)
+                            m_requests.Enqueue(m_slowRequests.Dequeue());
+                    }
+                }
+            }
+        }
+
+        ~PollServiceRequestManager()
+        {
+            m_running = false;
+//            m_timeout = -10000; // cause all to expire
+            Thread.Sleep(1000); // let the world move
+
+            foreach (Thread t in m_workerThreads)
+                    Watchdog.AbortThread(t.ManagedThreadId);
+
+            try
+            {
+                foreach (PollServiceHttpRequest req in m_retryRequests)
+                {
+                   DoHTTPGruntWork(m_server,req,
+                        req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
+                }
+            }
+            catch
+            {
+            }
+
+            PollServiceHttpRequest wreq;
+            m_retryRequests.Clear();
+
+            lock (m_slowRequests)
+            {
+                while (m_slowRequests.Count > 0 && m_running)
+                    m_requests.Enqueue(m_slowRequests.Dequeue());
+            }
+
+            while (m_requests.Count() > 0)
+            {
+                try
+                {
+                    wreq = m_requests.Dequeue(0);
+                    DoHTTPGruntWork(m_server,wreq,
+                        wreq.PollServiceArgs.NoEvents(wreq.RequestID, wreq.PollServiceArgs.Id));
+                }
+                catch
+                {
+                }
+            }
+
+            m_requests.Clear();
+        }
+
+        // work threads
+
+        private void PoolWorkerJob()
+        {
+            while (m_running)
+            {
+                PollServiceHttpRequest req = m_requests.Dequeue(5000);
+
+                Watchdog.UpdateThread();
+                if (req != null)
+                {
+                    try
+                    {
+                        if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id))
+                        {
+                            Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id);
+
+                            if (responsedata == null)
+                                continue;
+
+                            if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.Normal)
+                            {
+                                try
+                                {
+                                    DoHTTPGruntWork(m_server, req, responsedata);
+                                }
+                                catch (ObjectDisposedException) // Browser aborted before we could read body, server closed the stream
+                                {
+                                    // Ignore it, no need to reply
+                                }
+                            }
+                            else
+                            {
+                                m_threadPool.QueueWorkItem(x =>
+                                {
+                                    try
+                                    {
+                                        DoHTTPGruntWork(m_server, req, responsedata);
+                                    }
+                                    catch (ObjectDisposedException) // Browser aborted before we could read body, server closed the stream
+                                    {
+                                        // Ignore it, no need to reply
+                                    }
+
+                                    return null;
+                                }, null);
+                            }
+                        }
+                        else
+                        {
+                            if ((Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms)
+                            {
+                                DoHTTPGruntWork(m_server, req, 
+                                    req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
+                            }
+                            else
+                            {
+                                ReQueueEvent(req);
+                            }
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat("Exception in poll service thread: " + e.ToString());
+                    }
+                }
+            }
+        }
+
+        // DoHTTPGruntWork  changed, not sending response
+        // do the same work around as core
+
+        internal static void DoHTTPGruntWork(BaseHttpServer server, PollServiceHttpRequest req, Hashtable responsedata)
+        {
+            OSHttpResponse response
+                = new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext);
+
+            byte[] buffer = server.DoHTTPGruntWork(responsedata, response);
+
+            response.SendChunked = false;
+            response.ContentLength64 = buffer.Length;
+            response.ContentEncoding = Encoding.UTF8;
+
+            try
+            {
+                response.OutputStream.Write(buffer, 0, buffer.Length);
+            }
+            catch (Exception ex)
+            {
+                m_log.Warn(string.Format("[POLL SERVICE WORKER THREAD]: Error ", ex));
+            }
+            finally
+            {
+                //response.OutputStream.Close();
+                try
+                {
+                    response.OutputStream.Flush();
+                    response.Send();
+
+                    //if (!response.KeepAlive && response.ReuseContext)
+                    //    response.FreeContext();
+                }
+                catch (Exception e)
+                {
+                    m_log.Warn(String.Format("[POLL SERVICE WORKER THREAD]: Error ", e));
+                }
+            }
+        }
+    }
+}
+
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
index 5adbcd1..1c529b6 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
@@ -25,6 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+/* Ubit work moved to PollServiceRequestManager
+
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -90,8 +92,15 @@ namespace OpenSim.Framework.Servers.HttpServer
                             continue;
                         }
 
-                        Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id, str.ReadToEnd());
-                        DoHTTPGruntWork(m_server, req, responsedata);
+                        try
+                        {
+                            Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id, str.ReadToEnd());
+                            DoHTTPGruntWork(m_server, req, responsedata);
+                        }
+                        catch (ObjectDisposedException) // Browser aborted before we could read body, server closed the stream
+                        {
+                            // Ignore it, no need to reply
+                        }
                     }
                     else
                     {
@@ -162,4 +171,5 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
         }
     }
-}
\ No newline at end of file
+}
+*/
\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index 47baac8..65ccd10 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -573,7 +573,7 @@ namespace OpenSim.Framework.Servers
             }
         }
 
-        protected string GetVersionText()
+        public string GetVersionText()
         {
             return String.Format("Version: {0} (interface version {1})", m_version, VersionInfo.MajorInterfaceVersion);
         }
@@ -674,4 +674,4 @@ namespace OpenSim.Framework.Servers
                 m_console.OutputFormat(format, components);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
index 5b912b4..deae45c 100644
--- a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
+++ b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
@@ -81,6 +81,10 @@ namespace OpenSim.Framework.Servers.Tests
             /// </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
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index 80568e0..737c14d 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -29,11 +29,11 @@ namespace OpenSim
 {
     public class VersionInfo
     {
-        private const string VERSION_NUMBER = "0.7.6";
+        private const string VERSION_NUMBER = "0.7.6CM";
         private const Flavour VERSION_FLAVOUR = Flavour.Dev;
 
         public enum Flavour
-        {
+        { 
             Unknown,
             Dev,
             RC1,
@@ -50,7 +50,7 @@ namespace OpenSim
 
         public static string GetVersionString(string versionNumber, Flavour flavour)
         {
-            string versionString = "OpenSim " + versionNumber + " " + flavour;
+            string versionString = "Careminster " + versionNumber + " " + flavour;
             return versionString.PadRight(VERSIONINFO_VERSION_LENGTH);
         }
 
diff --git a/OpenSim/Framework/TaskInventoryDictionary.cs b/OpenSim/Framework/TaskInventoryDictionary.cs
index 8af2c41..62ecbd1 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,180 @@ 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 System.Threading.ReaderWriterLockSlim m_itemLock = new System.Threading.ReaderWriterLockSlim();
+
+        /// <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 +232,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 a06f8e7..574ee56 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Framework
         private UUID _loadedID = UUID.Zero;
 
         private bool _ownerChanged = false;
-
+        
         public UUID AssetID {
             get {
                 return _assetID;
diff --git a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
index 1dc8053..0fbdaf3 100644
--- a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
+++ b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
@@ -218,12 +218,12 @@ namespace OpenSim.Framework.Tests
                               BannedHostNameMask = string.Empty,
                               BannedUserID = bannedUserId}
                           );
-            Assert.IsTrue(es.IsBanned(bannedUserId), "User Should be banned but is not.");
-            Assert.IsFalse(es.IsBanned(UUID.Zero), "User Should not be banned but is.");
+            Assert.IsTrue(es.IsBanned(bannedUserId, 32), "User Should be banned but is not.");
+            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);
 
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/Util.cs b/OpenSim/Framework/Util.cs
index d9148fb..0545365 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -501,19 +501,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>
@@ -521,6 +527,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));
@@ -1189,19 +1201,19 @@ namespace OpenSim.Framework
         {
             string os = String.Empty;
 
-            if (Environment.OSVersion.Platform != PlatformID.Unix)
-            {
-                os = Environment.OSVersion.ToString();
-            }
-            else
-            {
-                os = ReadEtcIssue();
-            }
-                      
-            if (os.Length > 45)
-            {
-                os = os.Substring(0, 45);
-            }
+//            if (Environment.OSVersion.Platform != PlatformID.Unix)
+//            {
+//                os = Environment.OSVersion.ToString();
+//            }
+//            else
+//            {
+//                os = ReadEtcIssue();
+//            }
+//                      
+//            if (os.Length > 45)
+//            {
+//                os = os.Substring(0, 45);
+//            }
             
             return os;
         }
@@ -1333,7 +1345,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);
 
@@ -2145,4 +2157,112 @@ namespace OpenSim.Framework
             return str.Replace("_", "\\_").Replace("%", "\\%");
         }
     }
+
+    public class DoubleQueue<T> where T:class
+    {
+        private Queue<T> m_lowQueue = new Queue<T>();
+        private Queue<T> m_highQueue = new Queue<T>();
+
+        private object m_syncRoot = new object();
+        private Semaphore m_s = new Semaphore(0, 1);
+
+        public DoubleQueue()
+        {
+        }
+
+        public virtual int Count
+        {
+            get { return m_highQueue.Count + m_lowQueue.Count; }
+        }
+
+        public virtual void Enqueue(T data)
+        {
+            Enqueue(m_lowQueue, data);
+        }
+
+        public virtual void EnqueueLow(T data)
+        {
+            Enqueue(m_lowQueue, data);
+        }
+
+        public virtual void EnqueueHigh(T data)
+        {
+            Enqueue(m_highQueue, data);
+        }
+
+        private void Enqueue(Queue<T> q, T data)
+        {
+            lock (m_syncRoot)
+            {
+                m_lowQueue.Enqueue(data);
+                m_s.WaitOne(0);
+                m_s.Release();
+            }
+        }
+
+        public virtual T Dequeue()
+        {
+            return Dequeue(Timeout.Infinite);
+        }
+
+        public virtual T Dequeue(int tmo)
+        {
+            return Dequeue(TimeSpan.FromMilliseconds(tmo));
+        }
+
+        public virtual T Dequeue(TimeSpan wait)
+        {
+            T res = null;
+
+            if (!Dequeue(wait, ref res))
+                return null;
+
+            return res;
+        }
+
+        public bool Dequeue(int timeout, ref T res)
+        {
+            return Dequeue(TimeSpan.FromMilliseconds(timeout), ref res);
+        }
+
+        public bool Dequeue(TimeSpan wait, ref T res)
+        {
+            if (!m_s.WaitOne(wait))
+                return false;
+
+            lock (m_syncRoot)
+            {
+                if (m_highQueue.Count > 0)
+                    res = m_highQueue.Dequeue();
+                else
+                    res = m_lowQueue.Dequeue();
+
+                if (m_highQueue.Count == 0 && m_lowQueue.Count == 0)
+                    return true;
+
+                try
+                {
+                    m_s.Release();
+                }
+                catch
+                {
+                }
+
+                return true;
+            }
+        }
+
+        public virtual void Clear()
+        {
+
+            lock (m_syncRoot)
+            {
+                // Make sure sem count is 0
+                m_s.WaitOne(0);
+
+                m_lowQueue.Clear();
+                m_highQueue.Clear();
+            }
+        }
+    }
 }
diff --git a/OpenSim/Framework/WearableCacheItem.cs b/OpenSim/Framework/WearableCacheItem.cs
new file mode 100644
index 0000000..1aecf79
--- /dev/null
+++ b/OpenSim/Framework/WearableCacheItem.cs
@@ -0,0 +1,157 @@
+/*
+ * 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
+{
+    [Serializable]
+    public class WearableCacheItem
+    {
+        public uint TextureIndex { get; set; }
+        public UUID CacheId { get; set; }
+        public UUID TextureID { get; set; }
+        public AssetBase TextureAsset { get; set; }
+
+
+        public static WearableCacheItem[] GetDefaultCacheItem()
+        {
+            int itemmax = 21;
+            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};
+            return retitems;
+        }
+        public static WearableCacheItem[] FromOSD(OSD pInput, IImprovedAssetCache dataCache)
+        {
+            List<WearableCacheItem> ret = new List<WearableCacheItem>();
+            if (pInput.Type == OSDType.Array)
+            {
+                OSDArray itemarray = (OSDArray) pInput;
+                foreach (OSDMap item in itemarray)
+                {
+                    ret.Add(new WearableCacheItem()
+                                {
+                                    TextureIndex = item["textureindex"].AsUInteger(),
+                                    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());
+                        asset.Temporary = true;
+                        asset.Data = item["assetdata"].AsBinary();
+                        dataCache.Cache(asset);
+                    }
+                }
+            }
+            else if (pInput.Type == OSDType.Map)
+            {
+                OSDMap item = (OSDMap) pInput;
+                ret.Add(new WearableCacheItem(){
+                                    TextureIndex = item["textureindex"].AsUInteger(),
+                                    CacheId = item["cacheid"].AsUUID(),
+                                    TextureID = item["textureid"].AsUUID()
+                                });
+                if (dataCache != null && item.ContainsKey("assetdata"))
+                {
+                    string assetCreator = item["assetcreator"].AsString();
+                    string assetName = item["assetname"].AsString();
+                    AssetBase asset = new AssetBase(item["textureid"].AsUUID(), assetName, (sbyte)AssetType.Texture, assetCreator);
+                    asset.Temporary = true;
+                    asset.Data = item["assetdata"].AsBinary();
+                    dataCache.Cache(asset);
+                }
+            }
+            else
+            {
+                return new WearableCacheItem[0];
+            }
+            return ret.ToArray();
+
+        }
+        public static OSD ToOSD(WearableCacheItem[] pcacheItems, IImprovedAssetCache dataCache)
+        {
+            OSDArray arr = new OSDArray();
+            foreach (WearableCacheItem item in pcacheItems)
+            {
+                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 (dataCache != null)
+                {
+                    if (dataCache.Check(item.TextureID.ToString()))
+                    {
+                        AssetBase assetItem = dataCache.Get(item.TextureID.ToString());
+                        if (assetItem != null)
+                        {
+                            itemmap.Add("assetdata", OSD.FromBinary(assetItem.Data));
+                            itemmap.Add("assetcreator", OSD.FromString(assetItem.CreatorID));
+                            itemmap.Add("assetname", OSD.FromString(assetItem.Name));
+                        }
+                    }
+                }
+                arr.Add(itemmap);
+            }
+            return arr;
+        }
+        public static WearableCacheItem SearchTextureIndex(uint pTextureIndex,WearableCacheItem[] pcacheItems)
+        {
+            for (int i = 0; i < pcacheItems.Length; i++)
+            {
+                if (pcacheItems[i].TextureIndex == pTextureIndex)
+                    return pcacheItems[i];
+            }
+            return null;
+        }
+        public static WearableCacheItem SearchTextureCacheId(UUID pCacheId, WearableCacheItem[] pcacheItems)
+        {
+            for (int i = 0; i < pcacheItems.Length; i++)
+            {
+                if (pcacheItems[i].CacheId == pCacheId)
+                    return pcacheItems[i];
+            }
+            return null;
+        }
+        public static WearableCacheItem SearchTextureTextureId(UUID pTextureId, WearableCacheItem[] pcacheItems)
+        {
+            for (int i = 0; i < pcacheItems.Length; i++)
+            {
+                if (pcacheItems[i].TextureID == pTextureId)
+                    return pcacheItems[i];
+            }
+            return null;
+        }
+    }
+
+
+}
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 5c34cf4..b85d93d 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -235,6 +235,7 @@ namespace OpenSim.Framework
             catch (Exception ex)
             {
                 errorMessage = ex.Message;
+                m_log.Debug("[WEB UTIL]: Exception making request: " + ex.ToString());
             }
             finally
             {
@@ -318,7 +319,7 @@ namespace OpenSim.Framework
         /// </summary>
         public static OSDMap PostToService(string url, NameValueCollection data)
         {
-            return ServiceFormRequest(url,data,10000);
+            return ServiceFormRequest(url,data, 20000);
         }
         
         public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout)
@@ -732,7 +733,8 @@ namespace OpenSim.Framework
                     reqnum, verb, requestUrl);
 
             int tickstart = Util.EnvironmentTickCount();
-            int tickdata = 0;
+//            int tickdata = 0;
+            int tickdiff = 0;
 
             Type type = typeof(TRequest);
 
@@ -775,8 +777,8 @@ namespace OpenSim.Framework
                     requestStream.Close();
 
                     // capture how much time was spent writing
-                    tickdata = Util.EnvironmentTickCountSubtract(tickstart);
-
+                    // useless in this async
+//                    tickdata = Util.EnvironmentTickCountSubtract(tickstart);
                     request.BeginGetResponse(delegate(IAsyncResult ar)
                     {
                         response = request.EndGetResponse(ar);
@@ -793,7 +795,8 @@ namespace OpenSim.Framework
                         finally
                         {
                             // Let's not close this
-                            //buffer.Close();
+                            // yes do close it
+                            buffer.Close();
                             respStream.Close();
                             response.Close();
                         }
@@ -861,7 +864,6 @@ namespace OpenSim.Framework
                     }
     
                     //  m_log.DebugFormat("[ASYNC REQUEST]: Received {0}", deserial.ToString());
-
                     try
                     {
                         action(deserial);
@@ -876,9 +878,10 @@ namespace OpenSim.Framework
                 }, null);
             }
 
-            int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
+            tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
             if (tickdiff > WebUtil.LongCallTime)
             {
+/*
                 string originalRequest = null;
 
                 if (buffer != null)
@@ -897,12 +900,19 @@ namespace OpenSim.Framework
                     tickdiff,
                     tickdata,
                     originalRequest);
+*/
+                m_log.InfoFormat(
+                    "[ASYNC REQUEST]:  Slow WebRequest SETUP <{0}> {1} {2} took {3}ms",
+                    reqnum,
+                    verb,
+                    requestUrl,
+                    tickdiff);
             }
             else if (WebUtil.DebugLevel >= 4)
             {
                 m_log.DebugFormat(
-                    "[WEB UTIL]: HTTP OUT {0} took {1}ms, {2}ms writing",
-                    reqnum, tickdiff, tickdata);
+                    "[WEB UTIL]: HTTP OUT {0} took {1}ms",
+                    reqnum, tickdiff);
             }
         }
     }
@@ -937,6 +947,8 @@ namespace OpenSim.Framework
             request.Method = verb;
             string respstring = String.Empty;
 
+            int tickset = Util.EnvironmentTickCountSubtract(tickstart);
+
             using (MemoryStream buffer = new MemoryStream())
             {
                 if ((verb == "POST") || (verb == "PUT"))
@@ -1018,6 +1030,7 @@ namespace OpenSim.Framework
                     verb,
                     requestUrl,
                     tickdiff,
+                    tickset,
                     tickdata,
                     obj.Length > WebUtil.MaxRequestDiagLength ? obj.Remove(WebUtil.MaxRequestDiagLength) : obj);
             else if (WebUtil.DebugLevel >= 4)
@@ -1076,6 +1089,8 @@ namespace OpenSim.Framework
                 ht.ServicePoint.ConnectionLimit = maxConnections;
 
             request.Method = verb;
+            if (pTimeout != 0)
+                request.Timeout = pTimeout * 1000;
             MemoryStream buffer = null;
 
             if ((verb == "POST") || (verb == "PUT"))
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index c4731a3..e1cff69 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -445,7 +445,7 @@ namespace OpenSim
                     if (alert != null)
                         presence.ControllingClient.Kick(alert);
                     else
-                        presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n");
+                        presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n");
 
                     presence.Scene.IncomingCloseAgent(presence.UUID, force);
                 }
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 3c8e199..3f63534 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -97,6 +97,10 @@ namespace OpenSim
 
         protected List<IApplicationPlugin> m_plugins = new List<IApplicationPlugin>();
 
+        private List<string> m_permsModules;
+
+        private bool m_securePermissionsLoading = true;
+
         /// <value>
         /// The config information passed into the OpenSimulator region server.
         /// </value>
@@ -188,6 +192,11 @@ namespace OpenSim
                     CreatePIDFile(pidFile);
                 
                 userStatsURI = startupConfig.GetString("Stats_URI", String.Empty);
+
+                m_securePermissionsLoading = startupConfig.GetBoolean("SecurePermissionsLoading", true);
+
+                string permissionModules = startupConfig.GetString("permissionmodules", "DefaultPermissionsModule");
+                m_permsModules = new List<string>(permissionModules.Split(','));
             }
 
             // Load the simulation data service
@@ -225,6 +234,12 @@ namespace OpenSim
             base.StartupSpecific();
 
             LoadPlugins();
+
+            if (m_plugins.Count == 0) // We failed to load any modules. Mono Addins glitch!
+            {
+                Environment.Exit(1);
+            }
+
             foreach (IApplicationPlugin plugin in m_plugins)
             {
                 plugin.PostInitialise();
@@ -251,10 +266,10 @@ namespace OpenSim
                                               "help " + capitalizedTopic,
                                               "Get help on plugin command '" + topic + "'",
                                               HandleCommanderHelp);
-                console.Commands.AddCommand(capitalizedTopic, false, "help " + capitalizedTopic,
-                                              "help " + capitalizedTopic,
-                                              "Get help on plugin command '" + topic + "'",
-                                              HandleCommanderHelp);
+//                console.Commands.AddCommand(capitalizedTopic, false, "help " + capitalizedTopic,
+//                                              "help " + capitalizedTopic,
+//                                              "Get help on plugin command '" + topic + "'",
+//                                              HandleCommanderHelp);
 
                 ICommander commander = null;
 
@@ -377,7 +392,42 @@ namespace OpenSim
             }
             else m_log.Error("[REGIONMODULES]: The new RegionModulesController is missing...");
 
+            // XPTO: Fix this
+//            if (m_securePermissionsLoading)
+//            {
+//                foreach (string s in m_permsModules)
+//                {
+//                    if (!scene.RegionModules.ContainsKey(s))
+//                    {
+//                        bool found = false;
+//                        foreach (IRegionModule m in modules)
+//                        {
+//                            if (m.Name == s)
+//                            {
+//                                found = true;
+//                            }
+//                        }
+//                        if (!found)
+//                        {
+//                            m_log.Fatal("[MODULES]: Required module " + s + " not found.");
+//                            Environment.Exit(0);
+//                        }
+//                    }
+//                }
+//            }
+
             scene.SetModuleInterfaces();
+// First Step of bootreport sequence
+            if (scene.SnmpService != null)
+            {
+                scene.SnmpService.ColdStart(1,scene);
+                scene.SnmpService.LinkDown(scene);
+            }
+
+            if (scene.SnmpService != null)
+            {
+                scene.SnmpService.BootInfo("Loading prins", scene);
+            }
 
             while (regionInfo.EstateSettings.EstateOwner == UUID.Zero && MainConsole.Instance != null)
                 SetUpEstateOwner(scene);
@@ -391,6 +441,11 @@ namespace OpenSim
             scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
             scene.EventManager.TriggerParcelPrimCountUpdate();
 
+            if (scene.SnmpService != null)
+            {
+                scene.SnmpService.BootInfo("Grid Registration in progress", scene);
+            } 
+
             try
             {
                 scene.RegisterRegionWithGrid();
@@ -401,15 +456,29 @@ namespace OpenSim
                     "[STARTUP]: Registration of region with grid failed, aborting startup due to {0} {1}", 
                     e.Message, e.StackTrace);
 
+                if (scene.SnmpService != null)
+                {
+                    scene.SnmpService.Critical("Grid registration failed. Startup aborted.", scene);
+                }
                 // Carrying on now causes a lot of confusion down the
                 // line - we need to get the user's attention
                 Environment.Exit(1);
             }
 
+            if (scene.SnmpService != null)
+            {
+                scene.SnmpService.BootInfo("Grid Registration done", scene);
+            }
+
             // We need to do this after we've initialized the
             // scripting engines.
             scene.CreateScriptInstances();
 
+            if (scene.SnmpService != null)
+            {
+                scene.SnmpService.BootInfo("ScriptEngine started", scene);
+            }
+
             SceneManager.Add(scene);
 
             if (m_autoCreateClientStack)
@@ -421,10 +490,20 @@ namespace OpenSim
                 }
             }
 
+            if (scene.SnmpService != null)
+            {
+                scene.SnmpService.BootInfo("Initializing region modules", scene);
+            }
             scene.EventManager.OnShutdown += delegate() { ShutdownRegion(scene); };
 
             mscene = scene;
 
+            if (scene.SnmpService != null)
+            {
+                scene.SnmpService.BootInfo("The region is operational", scene);
+                scene.SnmpService.LinkUp(scene);
+            }
+
             scene.Start();
             scene.StartScripts();
 
@@ -543,6 +622,11 @@ namespace OpenSim
         private void ShutdownRegion(Scene scene)
         {
             m_log.DebugFormat("[SHUTDOWN]: Shutting down region {0}", scene.RegionInfo.RegionName);
+            if (scene.SnmpService != null)
+            {
+                scene.SnmpService.BootInfo("The region is shutting down", scene);
+                scene.SnmpService.LinkDown(scene);
+            }
             IRegionModulesController controller;
             if (ApplicationRegistry.TryGet<IRegionModulesController>(out controller))
             {
@@ -1089,4 +1173,4 @@ namespace OpenSim
     {
         public IConfigSource Source;
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 1af61db..d7d4708 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Timers;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
@@ -53,14 +54,16 @@ using OSDMap = OpenMetaverse.StructuredData.OSDMap;
 namespace OpenSim.Region.ClientStack.Linden
 {
     public delegate void UpLoadedAsset(
-    string assetName, string description, UUID assetID, UUID inventoryItem, UUID parentFolder,
-    byte[] data, string inventoryType, string assetType);
+        string assetName, string description, UUID assetID, UUID inventoryItem, UUID parentFolder,
+        byte[] data, string inventoryType, string assetType,
+        int cost, UUID texturesFolder, int nreqtextures, int nreqmeshs, int nreqinstances,
+        bool IsAtestUpload, ref string error);
 
     public delegate UUID UpdateItem(UUID itemID, byte[] data);
 
     public delegate void UpdateTaskScript(UUID itemID, UUID primID, bool isScriptRunning, byte[] data, ref ArrayList errors);
 
-    public delegate void NewInventoryItem(UUID userID, InventoryItemBase item);
+    public delegate void NewInventoryItem(UUID userID, InventoryItemBase item, uint cost);
 
     public delegate void NewAsset(AssetBase asset);
 
@@ -86,6 +89,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
         private Scene m_Scene;
         private Caps m_HostCapsObj;
+        private ModelCost m_ModelCost;
 
         private static readonly string m_requestPath = "0000/";
         // private static readonly string m_mapLayerPath = "0001/";
@@ -97,7 +101,8 @@ namespace OpenSim.Region.ClientStack.Linden
         private static readonly string m_copyFromNotecardPath = "0007/";
         // private static readonly string m_remoteParcelRequestPath = "0009/";// This is in the LandManagementModule.
         private static readonly string m_getObjectPhysicsDataPath = "0101/";
-        /* 0102 - 0103 RESERVED */
+        private static readonly string m_getObjectCostPath = "0102/";
+        private static readonly string m_ResourceCostSelectedPath = "0103/";
         private static readonly string m_UpdateAgentInformationPath = "0500/";
         
         // These are callbacks which will be setup by the scene so that we can update scene data when we
@@ -113,12 +118,50 @@ namespace OpenSim.Region.ClientStack.Linden
         private IAssetService m_assetService;
         private bool m_dumpAssetsToFile = false;
         private string m_regionName;
+
         private int m_levelUpload = 0;
 
+        private bool m_enableFreeTestUpload = false; // allows "TEST-" prefix hack
+        private bool m_ForceFreeTestUpload = false; // forces all uploads to be test
+
+        private bool m_enableModelUploadTextureToInventory = false; // place uploaded textures also in inventory
+                                                                    // may not be visible till relog
+        
+        private bool m_RestrictFreeTestUploadPerms = false; // reduces also the permitions. Needs a creator defined!!
+        private UUID m_testAssetsCreatorID = UUID.Zero;
+
+        private float m_PrimScaleMin = 0.001f;
+
+        private enum FileAgentInventoryState : int
+        {
+            idle = 0,
+            processRequest = 1,
+            waitUpload = 2,
+            processUpload = 3
+        }
+        private FileAgentInventoryState m_FileAgentInventoryState = FileAgentInventoryState.idle;
+        
         public BunchOfCaps(Scene scene, Caps caps)
         {
             m_Scene = scene;
             m_HostCapsObj = caps;
+
+            // create a model upload cost provider
+            m_ModelCost = new ModelCost();
+            // tell it about scene object limits
+            m_ModelCost.NonPhysicalPrimScaleMax = m_Scene.m_maxNonphys;
+            m_ModelCost.PhysicalPrimScaleMax = m_Scene.m_maxPhys;
+            
+//            m_ModelCost.ObjectLinkedPartsMax = ??
+//            m_ModelCost.PrimScaleMin = ??
+
+            m_PrimScaleMin = m_ModelCost.PrimScaleMin;
+            float modelTextureUploadFactor = m_ModelCost.ModelTextureCostFactor;
+            float modelUploadFactor = m_ModelCost.ModelMeshCostFactor;
+            float modelMinUploadCostFactor = m_ModelCost.ModelMinCostFactor;
+            float modelPrimCreationCost = m_ModelCost.primCreationCost;
+            float modelMeshByteCost = m_ModelCost.bytecost;
+
             IConfigSource config = m_Scene.Config;
             if (config != null)
             {
@@ -133,6 +176,37 @@ namespace OpenSim.Region.ClientStack.Linden
                 {
                     m_persistBakedTextures = appearanceConfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures);
                 }
+                // economy for model upload
+                IConfig EconomyConfig = config.Configs["Economy"];
+                if (EconomyConfig != null)
+                {
+                    modelUploadFactor = EconomyConfig.GetFloat("MeshModelUploadCostFactor", modelUploadFactor);
+                    modelTextureUploadFactor = EconomyConfig.GetFloat("MeshModelUploadTextureCostFactor", modelTextureUploadFactor);
+                    modelMinUploadCostFactor = EconomyConfig.GetFloat("MeshModelMinCostFactor", modelMinUploadCostFactor);
+                    // next 2 are normalized so final cost is afected by modelUploadFactor above and normal cost
+                    modelPrimCreationCost = EconomyConfig.GetFloat("ModelPrimCreationCost", modelPrimCreationCost);
+                    modelMeshByteCost = EconomyConfig.GetFloat("ModelMeshByteCost", modelMeshByteCost);
+
+                    m_enableModelUploadTextureToInventory = EconomyConfig.GetBoolean("MeshModelAllowTextureToInventory", m_enableModelUploadTextureToInventory);
+
+                    m_RestrictFreeTestUploadPerms = EconomyConfig.GetBoolean("m_RestrictFreeTestUploadPerms", m_RestrictFreeTestUploadPerms);
+                    m_enableFreeTestUpload = EconomyConfig.GetBoolean("AllowFreeTestUpload", m_enableFreeTestUpload);
+                    m_ForceFreeTestUpload = EconomyConfig.GetBoolean("ForceFreeTestUpload", m_ForceFreeTestUpload);
+                    string testcreator = EconomyConfig.GetString("TestAssetsCreatorID", "");
+                    if (testcreator != "")
+                    {
+                        UUID id;
+                        UUID.TryParse(testcreator, out id);
+                        if (id != null)
+                            m_testAssetsCreatorID = id;
+                    }
+
+                    m_ModelCost.ModelMeshCostFactor = modelUploadFactor;
+                    m_ModelCost.ModelTextureCostFactor = modelTextureUploadFactor;
+                    m_ModelCost.ModelMinCostFactor = modelMinUploadCostFactor;
+                    m_ModelCost.primCreationCost = modelPrimCreationCost;
+                    m_ModelCost.bytecost = modelMeshByteCost;
+                }
             }
 
             m_assetService = m_Scene.AssetService;
@@ -144,6 +218,8 @@ namespace OpenSim.Region.ClientStack.Linden
             ItemUpdatedCall = m_Scene.CapsUpdateInventoryItemAsset;
             TaskScriptUpdatedCall = m_Scene.CapsUpdateTaskInventoryScriptAsset;
             GetClient = m_Scene.SceneGraph.GetControllingClient;
+
+            m_FileAgentInventoryState = FileAgentInventoryState.idle;
         }
 
         /// <summary>
@@ -189,7 +265,6 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             try
             {
-                // I don't think this one works...
                 m_HostCapsObj.RegisterHandler(
                     "NewFileAgentInventory",
                     new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>(
@@ -208,6 +283,10 @@ namespace OpenSim.Region.ClientStack.Linden
                 m_HostCapsObj.RegisterHandler("UpdateScriptAgent", req);
                 IRequestHandler getObjectPhysicsDataHandler = new RestStreamHandler("POST", capsBase + m_getObjectPhysicsDataPath, GetObjectPhysicsData);
                 m_HostCapsObj.RegisterHandler("GetObjectPhysicsData", getObjectPhysicsDataHandler);
+                IRequestHandler getObjectCostHandler = new RestStreamHandler("POST", capsBase + m_getObjectCostPath, GetObjectCost);
+                m_HostCapsObj.RegisterHandler("GetObjectCost", getObjectCostHandler);
+                IRequestHandler ResourceCostSelectedHandler = new RestStreamHandler("POST", capsBase + m_ResourceCostSelectedPath, ResourceCostSelected);
+                m_HostCapsObj.RegisterHandler("ResourceCostSelected", ResourceCostSelectedHandler);       
                 IRequestHandler UpdateAgentInformationHandler = new RestStreamHandler("POST", capsBase + m_UpdateAgentInformationPath, UpdateAgentInformation);
                 m_HostCapsObj.RegisterHandler("UpdateAgentInformation", UpdateAgentInformationHandler);
 
@@ -392,62 +471,176 @@ namespace OpenSim.Region.ClientStack.Linden
             //m_log.Debug("[CAPS]: NewAgentInventoryRequest Request is: " + llsdRequest.ToString());
             //m_log.Debug("asset upload request via CAPS" + llsdRequest.inventory_type + " , " + llsdRequest.asset_type);
 
+            // start by getting the client
+            IClientAPI client = null;
+            m_Scene.TryGetClient(m_HostCapsObj.AgentID, out client);
+
+            // check current state so we only have one service at a time
+            lock (m_ModelCost)
+            {
+                switch (m_FileAgentInventoryState)
+                {
+                    case FileAgentInventoryState.processRequest:
+                    case FileAgentInventoryState.processUpload:
+                        LLSDAssetUploadError resperror = new LLSDAssetUploadError();
+                        resperror.message = "Uploader busy processing previus request";
+                        resperror.identifier = UUID.Zero;
+
+                        LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse();
+                        errorResponse.uploader = "";
+                        errorResponse.state = "error";
+                        errorResponse.error = resperror;
+                        return errorResponse;
+                        break;
+                    case FileAgentInventoryState.waitUpload:
+                        // todo stop current uploader server
+                        break;
+                    case FileAgentInventoryState.idle:
+                    default:
+                        break;
+                }
+
+                m_FileAgentInventoryState = FileAgentInventoryState.processRequest;
+            }
+
+            int cost = 0;
+            int nreqtextures = 0;
+            int nreqmeshs= 0;
+            int nreqinstances = 0;
+            bool IsAtestUpload = false;
+
+            string assetName = llsdRequest.name;
+
+            LLSDAssetUploadResponseData meshcostdata = new LLSDAssetUploadResponseData();
+
             if (llsdRequest.asset_type == "texture" ||
                 llsdRequest.asset_type == "animation" ||
+                llsdRequest.asset_type == "mesh" ||
                 llsdRequest.asset_type == "sound")
             {
                 ScenePresence avatar = null;
-                IClientAPI client = null;
                 m_Scene.TryGetScenePresence(m_HostCapsObj.AgentID, out avatar);
 
                 // check user level
                 if (avatar != null)
                 {
-                    client = avatar.ControllingClient;
-
                     if (avatar.UserLevel < m_levelUpload)
                     {
-                        if (client != null)
-                            client.SendAgentAlertMessage("Unable to upload asset. Insufficient permissions.", false);
+                        LLSDAssetUploadError resperror = new LLSDAssetUploadError();
+                        resperror.message = "Insufficient permissions to upload";
+                        resperror.identifier = UUID.Zero;
 
                         LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse();
                         errorResponse.uploader = "";
                         errorResponse.state = "error";
+                        errorResponse.error = resperror;
+                        lock (m_ModelCost)
+                            m_FileAgentInventoryState = FileAgentInventoryState.idle;
                         return errorResponse;
                     }
                 }
 
-                // check funds
+                // check test upload and funds
                 if (client != null)
                 {
                     IMoneyModule mm = m_Scene.RequestModuleInterface<IMoneyModule>();
 
+                    int baseCost = 0;
                     if (mm != null)
+                        baseCost = mm.UploadCharge;
+
+                    string warning = String.Empty;
+
+                    if (llsdRequest.asset_type == "mesh")
                     {
-                        if (!mm.UploadCovered(client.AgentId, mm.UploadCharge))
+                        string error;
+                        int modelcost;
+                        
+                        if (!m_ModelCost.MeshModelCost(llsdRequest.asset_resources, baseCost, out modelcost,
+                            meshcostdata, out error, ref warning))
                         {
-                            client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
+                            LLSDAssetUploadError resperror = new LLSDAssetUploadError();
+                            resperror.message = error;
+                            resperror.identifier = UUID.Zero;
 
                             LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse();
                             errorResponse.uploader = "";
                             errorResponse.state = "error";
+                            errorResponse.error = resperror;
+
+                            lock (m_ModelCost)
+                                m_FileAgentInventoryState = FileAgentInventoryState.idle;
                             return errorResponse;
                         }
+                        cost = modelcost;
+                    }
+                    else
+                    {
+                        cost = baseCost;
+                    }
+
+                    if (cost > 0 && mm != null)
+                    {
+                        // check for test upload
+
+                        if (m_ForceFreeTestUpload) // all are test
+                        {
+                            if (!(assetName.Length > 5 && assetName.StartsWith("TEST-"))) // has normal name lets change it
+                                assetName = "TEST-" + assetName;
+
+                            IsAtestUpload = true;
+                        }
+
+                        else if (m_enableFreeTestUpload) // only if prefixed with "TEST-"
+                        {
+
+                            IsAtestUpload = (assetName.Length > 5 && assetName.StartsWith("TEST-"));
+                        }
+
+
+                        if(IsAtestUpload) // let user know, still showing cost estimation
+                            warning += "Upload will have no cost, for testing purposes only. Other uses are prohibited. Items will not work after 48 hours or on other regions";
+
+                        // check funds
+                        else
+                        {
+                            if (!mm.UploadCovered(client.AgentId, (int)cost))
+                            {
+                                LLSDAssetUploadError resperror = new LLSDAssetUploadError();
+                                resperror.message = "Insuficient funds";
+                                resperror.identifier = UUID.Zero;
+
+                                LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse();
+                                errorResponse.uploader = "";
+                                errorResponse.state = "error";
+                                errorResponse.error = resperror;
+                                lock (m_ModelCost)
+                                    m_FileAgentInventoryState = FileAgentInventoryState.idle;
+                                return errorResponse;
+                            }
+                        }
                     }
+
+                    if (client != null && warning != String.Empty)
+                        client.SendAgentAlertMessage(warning, true);
                 }
             }
-
-            string assetName = llsdRequest.name;
+            
             string assetDes = llsdRequest.description;
             string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath;
             UUID newAsset = UUID.Random();
             UUID newInvItem = UUID.Random();
             UUID parentFolder = llsdRequest.folder_id;
             string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
+            UUID texturesFolder = UUID.Zero;
+
+            if(!IsAtestUpload && m_enableModelUploadTextureToInventory)
+                texturesFolder = llsdRequest.texture_folder_id;
 
             AssetUploader uploader =
                 new AssetUploader(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type,
-                                  llsdRequest.asset_type, capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_dumpAssetsToFile);
+                        llsdRequest.asset_type, capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_dumpAssetsToFile, cost,
+                        texturesFolder, nreqtextures, nreqmeshs, nreqinstances, IsAtestUpload);
 
             m_HostCapsObj.HttpListener.AddStreamHandler(
                 new BinaryStreamHandler(
@@ -465,10 +658,22 @@ namespace OpenSim.Region.ClientStack.Linden
             string uploaderURL = protocol + m_HostCapsObj.HostName + ":" + m_HostCapsObj.Port.ToString() + capsBase +
                                  uploaderPath;
 
+
             LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse();
             uploadResponse.uploader = uploaderURL;
             uploadResponse.state = "upload";
+            uploadResponse.upload_price = (int)cost;
+
+            if (llsdRequest.asset_type == "mesh")
+            {
+                uploadResponse.data = meshcostdata;
+            }
+
             uploader.OnUpLoad += UploadCompleteHandler;
+
+            lock (m_ModelCost)
+                m_FileAgentInventoryState = FileAgentInventoryState.waitUpload;
+
             return uploadResponse;
         }
 
@@ -480,8 +685,14 @@ namespace OpenSim.Region.ClientStack.Linden
         /// <param name="data"></param>
         public void UploadCompleteHandler(string assetName, string assetDescription, UUID assetID,
                                           UUID inventoryItem, UUID parentFolder, byte[] data, string inventoryType,
-                                          string assetType)
+                                          string assetType, int cost,
+                                          UUID texturesFolder, int nreqtextures, int nreqmeshs, int nreqinstances,
+                                          bool IsAtestUpload, ref string error)
         {
+
+            lock (m_ModelCost)
+                m_FileAgentInventoryState = FileAgentInventoryState.processUpload;
+
             m_log.DebugFormat(
                 "[BUNCH OF CAPS]: Uploaded asset {0} for inventory item {1}, inv type {2}, asset type {3}",
                 assetID, inventoryItem, inventoryType, assetType);
@@ -489,117 +700,247 @@ namespace OpenSim.Region.ClientStack.Linden
             sbyte assType = 0;
             sbyte inType = 0;
 
+            IClientAPI client = null;
+
+            UUID owner_id = m_HostCapsObj.AgentID;
+            UUID creatorID;
+
+            bool istest = IsAtestUpload && m_enableFreeTestUpload && (cost > 0);
+
+            bool restrictPerms = m_RestrictFreeTestUploadPerms && istest;
+
+            if (istest && m_testAssetsCreatorID != UUID.Zero)
+                creatorID = m_testAssetsCreatorID;
+            else
+                creatorID = owner_id;
+
+            string creatorIDstr = creatorID.ToString();
+
+            IMoneyModule mm = m_Scene.RequestModuleInterface<IMoneyModule>();
+            if (mm != null)
+            {
+                // make sure client still has enougth credit
+                if (!mm.UploadCovered(m_HostCapsObj.AgentID, (int)cost))
+                {
+                    error = "Insufficient funds.";
+                    return;
+                }
+            }
+
+            // strings to types
             if (inventoryType == "sound")
             {
-                inType = 1;
-                assType = 1;
+                inType = (sbyte)InventoryType.Sound;
+                assType = (sbyte)AssetType.Sound;
             }
             else if (inventoryType == "animation")
             {
-                inType = 19;
-                assType = 20;
+                inType = (sbyte)InventoryType.Animation;
+                assType = (sbyte)AssetType.Animation;
             }
             else if (inventoryType == "wearable")
             {
-                inType = 18;
+                inType = (sbyte)InventoryType.Wearable;
                 switch (assetType)
                 {
                     case "bodypart":
-                        assType = 13;
+                        assType = (sbyte)AssetType.Bodypart;
                         break;
                     case "clothing":
-                        assType = 5;
+                        assType = (sbyte)AssetType.Clothing;
                         break;
                 }
             }
             else if (inventoryType == "object")
             {
-                inType = (sbyte)InventoryType.Object;
-                assType = (sbyte)AssetType.Object;
-
-                List<Vector3> positions = new List<Vector3>();
-                List<Quaternion> rotations = new List<Quaternion>();
-                OSDMap request = (OSDMap)OSDParser.DeserializeLLSDXml(data);
-                OSDArray instance_list = (OSDArray)request["instance_list"];
-                OSDArray mesh_list = (OSDArray)request["mesh_list"];
-                OSDArray texture_list = (OSDArray)request["texture_list"];
-                SceneObjectGroup grp = null;
-
-                List<UUID> textures = new List<UUID>();
-                for (int i = 0; i < texture_list.Count; i++)
+                if (assetType == "mesh") // this code for now is for mesh models uploads only
                 {
-                    AssetBase textureAsset = new AssetBase(UUID.Random(), assetName, (sbyte)AssetType.Texture, "");
-                    textureAsset.Data = texture_list[i].AsBinary();
-                    m_assetService.Store(textureAsset);
-                    textures.Add(textureAsset.FullID);
-                }
+                    inType = (sbyte)InventoryType.Object;
+                    assType = (sbyte)AssetType.Object;
 
-                for (int i = 0; i < mesh_list.Count; i++)
-                {
-                    PrimitiveBaseShape pbs = PrimitiveBaseShape.CreateBox();
+                    List<Vector3> positions = new List<Vector3>();
+                    List<Quaternion> rotations = new List<Quaternion>();
+                    OSDMap request = (OSDMap)OSDParser.DeserializeLLSDXml(data);
 
-                    Primitive.TextureEntry textureEntry
-                        = new Primitive.TextureEntry(Primitive.TextureEntry.WHITE_TEXTURE);
-                    OSDMap inner_instance_list = (OSDMap)instance_list[i];
+                    // compare and get updated information
 
-                    OSDArray face_list = (OSDArray)inner_instance_list["face_list"];
-                    for (uint face = 0; face < face_list.Count; face++)
+                    bool mismatchError = true;
+
+                    while (mismatchError)
                     {
-                        OSDMap faceMap = (OSDMap)face_list[(int)face];
-                        Primitive.TextureEntryFace f = pbs.Textures.CreateFace(face);
-                        if(faceMap.ContainsKey("fullbright"))
-                            f.Fullbright = faceMap["fullbright"].AsBoolean();
-                        if (faceMap.ContainsKey ("diffuse_color"))
-                            f.RGBA = faceMap["diffuse_color"].AsColor4();
+                        mismatchError = false;
+                    }
 
-                        int textureNum = faceMap["image"].AsInteger();
-                        float imagerot = faceMap["imagerot"].AsInteger();
-                        float offsets = (float)faceMap["offsets"].AsReal();
-                        float offsett = (float)faceMap["offsett"].AsReal();
-                        float scales = (float)faceMap["scales"].AsReal();
-                        float scalet = (float)faceMap["scalet"].AsReal();
+                    if (mismatchError)
+                    {
+                        error = "Upload and fee estimation information don't match";
+                        lock (m_ModelCost)
+                            m_FileAgentInventoryState = FileAgentInventoryState.idle;
 
-                        if(imagerot != 0)
-                            f.Rotation = imagerot;
+                        return;
+                    }
 
-                        if(offsets != 0)
-                            f.OffsetU = offsets;
+                    OSDArray instance_list = (OSDArray)request["instance_list"];
+                    OSDArray mesh_list = (OSDArray)request["mesh_list"];
+                    OSDArray texture_list = (OSDArray)request["texture_list"];
+                    SceneObjectGroup grp = null;
 
-                        if (offsett != 0)
-                            f.OffsetV = offsett;
+                    // create and store texture assets
+                    bool doTextInv = (!istest && m_enableModelUploadTextureToInventory &&
+                                    texturesFolder != UUID.Zero);
 
-                        if (scales != 0)
-                            f.RepeatU = scales;
 
-                        if (scalet != 0)
-                            f.RepeatV = scalet;
+                    List<UUID> textures = new List<UUID>();
 
-                        if (textures.Count > textureNum)
-                            f.TextureID = textures[textureNum];
-                        else
-                            f.TextureID = Primitive.TextureEntry.WHITE_TEXTURE;
+                   
+                    if (doTextInv)
+                        m_Scene.TryGetClient(m_HostCapsObj.AgentID, out client);
 
-                        textureEntry.FaceTextures[face] = f;
+                    if(client == null) // don't put textures in inventory if there is no client
+                        doTextInv = false;
+
+                    for (int i = 0; i < texture_list.Count; i++)
+                    {
+                        AssetBase textureAsset = new AssetBase(UUID.Random(), assetName, (sbyte)AssetType.Texture, creatorIDstr);
+                        textureAsset.Data = texture_list[i].AsBinary();
+                        if (istest)
+                            textureAsset.Local = true;
+                        m_assetService.Store(textureAsset);
+                        textures.Add(textureAsset.FullID);
+
+                        if (doTextInv)
+                        {
+                            string name = assetName;
+                            if (name.Length > 25)
+                                name = name.Substring(0, 24);
+                            name += "_Texture#" + i.ToString();
+                            InventoryItemBase texitem = new InventoryItemBase();
+                            texitem.Owner = m_HostCapsObj.AgentID;
+                            texitem.CreatorId = creatorIDstr;
+                            texitem.CreatorData = String.Empty;
+                            texitem.ID = UUID.Random();
+                            texitem.AssetID = textureAsset.FullID;
+                            texitem.Description = "mesh model texture";
+                            texitem.Name = name;
+                            texitem.AssetType = (int)AssetType.Texture;
+                            texitem.InvType = (int)InventoryType.Texture;
+                            texitem.Folder = texturesFolder;
+
+                            texitem.CurrentPermissions
+                                = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer);
+
+                            texitem.BasePermissions = (uint)PermissionMask.All;
+                            texitem.EveryOnePermissions = 0;
+                            texitem.NextPermissions = (uint)PermissionMask.All;
+                            texitem.CreationDate = Util.UnixTimeSinceEpoch();
+
+                            m_Scene.AddInventoryItem(client, texitem);
+                            texitem = null;
+                        }
                     }
 
-                    pbs.TextureEntry = textureEntry.GetBytes();
+                    // create and store meshs assets
+                    List<UUID> meshAssets = new List<UUID>();
+                    for (int i = 0; i < mesh_list.Count; i++)
+                    {
+                        AssetBase meshAsset = new AssetBase(UUID.Random(), assetName, (sbyte)AssetType.Mesh, creatorIDstr);
+                        meshAsset.Data = mesh_list[i].AsBinary();
+                        if (istest)
+                            meshAsset.Local = true;
+                        m_assetService.Store(meshAsset);
+                        meshAssets.Add(meshAsset.FullID);
+                    }
+
+                    int skipedMeshs = 0;
+                    // build prims from instances
+                    for (int i = 0; i < instance_list.Count; i++)
+                    {
+                        OSDMap inner_instance_list = (OSDMap)instance_list[i];
+
+                        // skip prims that are 2 small
+                        Vector3 scale = inner_instance_list["scale"].AsVector3();
+
+                        if (scale.X < m_PrimScaleMin || scale.Y < m_PrimScaleMin || scale.Z < m_PrimScaleMin)
+                        {
+                            skipedMeshs++;
+                            continue;
+                        }
+
+                        PrimitiveBaseShape pbs = PrimitiveBaseShape.CreateBox();
+
+                        Primitive.TextureEntry textureEntry
+                            = new Primitive.TextureEntry(Primitive.TextureEntry.WHITE_TEXTURE);
+
 
-                    AssetBase meshAsset = new AssetBase(UUID.Random(), assetName, (sbyte)AssetType.Mesh, "");
-                    meshAsset.Data = mesh_list[i].AsBinary();
-                    m_assetService.Store(meshAsset);
+                        OSDArray face_list = (OSDArray)inner_instance_list["face_list"];
+                        for (uint face = 0; face < face_list.Count; face++)
+                        {
+                            OSDMap faceMap = (OSDMap)face_list[(int)face];
+                            Primitive.TextureEntryFace f = pbs.Textures.CreateFace(face);
+                            if (faceMap.ContainsKey("fullbright"))
+                                f.Fullbright = faceMap["fullbright"].AsBoolean();
+                            if (faceMap.ContainsKey("diffuse_color"))
+                                f.RGBA = faceMap["diffuse_color"].AsColor4();
+
+                            int textureNum = faceMap["image"].AsInteger();
+                            float imagerot = faceMap["imagerot"].AsInteger();
+                            float offsets = (float)faceMap["offsets"].AsReal();
+                            float offsett = (float)faceMap["offsett"].AsReal();
+                            float scales = (float)faceMap["scales"].AsReal();
+                            float scalet = (float)faceMap["scalet"].AsReal();
+
+                            if (imagerot != 0)
+                                f.Rotation = imagerot;
+
+                            if (offsets != 0)
+                                f.OffsetU = offsets;
 
-                    pbs.SculptEntry = true;
-                    pbs.SculptTexture = meshAsset.FullID;
-                    pbs.SculptType = (byte)SculptType.Mesh;
-                    pbs.SculptData = meshAsset.Data;
+                            if (offsett != 0)
+                                f.OffsetV = offsett;
 
-                    Vector3 position = inner_instance_list["position"].AsVector3();
-                    Vector3 scale = inner_instance_list["scale"].AsVector3();
-                    Quaternion rotation = inner_instance_list["rotation"].AsQuaternion();
+                            if (scales != 0)
+                                f.RepeatU = scales;
+
+                            if (scalet != 0)
+                                f.RepeatV = scalet;
+
+                            if (textures.Count > textureNum)
+                                f.TextureID = textures[textureNum];
+                            else
+                                f.TextureID = Primitive.TextureEntry.WHITE_TEXTURE;
+
+                            textureEntry.FaceTextures[face] = f;
+                        }
+
+                        pbs.TextureEntry = textureEntry.GetBytes();
+
+                        bool hasmesh = false;
+                        if (inner_instance_list.ContainsKey("mesh")) // seems to happen always but ...
+                        {
+                            int meshindx = inner_instance_list["mesh"].AsInteger();
+                            if (meshAssets.Count > meshindx)
+                            {
+                                pbs.SculptEntry = true;
+                                pbs.SculptType = (byte)SculptType.Mesh;
+                                pbs.SculptTexture = meshAssets[meshindx]; // actual asset UUID after meshs suport introduction
+                                // data will be requested from asset on rez (i hope)
+                                hasmesh = true;
+                            }
+                        }
+
+                        Vector3 position = inner_instance_list["position"].AsVector3();
+                        Quaternion rotation = inner_instance_list["rotation"].AsQuaternion();
+
+                        // for now viwers do send fixed defaults
+                        // but this may change
+//                        int physicsShapeType = inner_instance_list["physics_shape_type"].AsInteger();
+                        byte physicsShapeType = (byte)PhysShapeType.prim; // default for mesh is simple convex
+                        if(hasmesh)
+                            physicsShapeType = (byte) PhysShapeType.convex; // default for mesh is simple convex
+//                        int material = inner_instance_list["material"].AsInteger();
+                        byte material = (byte)Material.Wood;
 
 // no longer used - begin ------------------------
-//                    int physicsShapeType = inner_instance_list["physics_shape_type"].AsInteger();
-//                    int material = inner_instance_list["material"].AsInteger();
 //                    int mesh = inner_instance_list["mesh"].AsInteger();
 
 //                    OSDMap permissions = (OSDMap)inner_instance_list["permissions"];
@@ -614,24 +955,42 @@ namespace OpenSim.Region.ClientStack.Linden
 //                    UUID owner_id = permissions["owner_id"].AsUUID();
 //                    int owner_mask = permissions["owner_mask"].AsInteger();
 // no longer used - end ------------------------
+                       
+
+                        SceneObjectPart prim
+                            = new SceneObjectPart(owner_id, pbs, position, Quaternion.Identity, Vector3.Zero);
+
+                        prim.Scale = scale;
+                        rotations.Add(rotation);
+                        positions.Add(position);
+                        prim.UUID = UUID.Random();
+                        prim.CreatorID = creatorID;
+                        prim.OwnerID = owner_id;
+                        prim.GroupID = UUID.Zero;
+                        prim.LastOwnerID = creatorID;
+                        prim.CreationDate = Util.UnixTimeSinceEpoch();
+                        
+                        if (grp == null)
+                            prim.Name = assetName;
+                        else
+                            prim.Name = assetName + "#" + i.ToString();
 
-                      UUID owner_id = m_HostCapsObj.AgentID;
+                        if (restrictPerms)
+                        {
+                            prim.BaseMask = (uint)(PermissionMask.Move | PermissionMask.Modify);
+                            prim.EveryoneMask = 0;
+                            prim.GroupMask = 0;
+                            prim.NextOwnerMask = 0;
+                            prim.OwnerMask = (uint)(PermissionMask.Move | PermissionMask.Modify);
+                        }
 
-                    SceneObjectPart prim
-                        = new SceneObjectPart(owner_id, pbs, position, Quaternion.Identity, Vector3.Zero);
+                        if(istest)
+                            prim.Description = "For testing only. Other uses are prohibited";
+                        else
+                            prim.Description = "";
 
-                    prim.Scale = scale;
-                    //prim.OffsetPosition = position;
-                    rotations.Add(rotation);
-                    positions.Add(position);
-                    prim.UUID = UUID.Random();
-                    prim.CreatorID = owner_id;
-                    prim.OwnerID = owner_id;
-                    prim.GroupID = UUID.Zero;
-                    prim.LastOwnerID = prim.OwnerID;
-                    prim.CreationDate = Util.UnixTimeSinceEpoch();
-                    prim.Name = assetName;
-                    prim.Description = "";
+                        prim.Material = material;
+                        prim.PhysicsShapeType = physicsShapeType;
 
 //                    prim.BaseMask = (uint)base_mask;
 //                    prim.EveryoneMask = (uint)everyone_mask;
@@ -639,52 +998,64 @@ namespace OpenSim.Region.ClientStack.Linden
 //                    prim.NextOwnerMask = (uint)next_owner_mask;
 //                    prim.OwnerMask = (uint)owner_mask;
 
-                    if (grp == null)
-                        grp = new SceneObjectGroup(prim);
-                    else
-                        grp.AddPart(prim);
-                }
+                        if (grp == null)
+                        {
+                            grp = new SceneObjectGroup(prim);
+                            grp.LastOwnerID = creatorID;
+                        }
+                        else
+                            grp.AddPart(prim);
+                    }
 
-                Vector3 rootPos = positions[0];
+                    Vector3 rootPos = positions[0];
 
-                if (grp.Parts.Length > 1)
-                {
-                    // Fix first link number
-                    grp.RootPart.LinkNum++;
+                    if (grp.Parts.Length > 1)
+                    {
+                        // Fix first link number
+                        grp.RootPart.LinkNum++;
 
-                    Quaternion rootRotConj = Quaternion.Conjugate(rotations[0]);
-                    Quaternion tmprot;
-                    Vector3 offset;
+                        Quaternion rootRotConj = Quaternion.Conjugate(rotations[0]);
+                        Quaternion tmprot;
+                        Vector3 offset;
 
-                    // fix children rotations and positions
-                    for (int i = 1; i < rotations.Count; i++)
-                    {
-                        tmprot = rotations[i];
-                        tmprot = rootRotConj * tmprot;
+                        // fix children rotations and positions
+                        for (int i = 1; i < rotations.Count; i++)
+                        {
+                            tmprot = rotations[i];
+                            tmprot = rootRotConj * tmprot;
+
+                            grp.Parts[i].RotationOffset = tmprot;
 
-                        grp.Parts[i].RotationOffset = tmprot;
+                            offset = positions[i] - rootPos;
 
-                        offset = positions[i] - rootPos;
+                            offset *= rootRotConj;
+                            grp.Parts[i].OffsetPosition = offset;
+                        }
 
-                        offset *= rootRotConj;
-                        grp.Parts[i].OffsetPosition = offset;
+                        grp.AbsolutePosition = rootPos;
+                        grp.UpdateGroupRotationR(rotations[0]);
+                    }
+                    else
+                    {
+                        grp.AbsolutePosition = rootPos;
+                        grp.UpdateGroupRotationR(rotations[0]);
                     }
 
-                    grp.AbsolutePosition = rootPos;
-                    grp.UpdateGroupRotationR(rotations[0]);
+                    data = ASCIIEncoding.ASCII.GetBytes(SceneObjectSerializer.ToOriginalXmlFormat(grp));
                 }
-                else
+
+                else // not a mesh model
                 {
-                    grp.AbsolutePosition = rootPos;
-                    grp.UpdateGroupRotationR(rotations[0]);
+                    m_log.ErrorFormat("[CAPS Asset Upload] got unsuported assetType for object upload");
+                    return;
                 }
-
-                data = ASCIIEncoding.ASCII.GetBytes(SceneObjectSerializer.ToOriginalXmlFormat(grp));
             }
 
             AssetBase asset;
-            asset = new AssetBase(assetID, assetName, assType, m_HostCapsObj.AgentID.ToString());
+            asset = new AssetBase(assetID, assetName, assType, creatorIDstr);
             asset.Data = data;
+            if (istest)
+                asset.Local = true;
             if (AddNewAsset != null)
                 AddNewAsset(asset);
             else if (m_assetService != null)
@@ -692,11 +1063,17 @@ namespace OpenSim.Region.ClientStack.Linden
 
             InventoryItemBase item = new InventoryItemBase();
             item.Owner = m_HostCapsObj.AgentID;
-            item.CreatorId = m_HostCapsObj.AgentID.ToString();
+            item.CreatorId = creatorIDstr;
             item.CreatorData = String.Empty;
             item.ID = inventoryItem;
             item.AssetID = asset.FullID;
-            item.Description = assetDescription;
+            if (istest)
+            {
+                item.Description = "For testing only. Other uses are prohibited";
+                item.Flags = (uint) (InventoryItemFlags.SharedSingleReference);
+            }
+            else
+                item.Description = assetDescription;
             item.Name = assetName;
             item.AssetType = assType;
             item.InvType = inType;
@@ -704,18 +1081,60 @@ namespace OpenSim.Region.ClientStack.Linden
 
             // If we set PermissionMask.All then when we rez the item the next permissions will replace the current
             // (owner) permissions.  This becomes a problem if next permissions are changed.
-            item.CurrentPermissions
-                = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer);
 
-            item.BasePermissions = (uint)PermissionMask.All;
-            item.EveryOnePermissions = 0;
-            item.NextPermissions = (uint)PermissionMask.All;
+            if (restrictPerms)
+            {
+                item.CurrentPermissions
+                    = (uint)(PermissionMask.Move | PermissionMask.Modify);
+
+                item.BasePermissions = (uint)(PermissionMask.Move | PermissionMask.Modify);
+                item.EveryOnePermissions = 0;
+                item.NextPermissions = 0;
+            }
+            else
+            {
+                item.CurrentPermissions
+                    = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer);
+
+                item.BasePermissions = (uint)PermissionMask.All;
+                item.EveryOnePermissions = 0;
+                item.NextPermissions = (uint)PermissionMask.All;
+            }
+
             item.CreationDate = Util.UnixTimeSinceEpoch();
 
+            m_Scene.TryGetClient(m_HostCapsObj.AgentID, out client);
+
             if (AddNewInventoryItem != null)
             {
-                AddNewInventoryItem(m_HostCapsObj.AgentID, item);
+                if (istest)
+                {
+                    m_Scene.AddInventoryItem(client, item);
+/*
+                    AddNewInventoryItem(m_HostCapsObj.AgentID, item, 0);
+                    if (client != null)
+                        client.SendAgentAlertMessage("Upload will have no cost, for personal test purposes only. Other uses are forbiden. Items may not work on a another region" , true);
+ */
+                }
+                else
+                {
+                    AddNewInventoryItem(m_HostCapsObj.AgentID, item, (uint)cost);
+//                    if (client != null)
+//                    {
+//                        // let users see anything..  i don't so far
+//                        string str;
+//                        if (cost > 0)
+//                            // dont remember where is money unit name to put here
+//                            str = "Upload complete. charged " + cost.ToString() + "$";
+//                        else
+//                            str = "Upload complete";
+//                        client.SendAgentAlertMessage(str, true);
+//                    }
+                }
             }
+
+            lock (m_ModelCost)
+                m_FileAgentInventoryState = FileAgentInventoryState.idle;
         }
 
         /// <summary>
@@ -908,6 +1327,120 @@ namespace OpenSim.Region.ClientStack.Linden
             return response;
         }
 
+        public string GetObjectCost(string request, string path,
+                string param, IOSHttpRequest httpRequest,
+                IOSHttpResponse httpResponse)
+        {          
+            OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
+            OSDMap resp = new OSDMap();
+
+            OSDArray object_ids = (OSDArray)req["object_ids"];
+
+            for (int i = 0; i < object_ids.Count; i++)
+            {
+                UUID uuid = object_ids[i].AsUUID();
+                                
+                SceneObjectPart part = m_Scene.GetSceneObjectPart(uuid);
+
+                if (part != null)
+                {
+                    SceneObjectGroup grp = part.ParentGroup;
+                    if (grp != null)
+                    {
+                        float linksetCost;
+                        float linksetPhysCost;
+                        float partCost;
+                        float partPhysCost;
+
+                        grp.GetResourcesCosts(part, out linksetCost, out linksetPhysCost, out partCost, out  partPhysCost);
+
+                        OSDMap object_data = new OSDMap();
+                        object_data["linked_set_resource_cost"] = linksetCost;
+                        object_data["resource_cost"] = partCost;
+                        object_data["physics_cost"] = partPhysCost;
+                        object_data["linked_set_physics_cost"] = linksetPhysCost;
+
+                        resp[uuid.ToString()] = object_data;
+                    }
+                }
+            }
+
+            string response = OSDParser.SerializeLLSDXmlString(resp);
+            return response; 
+        }
+
+        public string ResourceCostSelected(string request, string path,
+                string param, IOSHttpRequest httpRequest,
+                IOSHttpResponse httpResponse)
+        {
+            OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
+            OSDMap resp = new OSDMap();
+
+
+            float phys=0;
+            float stream=0;
+            float simul=0;
+
+            if (req.ContainsKey("selected_roots"))
+            {
+                OSDArray object_ids = (OSDArray)req["selected_roots"];
+
+                // should go by SOG suming costs for all parts
+                // ll v3 works ok with several objects select we get the list and adds ok
+                // FS calls per object so results are wrong guess fs bug
+                for (int i = 0; i < object_ids.Count; i++)
+                {
+                    UUID uuid = object_ids[i].AsUUID();
+                    float Physc;
+                    float simulc;
+                    float streamc;
+
+                    SceneObjectGroup grp = m_Scene.GetGroupByPrim(uuid);
+                    if (grp != null)
+                    {
+                        grp.GetSelectedCosts(out Physc, out streamc, out simulc);
+                        phys += Physc;
+                        stream += streamc;
+                        simul += simulc;
+                    }
+                }
+            }
+            else if (req.ContainsKey("selected_prims"))
+            {
+                OSDArray object_ids = (OSDArray)req["selected_prims"];
+
+                // don't see in use in any of the 2 viewers
+                // guess it should be for edit linked but... nothing
+                // should go to SOP per part
+                for (int i = 0; i < object_ids.Count; i++)
+                {
+                    UUID uuid = object_ids[i].AsUUID();
+
+                    SceneObjectPart part = m_Scene.GetSceneObjectPart(uuid);
+                    if (part != null)
+                    {
+                        phys += part.PhysicsCost;
+                        stream += part.StreamingCost;
+                        simul += part.SimulationCost;
+                    }
+                }
+            }
+
+            if (simul != 0)
+            {
+                OSDMap object_data = new OSDMap();
+
+                object_data["physics"] = phys;
+                object_data["streaming"] = stream;
+                object_data["simulation"] = simul;
+
+                resp["selected"] = object_data;
+            }
+
+            string response = OSDParser.SerializeLLSDXmlString(resp);
+            return response; 
+        }
+
         public string UpdateAgentInformation(string request, string path,
                 string param, IOSHttpRequest httpRequest,
                 IOSHttpResponse httpResponse)
@@ -927,6 +1460,10 @@ namespace OpenSim.Region.ClientStack.Linden
 
     public class AssetUploader
     {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+
         public event UpLoadedAsset OnUpLoad;
         private UpLoadedAsset handlerUpLoad = null;
 
@@ -941,10 +1478,21 @@ namespace OpenSim.Region.ClientStack.Linden
 
         private string m_invType = String.Empty;
         private string m_assetType = String.Empty;
+        private int m_cost;
+        private string m_error = String.Empty;
+        
+        private Timer m_timeoutTimer = new Timer();
+        private UUID m_texturesFolder;
+        private int m_nreqtextures;
+        private int m_nreqmeshs;
+        private int m_nreqinstances;
+        private bool m_IsAtestUpload;
 
         public AssetUploader(string assetName, string description, UUID assetID, UUID inventoryItem,
                                 UUID parentFolderID, string invType, string assetType, string path,
-                                IHttpServer httpServer, bool dumpAssetsToFile)
+                                IHttpServer httpServer, bool dumpAssetsToFile,
+                                int totalCost, UUID texturesFolder, int nreqtextures, int nreqmeshs, int nreqinstances,
+                                bool IsAtestUpload)
         {
             m_assetName = assetName;
             m_assetDes = description;
@@ -956,6 +1504,18 @@ namespace OpenSim.Region.ClientStack.Linden
             m_assetType = assetType;
             m_invType = invType;
             m_dumpAssetsToFile = dumpAssetsToFile;
+            m_cost = totalCost;
+
+            m_texturesFolder = texturesFolder;
+            m_nreqtextures = nreqtextures;
+            m_nreqmeshs = nreqmeshs;
+            m_nreqinstances = nreqinstances;
+            m_IsAtestUpload = IsAtestUpload;
+
+            m_timeoutTimer.Elapsed += TimedOut;
+            m_timeoutTimer.Interval = 120000;
+            m_timeoutTimer.AutoReset = false;
+            m_timeoutTimer.Start();
         }
 
         /// <summary>
@@ -970,12 +1530,14 @@ namespace OpenSim.Region.ClientStack.Linden
             UUID inv = inventoryItemID;
             string res = String.Empty;
             LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
+/*
             uploadComplete.new_asset = newAssetID.ToString();
             uploadComplete.new_inventory_item = inv;
             uploadComplete.state = "complete";
 
             res = LLSDHelpers.SerialiseLLSDReply(uploadComplete);
-
+*/
+            m_timeoutTimer.Stop();
             httpListener.RemoveStreamHandler("POST", uploaderPath);
 
             // TODO: probably make this a better set of extensions here
@@ -992,12 +1554,49 @@ namespace OpenSim.Region.ClientStack.Linden
             handlerUpLoad = OnUpLoad;
             if (handlerUpLoad != null)
             {
-                handlerUpLoad(m_assetName, m_assetDes, newAssetID, inv, parentFolder, data, m_invType, m_assetType);
+                handlerUpLoad(m_assetName, m_assetDes, newAssetID, inv, parentFolder, data, m_invType, m_assetType,
+                    m_cost, m_texturesFolder, m_nreqtextures, m_nreqmeshs, m_nreqinstances, m_IsAtestUpload, ref m_error);
+            }
+            if (m_IsAtestUpload)
+            {
+                LLSDAssetUploadError resperror = new LLSDAssetUploadError();
+                resperror.message = "Upload SUCESSEFULL for testing purposes only. Other uses are prohibited. Item will not work after 48 hours or on other regions";
+                resperror.identifier = inv;
+
+                uploadComplete.error = resperror;
+                uploadComplete.state = "Upload4Testing";
             }
+            else
+            {
+                if (m_error == String.Empty)
+                {
+                    uploadComplete.new_asset = newAssetID.ToString();
+                    uploadComplete.new_inventory_item = inv;
+                    //                if (m_texturesFolder != UUID.Zero)
+                    //                    uploadComplete.new_texture_folder_id = m_texturesFolder;
+                    uploadComplete.state = "complete";
+                }
+                else
+                {
+                    LLSDAssetUploadError resperror = new LLSDAssetUploadError();
+                    resperror.message = m_error;
+                    resperror.identifier = inv;
 
+                    uploadComplete.error = resperror;
+                    uploadComplete.state = "failed";
+                }
+            }
+
+            res = LLSDHelpers.SerialiseLLSDReply(uploadComplete);
             return res;
         }
 
+        private void TimedOut(object sender, ElapsedEventArgs args)
+        {
+            m_log.InfoFormat("[CAPS]: Removing URL and handler for timed out mesh upload");
+            httpListener.RemoveStreamHandler("POST", uploaderPath);
+        }
+
         ///Left this in and commented in case there are unforseen issues
         //private void SaveAssetToFile(string filename, byte[] data)
         //{
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
new file mode 100644
index 0000000..4a3fae6
--- /dev/null
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
@@ -0,0 +1,671 @@
+// Proprietary code of Avination Virtual Limited
+// (c) 2012 Melanie Thielker, Leal Duarte
+//
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+
+using OpenSim.Framework;
+using OpenSim.Region.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Framework.Capabilities;
+
+using ComponentAce.Compression.Libs.zlib;
+
+using OSDArray = OpenMetaverse.StructuredData.OSDArray;
+using OSDMap = OpenMetaverse.StructuredData.OSDMap;
+
+namespace OpenSim.Region.ClientStack.Linden
+{
+    public struct ModelPrimLimits
+    {
+        
+    }
+
+    public class ModelCost
+    {
+
+        // upload fee defaults
+        // fees are normalized to 1.0
+        // this parameters scale them to basic cost ( so 1.0 translates to 10 )
+
+        public float ModelMeshCostFactor = 0.0f; // scale total cost relative to basic (excluding textures)
+        public float ModelTextureCostFactor = 1.0f; // scale textures fee to basic.
+        public float ModelMinCostFactor = 0.0f; // 0.5f; // minimum total model free excluding textures
+
+        // itens costs in normalized values
+        // ie will be multiplied by basicCost and factors above
+        public float primCreationCost = 0.002f;  // extra cost for each prim creation overhead
+        // weigthed size to normalized cost
+        public float bytecost = 1e-5f;
+
+        // mesh upload fees based on compressed data sizes
+        // several data sections are counted more that once
+        // to promote user optimization
+        // following parameters control how many extra times they are added
+        // to global size.
+        // LOD meshs
+        const float medSizeWth = 1f; // 2x
+        const float lowSizeWth = 1.5f; // 2.5x
+        const float lowestSizeWth = 2f; // 3x
+        // favor potencially physical optimized meshs versus automatic decomposition
+        const float physMeshSizeWth = 6f; // counts  7x
+        const float physHullSizeWth = 8f; // counts  9x      
+
+        // stream cost area factors 
+        // more or less like SL
+        const float highLodFactor = 17.36f;
+        const float midLodFactor = 277.78f;
+        const float lowLodFactor = 1111.11f;
+
+        // physics cost is below, identical to SL, assuming shape type convex
+        // server cost is below identical to SL assuming non scripted non physical object
+
+        // internal
+        const int bytesPerCoord = 6; // 3 coords, 2 bytes per each
+
+        // control prims dimensions
+        public float PrimScaleMin = 0.001f;
+        public float NonPhysicalPrimScaleMax = 256f;
+        public float PhysicalPrimScaleMax = 10f;
+        public int ObjectLinkedPartsMax = 512;
+
+        // storage for a single mesh asset cost parameters       
+        private class ameshCostParam
+        {
+            // LOD sizes for size dependent streaming cost
+            public int highLODSize;
+            public int medLODSize;
+            public int lowLODSize;
+            public int lowestLODSize;
+            // normalized fee based on compressed data sizes
+            public float costFee;
+            // physics cost
+            public float physicsCost;
+        }
+
+        // calculates a mesh model costs
+        // returns false on error, with a reason on parameter error
+        // resources input LLSD request
+        // basicCost input region assets upload cost
+        // totalcost returns model total upload fee
+        // meshcostdata returns detailed costs for viewer 
+        public bool MeshModelCost(LLSDAssetResource resources, int basicCost, out int totalcost, 
+            LLSDAssetUploadResponseData meshcostdata, out string error, ref string warning)
+        {
+            totalcost = 0;
+            error = string.Empty;
+            
+            if (resources == null ||
+                resources.instance_list == null ||
+                resources.instance_list.Array.Count == 0)
+            {
+                error = "missing model information.";
+                return false;
+            }
+
+            int numberInstances = resources.instance_list.Array.Count;
+
+            if( numberInstances > ObjectLinkedPartsMax )
+            {
+                error = "Model whould have more than " + ObjectLinkedPartsMax.ToString() + " linked prims";
+                return false;
+            }
+
+            meshcostdata.model_streaming_cost = 0.0;
+            meshcostdata.simulation_cost = 0.0;
+            meshcostdata.physics_cost = 0.0;
+            meshcostdata.resource_cost = 0.0;
+
+            meshcostdata.upload_price_breakdown.mesh_instance = 0;
+            meshcostdata.upload_price_breakdown.mesh_physics = 0;
+            meshcostdata.upload_price_breakdown.mesh_streaming = 0;
+            meshcostdata.upload_price_breakdown.model = 0;
+
+            int itmp;
+
+            // textures cost
+            if (resources.texture_list != null && resources.texture_list.Array.Count > 0)
+            {
+                float textures_cost = (float)(resources.texture_list.Array.Count * basicCost);
+                textures_cost *= ModelTextureCostFactor;
+
+                itmp = (int)(textures_cost + 0.5f); // round
+                meshcostdata.upload_price_breakdown.texture = itmp;
+                totalcost += itmp;
+            }
+
+            // meshs assets cost
+            float meshsfee = 0;
+            int numberMeshs = 0;
+            bool haveMeshs = false;
+            List<ameshCostParam> meshsCosts = new List<ameshCostParam>();
+
+            if (resources.mesh_list != null && resources.mesh_list.Array.Count > 0)
+            {
+                numberMeshs = resources.mesh_list.Array.Count;
+                
+                for (int i = 0; i < numberMeshs; i++)
+                {
+                    ameshCostParam curCost = new ameshCostParam();
+                    byte[] data = (byte[])resources.mesh_list.Array[i];
+
+                    if (!MeshCost(data, curCost, out error))
+                    {
+                        return false;
+                    }
+                    meshsCosts.Add(curCost);
+                    meshsfee += curCost.costFee;
+                }
+                haveMeshs = true;
+            }
+
+            // instances (prims) cost
+            
+
+            int mesh;
+            int skipedSmall = 0;
+            for (int i = 0; i < numberInstances; i++)
+            {
+                Hashtable inst = (Hashtable)resources.instance_list.Array[i];
+
+                ArrayList ascale = (ArrayList)inst["scale"];
+                Vector3 scale;
+                double tmp;
+                tmp = (double)ascale[0];
+                scale.X = (float)tmp;
+                tmp = (double)ascale[1];
+                scale.Y = (float)tmp;
+                tmp = (double)ascale[2];
+                scale.Z = (float)tmp;
+
+                if (scale.X < PrimScaleMin || scale.Y < PrimScaleMin || scale.Z < PrimScaleMin)
+                {
+                    skipedSmall++;
+                    continue;
+                }
+
+                if (scale.X > NonPhysicalPrimScaleMax || scale.Y > NonPhysicalPrimScaleMax || scale.Z > NonPhysicalPrimScaleMax)
+                {
+                    error = "Model contains parts with sides larger than " + NonPhysicalPrimScaleMax.ToString() + "m. Please ajust scale";
+                    return false;
+                }
+
+                if (haveMeshs && inst.ContainsKey("mesh"))
+                {
+                    mesh = (int)inst["mesh"];
+
+                    if (mesh >= numberMeshs)
+                    {
+                        error = "Incoerent model information.";
+                        return false;
+                    }
+
+                    // streamming cost
+
+                    float sqdiam = scale.LengthSquared();
+
+                    ameshCostParam curCost = meshsCosts[mesh];
+                    float mesh_streaming = streamingCost(curCost, sqdiam);
+
+                    meshcostdata.model_streaming_cost += mesh_streaming;
+                    meshcostdata.physics_cost += curCost.physicsCost;
+                }
+                else // instance as no mesh ??
+                {
+                    // to do later if needed
+                    meshcostdata.model_streaming_cost += 0.5f;
+                    meshcostdata.physics_cost += 1.0f;
+                }
+
+                // assume unscripted and static prim server cost
+                meshcostdata.simulation_cost += 0.5f;
+                // charge for prims creation
+                meshsfee += primCreationCost;
+            }
+
+            if (skipedSmall > 0)
+            {
+                if (skipedSmall > numberInstances / 2)
+                {
+                    error = "Model contains too many prims smaller than " + PrimScaleMin.ToString() +
+                        "m minimum allowed size. Please check scalling";
+                    return false;
+                }
+                else
+                    warning += skipedSmall.ToString() + " of the requested " +numberInstances.ToString() +
+                        " model prims will not upload because they are smaller than " + PrimScaleMin.ToString() +
+                        "m minimum allowed size. Please check scalling ";
+            }
+
+            if (meshcostdata.physics_cost <= meshcostdata.model_streaming_cost)
+                meshcostdata.resource_cost = meshcostdata.model_streaming_cost;
+            else
+                meshcostdata.resource_cost = meshcostdata.physics_cost;
+
+            if (meshcostdata.resource_cost < meshcostdata.simulation_cost)
+                meshcostdata.resource_cost = meshcostdata.simulation_cost;
+
+            // scale cost
+            // at this point a cost of 1.0 whould mean basic cost
+            meshsfee *= ModelMeshCostFactor;
+
+            if (meshsfee < ModelMinCostFactor)
+                meshsfee = ModelMinCostFactor;
+
+            // actually scale it to basic cost
+            meshsfee *= (float)basicCost;
+
+            meshsfee += 0.5f; // rounding
+
+            totalcost += (int)meshsfee;
+
+            // breakdown prices
+            // don't seem to be in use so removed code for now
+            
+            return true;
+        }
+
+        // single mesh asset cost
+        private bool MeshCost(byte[] data, ameshCostParam cost, out string error)
+        {
+            cost.highLODSize = 0;
+            cost.medLODSize = 0;
+            cost.lowLODSize = 0;
+            cost.lowestLODSize = 0;
+            cost.physicsCost = 0.0f;
+            cost.costFee = 0.0f;
+
+            error = string.Empty;
+
+            if (data == null || data.Length == 0)
+            {
+                error = "Missing model information.";
+                return false;
+            }
+
+            OSD meshOsd = null;
+            int start = 0;
+
+            error = "Invalid model data";
+
+            using (MemoryStream ms = new MemoryStream(data))
+            {
+                try
+                {
+                    OSD osd = OSDParser.DeserializeLLSDBinary(ms);
+                    if (osd is OSDMap)
+                        meshOsd = (OSDMap)osd;
+                    else
+                        return false;
+                }
+                catch (Exception e)
+                {
+                    return false;
+                }
+                start = (int)ms.Position;
+            }
+
+            OSDMap map = (OSDMap)meshOsd;
+            OSDMap tmpmap;
+
+            int highlod_size = 0;
+            int medlod_size = 0;
+            int lowlod_size = 0;
+            int lowestlod_size = 0;
+            int skin_size = 0;
+
+            int hulls_size = 0;
+            int phys_nhulls;
+            int phys_hullsvertices = 0;
+
+            int physmesh_size = 0;
+            int phys_ntriangles = 0;
+
+            int submesh_offset = -1;
+
+            if (map.ContainsKey("physics_convex"))
+            {
+                tmpmap = (OSDMap)map["physics_convex"];
+                if (tmpmap.ContainsKey("offset"))
+                    submesh_offset = tmpmap["offset"].AsInteger() + start;
+                if (tmpmap.ContainsKey("size"))
+                    hulls_size = tmpmap["size"].AsInteger();
+            }
+
+            if (submesh_offset < 0 || hulls_size == 0)
+            {
+                error = "Missing physics_convex block";
+                return false;
+            }
+
+            if (!hulls(data, submesh_offset, hulls_size, out phys_hullsvertices, out phys_nhulls))
+            {
+                error = "Bad physics_convex block";
+                return false;
+            }
+
+            submesh_offset = -1;
+            
+            // only look for LOD meshs sizes
+
+            if (map.ContainsKey("high_lod"))
+            {
+                tmpmap = (OSDMap)map["high_lod"];
+                // see at least if there is a offset for this one
+                if (tmpmap.ContainsKey("offset"))
+                    submesh_offset = tmpmap["offset"].AsInteger() + start;
+                if (tmpmap.ContainsKey("size"))
+                    highlod_size = tmpmap["size"].AsInteger();
+            }
+
+            if (submesh_offset < 0 || highlod_size <= 0)
+            {
+                error = "Missing high_lod block";
+                return false;
+            }
+
+            bool haveprev = true;
+
+            if (map.ContainsKey("medium_lod"))
+            {
+                tmpmap = (OSDMap)map["medium_lod"];
+                if (tmpmap.ContainsKey("size"))
+                    medlod_size = tmpmap["size"].AsInteger();
+                else
+                    haveprev = false;
+            }
+
+            if (haveprev && map.ContainsKey("low_lod"))
+            {
+                tmpmap = (OSDMap)map["low_lod"];
+                if (tmpmap.ContainsKey("size"))
+                    lowlod_size = tmpmap["size"].AsInteger();
+                else
+                    haveprev = false;
+            }
+
+            if (haveprev && map.ContainsKey("lowest_lod"))
+            {
+                tmpmap = (OSDMap)map["lowest_lod"];
+                if (tmpmap.ContainsKey("size"))
+                    lowestlod_size = tmpmap["size"].AsInteger();
+            }
+
+            if (map.ContainsKey("skin"))
+            {
+                tmpmap = (OSDMap)map["skin"];
+                if (tmpmap.ContainsKey("size"))
+                    skin_size = tmpmap["size"].AsInteger();
+            }
+
+            cost.highLODSize = highlod_size;
+            cost.medLODSize = medlod_size;
+            cost.lowLODSize = lowlod_size;
+            cost.lowestLODSize = lowestlod_size;
+
+            submesh_offset = -1;
+
+            tmpmap = null;
+            if(map.ContainsKey("physics_mesh"))
+                tmpmap = (OSDMap)map["physics_mesh"];
+            else if (map.ContainsKey("physics_shape")) // old naming
+                tmpmap = (OSDMap)map["physics_shape"];
+
+            if(tmpmap != null)
+            {
+                if (tmpmap.ContainsKey("offset"))
+                    submesh_offset = tmpmap["offset"].AsInteger() + start;
+                if (tmpmap.ContainsKey("size"))
+                    physmesh_size = tmpmap["size"].AsInteger();
+
+                if (submesh_offset >= 0 || physmesh_size > 0)
+                {
+
+                    if (!submesh(data, submesh_offset, physmesh_size, out phys_ntriangles))
+                    {
+                        error = "Model data parsing error";
+                        return false;
+                    }
+                }
+            }
+
+            // upload is done in convex shape type so only one hull
+            phys_hullsvertices++;
+            cost.physicsCost = 0.04f * phys_hullsvertices;
+
+            float sfee;
+            
+            sfee = data.Length; // start with total compressed data size
+
+            // penalize lod meshs that should be more builder optimized
+            sfee += medSizeWth * medlod_size;
+            sfee += lowSizeWth * lowlod_size;
+            sfee += lowestSizeWth * lowlod_size;
+
+            // physics
+            // favor potencial optimized meshs versus automatic decomposition
+            if (physmesh_size != 0)
+                sfee += physMeshSizeWth * (physmesh_size + hulls_size / 4); // reduce cost of mandatory convex hull
+            else
+                sfee += physHullSizeWth * hulls_size;
+
+            // bytes to money
+            sfee *= bytecost;
+           
+            cost.costFee = sfee;
+            return true;
+        }
+
+        // parses a LOD or physics mesh component
+        private bool submesh(byte[] data, int offset, int size, out int ntriangles)
+        {
+            ntriangles = 0;
+
+            OSD decodedMeshOsd = new OSD();
+            byte[] meshBytes = new byte[size];
+            System.Buffer.BlockCopy(data, offset, meshBytes, 0, size);
+            try
+            {
+                using (MemoryStream inMs = new MemoryStream(meshBytes))
+                {
+                    using (MemoryStream outMs = new MemoryStream())
+                    {
+                        using (ZOutputStream zOut = new ZOutputStream(outMs))
+                        {
+                            byte[] readBuffer = new byte[4096];
+                            int readLen = 0;
+                            while ((readLen = inMs.Read(readBuffer, 0, readBuffer.Length)) > 0)
+                            {
+                                zOut.Write(readBuffer, 0, readLen);
+                            }
+                            zOut.Flush();
+                            outMs.Seek(0, SeekOrigin.Begin);
+
+                            byte[] decompressedBuf = outMs.GetBuffer();
+                            decodedMeshOsd = OSDParser.DeserializeLLSDBinary(decompressedBuf);
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                return false;
+            }
+
+            OSDArray decodedMeshOsdArray = null;
+            if ((!decodedMeshOsd is OSDArray))
+                return false;
+
+            byte[] dummy;
+
+            decodedMeshOsdArray = (OSDArray)decodedMeshOsd;
+            foreach (OSD subMeshOsd in decodedMeshOsdArray)
+            {
+                if (subMeshOsd is OSDMap)
+                {
+                    OSDMap subtmpmap = (OSDMap)subMeshOsd;
+                    if (subtmpmap.ContainsKey("NoGeometry") && ((OSDBoolean)subtmpmap["NoGeometry"]))
+                        continue;
+
+                    if (!subtmpmap.ContainsKey("Position"))
+                        return false;
+
+                    if (subtmpmap.ContainsKey("TriangleList"))
+                    {
+                        dummy = subtmpmap["TriangleList"].AsBinary();
+                        ntriangles += dummy.Length / bytesPerCoord;
+                    }
+                    else
+                        return false;
+                }
+            }
+
+            return true;
+        }
+
+        // parses convex hulls component
+        private bool hulls(byte[] data, int offset, int size, out int nvertices, out int nhulls)
+        {
+            nvertices = 0;
+            nhulls = 1;
+
+            OSD decodedMeshOsd = new OSD();
+            byte[] meshBytes = new byte[size];
+            System.Buffer.BlockCopy(data, offset, meshBytes, 0, size);
+            try
+            {
+                using (MemoryStream inMs = new MemoryStream(meshBytes))
+                {
+                    using (MemoryStream outMs = new MemoryStream())
+                    {
+                        using (ZOutputStream zOut = new ZOutputStream(outMs))
+                        {
+                            byte[] readBuffer = new byte[4096];
+                            int readLen = 0;
+                            while ((readLen = inMs.Read(readBuffer, 0, readBuffer.Length)) > 0)
+                            {
+                                zOut.Write(readBuffer, 0, readLen);
+                            }
+                            zOut.Flush();
+                            outMs.Seek(0, SeekOrigin.Begin);
+
+                            byte[] decompressedBuf = outMs.GetBuffer();
+                            decodedMeshOsd = OSDParser.DeserializeLLSDBinary(decompressedBuf);
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                return false;
+            }
+
+            OSDMap cmap = (OSDMap)decodedMeshOsd;
+            if (cmap == null)
+                return false;
+
+            byte[] dummy;
+
+            // must have one of this
+            if (cmap.ContainsKey("BoundingVerts"))
+            {
+                dummy = cmap["BoundingVerts"].AsBinary();
+                nvertices = dummy.Length / bytesPerCoord;
+            }
+            else
+                return false;
+
+/* upload is done with convex shape type
+            if (cmap.ContainsKey("HullList"))
+            {
+                dummy = cmap["HullList"].AsBinary();
+                nhulls += dummy.Length;
+            }
+
+
+            if (cmap.ContainsKey("Positions"))
+            {
+                dummy = cmap["Positions"].AsBinary();
+                nvertices = dummy.Length / bytesPerCoord;
+            }
+ */
+
+            return true;
+        }
+
+        // returns streaming cost from on mesh LODs sizes in curCost and square of prim size length 
+        private float streamingCost(ameshCostParam curCost, float sqdiam)
+        {
+            // compute efective areas
+            float ma = 262144f;
+
+            float mh = sqdiam * highLodFactor;
+            if (mh > ma)
+                mh = ma;
+            float mm = sqdiam * midLodFactor;
+            if (mm > ma)
+                mm = ma;
+
+            float ml = sqdiam * lowLodFactor;
+            if (ml > ma)
+                ml = ma;
+
+            float mlst = ma;
+
+            mlst -= ml;
+            ml -= mm;
+            mm -= mh;
+
+            if (mlst < 1.0f)
+                mlst = 1.0f;
+            if (ml < 1.0f)
+                ml = 1.0f;
+            if (mm < 1.0f)
+                mm = 1.0f;
+            if (mh < 1.0f)
+                mh = 1.0f;
+
+            ma = mlst + ml + mm + mh;
+
+            // get LODs compressed sizes
+            // giving 384 bytes bonus
+            int lst = curCost.lowestLODSize - 384;
+            int l = curCost.lowLODSize - 384;
+            int m = curCost.medLODSize - 384;
+            int h = curCost.highLODSize - 384;
+
+            // use previus higher LOD size on missing ones
+            if (m <= 0)
+                m = h;
+            if (l <= 0)
+                l = m;
+            if (lst <= 0)
+                lst = l;
+
+            // force minumum sizes
+            if (lst < 16)
+                lst = 16;
+            if (l < 16)
+                l = 16;
+            if (m < 16)
+                m = 16;
+            if (h < 16)
+                h = 16;
+
+            // compute cost weighted by relative effective areas
+            float cost = (float)lst * mlst + (float)l * ml + (float)m * mm + (float)h * mh;
+            cost /= ma;
+
+            cost *= 0.004f; // overall tunning parameter
+
+            return cost;
+        }
+    }
+}
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index 3cc3950..986a665 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -353,7 +353,7 @@ namespace OpenSim.Region.ClientStack.Linden
             // TODO: Add EventQueueGet name/description for diagnostics
             MainServer.Instance.AddPollServiceHTTPHandler(
                 eventQueueGetPath,
-                new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID));
+                new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID, 1000));
 
 //            m_log.DebugFormat(
 //                "[EVENT QUEUE GET MODULE]: Registered EQG handler {0} for {1} in {2}",
@@ -395,7 +395,7 @@ namespace OpenSim.Region.ClientStack.Linden
             }
         }
 
-        public Hashtable GetEvents(UUID requestID, UUID pAgentId, string request)
+        public Hashtable GetEvents(UUID requestID, UUID pAgentId)
         {
             if (DebugLevel >= 2)
                 m_log.DebugFormat("POLLED FOR EQ MESSAGES BY {0} in {1}", pAgentId, m_scene.RegionInfo.RegionName);
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
index dab727f..7dcf137 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
@@ -151,6 +151,12 @@ namespace OpenSim.Region.ClientStack.Linden
             ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint,
             uint locationID, uint flags, string capsURL, UUID agentID)
         {
+            // not sure why flags get overwritten here
+            if ((flags & (uint)TeleportFlags.IsFlying) != 0)
+                flags = (uint)TeleportFlags.ViaLocation | (uint)TeleportFlags.IsFlying;
+            else
+                flags = (uint)TeleportFlags.ViaLocation;
+
             OSDMap info = new OSDMap();
             info.Add("AgentID", OSD.FromUUID(agentID));
             info.Add("LocationID", OSD.FromInteger(4)); // TODO what is this?
@@ -159,7 +165,8 @@ namespace OpenSim.Region.ClientStack.Linden
             info.Add("SimAccess", OSD.FromInteger(simAccess));
             info.Add("SimIP", OSD.FromBinary(regionExternalEndPoint.Address.GetAddressBytes()));
             info.Add("SimPort", OSD.FromInteger(regionExternalEndPoint.Port));
-            info.Add("TeleportFlags", OSD.FromULong(1L << 4)); // AgentManager.TeleportFlags.ViaLocation
+//            info.Add("TeleportFlags", OSD.FromULong(1L << 4)); // AgentManager.TeleportFlags.ViaLocation
+            info.Add("TeleportFlags", OSD.FromUInteger(flags));
 
             OSDArray infoArr = new OSDArray();
             infoArr.Add(info);
@@ -398,7 +405,7 @@ namespace OpenSim.Region.ClientStack.Linden
         public static OSD partPhysicsProperties(uint localID, byte physhapetype,
                         float density, float friction, float bounce, float gravmod)
         {
-
+            
             OSDMap physinfo = new OSDMap(6);
             physinfo["LocalID"] = localID;
             physinfo["Density"] = density;
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
index 8e1f63a..6ec1115 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
@@ -27,11 +27,14 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Reflection;
 using System.IO;
+using System.Threading;
 using System.Web;
 using Mono.Addins;
+using OpenSim.Framework.Monitoring;
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
@@ -57,9 +60,45 @@ namespace OpenSim.Region.ClientStack.Linden
         private IAssetService m_AssetService;
         private bool m_Enabled = true;
         private string m_URL;
+       
+        struct aPollRequest
+        {
+            public PollServiceMeshEventArgs thepoll;
+            public UUID reqID;
+            public Hashtable request;
+        }
+
+        public class aPollResponse
+        {
+            public Hashtable response;
+            public int bytes;
+            public int lod;
+        }
+
+
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private static GetMeshHandler m_getMeshHandler;
+
+        private IAssetService m_assetService = null;
+
+        private Dictionary<UUID, string> m_capsDict = new Dictionary<UUID, string>();
+        private static Thread[] m_workerThreads = null;
+
+        private static OpenMetaverse.BlockingQueue<aPollRequest> m_queue =
+                new OpenMetaverse.BlockingQueue<aPollRequest>();
+
+        private Dictionary<UUID, PollServiceMeshEventArgs> m_pollservices = new Dictionary<UUID, PollServiceMeshEventArgs>();
 
         #region Region Module interfaceBase Members
 
+        ~GetMeshModule()
+        {
+            foreach (Thread t in m_workerThreads)
+                Watchdog.AbortThread(t.ManagedThreadId);
+
+        }
+
         public Type ReplaceableInterface
         {
             get { return null; }
@@ -75,6 +114,7 @@ namespace OpenSim.Region.ClientStack.Linden
             // Cap doesn't exist
             if (m_URL != string.Empty)
                 m_Enabled = true;
+         
         }
 
         public void AddRegion(Scene pScene)
@@ -83,6 +123,8 @@ namespace OpenSim.Region.ClientStack.Linden
                 return;
 
             m_scene = pScene;
+            
+            m_assetService = pScene.AssetService;
         }
 
         public void RemoveRegion(Scene scene)
@@ -91,6 +133,9 @@ namespace OpenSim.Region.ClientStack.Linden
                 return;
 
             m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
+            m_scene.EventManager.OnDeregisterCaps -= DeregisterCaps;
+            m_scene.EventManager.OnThrottleUpdate -= ThrottleUpdate;
+            
             m_scene = null;
         }
 
@@ -101,6 +146,27 @@ namespace OpenSim.Region.ClientStack.Linden
 
             m_AssetService = m_scene.RequestModuleInterface<IAssetService>();
             m_scene.EventManager.OnRegisterCaps += RegisterCaps;
+            // We'll reuse the same handler for all requests.
+            m_getMeshHandler = new GetMeshHandler(m_assetService);
+            m_scene.EventManager.OnDeregisterCaps += DeregisterCaps;
+            m_scene.EventManager.OnThrottleUpdate += ThrottleUpdate;
+
+            if (m_workerThreads == null)
+            {
+                m_workerThreads = new Thread[2];
+
+                for (uint i = 0; i < 2; i++)
+                {
+                    m_workerThreads[i] = Watchdog.StartThread(DoMeshRequests,
+                            String.Format("MeshWorkerThread{0}", i),
+                            ThreadPriority.Normal,
+                            false,
+                            false,
+                            null,
+                            int.MaxValue);
+                }
+            }
+
         }
 
 
@@ -110,25 +176,212 @@ namespace OpenSim.Region.ClientStack.Linden
 
         #endregion
 
+        private void DoMeshRequests()
+        {
+            while (true)
+            {
+                aPollRequest poolreq = m_queue.Dequeue();
+
+                poolreq.thepoll.Process(poolreq);
+            }
+        }
+
+        // Now we know when the throttle is changed by the client in the case of a root agent or by a neighbor region in the case of a child agent.
+        public void ThrottleUpdate(ScenePresence p)
+        {
+            byte[] throttles = p.ControllingClient.GetThrottlesPacked(1);
+            UUID user = p.UUID;
+            int imagethrottle = ExtractTaskThrottle(throttles);
+            PollServiceMeshEventArgs args;
+            if (m_pollservices.TryGetValue(user, out args))
+            {
+                args.UpdateThrottle(imagethrottle, p);
+            }
+        }
+
+        private int ExtractTaskThrottle(byte[] pthrottles)
+        {
+
+            byte[] adjData;
+            int pos = 0;
+
+            if (!BitConverter.IsLittleEndian)
+            {
+                byte[] newData = new byte[7 * 4];
+                Buffer.BlockCopy(pthrottles, 0, newData, 0, 7 * 4);
+
+                for (int i = 0; i < 7; i++)
+                    Array.Reverse(newData, i * 4, 4);
+
+                adjData = newData;
+            }
+            else
+            {
+                adjData = pthrottles;
+            }
+
+            // 0.125f converts from bits to bytes
+            //int resend = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); 
+            //pos += 4;
+            // int land = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); 
+            //pos += 4;
+            // int wind = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); 
+            // pos += 4;
+            // int cloud = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); 
+            // pos += 4;
+            pos += 16;
+             int task = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); 
+            // pos += 4;
+            //int texture = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); //pos += 4;
+            //int asset = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f);
+            return task;
+        }
+
+        private class PollServiceMeshEventArgs : PollServiceEventArgs
+        {
+            private List<Hashtable> requests =
+                    new List<Hashtable>();
+            private Dictionary<UUID, aPollResponse> responses =
+                    new Dictionary<UUID, aPollResponse>();
+
+            private Scene m_scene;
+            private MeshCapsDataThrottler m_throttler;
+            public PollServiceMeshEventArgs(UUID pId, Scene scene) :
+                base(null, null, null, null, pId, int.MaxValue)
+            {
+                m_scene = scene;
+                m_throttler = new MeshCapsDataThrottler(100000, 1400000, 10000, scene, pId);
+                // x is request id, y is userid
+                HasEvents = (x, y) =>
+                {
+                    lock (responses)
+                    {
+                        bool ret = m_throttler.hasEvents(x, responses);
+                        m_throttler.ProcessTime();
+                        return ret;
+
+                    }
+                };
+                GetEvents = (x, y) =>
+                {
+                    lock (responses)
+                    {
+                        try
+                        {
+                            return responses[x].response;
+                        }
+                        finally
+                        {
+                            m_throttler.ProcessTime();
+                            responses.Remove(x);
+                        }
+                    }
+                };
+                // x is request id, y is request data hashtable
+                Request = (x, y) =>
+                {
+                    aPollRequest reqinfo = new aPollRequest();
+                    reqinfo.thepoll = this;
+                    reqinfo.reqID = x;
+                    reqinfo.request = y;
+
+                    m_queue.Enqueue(reqinfo);
+                };
+
+                // this should never happen except possible on shutdown
+                NoEvents = (x, y) =>
+                {
+                    /*
+                                        lock (requests)
+                                        {
+                                            Hashtable request = requests.Find(id => id["RequestID"].ToString() == x.ToString());
+                                            requests.Remove(request);
+                                        }
+                    */
+                    Hashtable response = new Hashtable();
+
+                    response["int_response_code"] = 500;
+                    response["str_response_string"] = "Script timeout";
+                    response["content_type"] = "text/plain";
+                    response["keepalive"] = false;
+                    response["reusecontext"] = false;
+
+                    return response;
+                };
+            }
+
+            public void Process(aPollRequest requestinfo)
+            {
+                Hashtable response;
+
+                UUID requestID = requestinfo.reqID;
+
+                // If the avatar is gone, don't bother to get the texture
+                if (m_scene.GetScenePresence(Id) == null)
+                {
+                    response = new Hashtable();
+
+                    response["int_response_code"] = 500;
+                    response["str_response_string"] = "Script timeout";
+                    response["content_type"] = "text/plain";
+                    response["keepalive"] = false;
+                    response["reusecontext"] = false;
+
+                    lock (responses)
+                        responses[requestID] = new aPollResponse() { bytes = 0, response = response, lod = 0 };
+
+                    return;
+                }
+
+                response = m_getMeshHandler.Handle(requestinfo.request);
+                lock (responses)
+                {
+                    responses[requestID] = new aPollResponse()
+                    {
+                        bytes = (int)response["int_bytes"],
+                        lod = (int)response["int_lod"],
+                        response = response
+                    };
+
+                }
+                m_throttler.ProcessTime();
+            }
+
+            internal void UpdateThrottle(int pimagethrottle, ScenePresence p)
+            {
+                m_throttler.UpdateThrottle(pimagethrottle, p);
+            }
+        }
 
         public void RegisterCaps(UUID agentID, Caps caps)
         {
 //            UUID capID = UUID.Random();
-
-            //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture));
             if (m_URL == "localhost")
             {
-//                m_log.DebugFormat("[GETMESH]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);
-                GetMeshHandler gmeshHandler = new GetMeshHandler(m_AssetService);
-                IRequestHandler reqHandler
-                    = new RestHTTPHandler(
-                        "GET",
-                        "/CAPS/" + UUID.Random(),
-                        httpMethod => gmeshHandler.ProcessGetMesh(httpMethod, UUID.Zero, null),
-                        "GetMesh",
-                        agentID.ToString());
+                string capUrl = "/CAPS/" + UUID.Random() + "/";
+
+                // Register this as a poll service           
+                PollServiceMeshEventArgs args = new PollServiceMeshEventArgs(agentID, m_scene);
+
+                args.Type = PollServiceEventArgs.EventType.Mesh;
+                MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args);
+
+                string hostName = m_scene.RegionInfo.ExternalHostName;
+                uint port = (MainServer.Instance == null) ? 0 : MainServer.Instance.Port;
+                string protocol = "http";
 
-                caps.RegisterHandler("GetMesh", reqHandler);
+                if (MainServer.Instance.UseSSL)
+                {
+                    hostName = MainServer.Instance.SSLCommonName;
+                    port = MainServer.Instance.SSLPort;
+                    protocol = "https";
+                }
+                caps.RegisterHandler("GetMesh", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
+                m_pollservices[agentID] = args;
+                m_capsDict[agentID] = capUrl;
+
+
+           
             }
             else
             {
@@ -136,6 +389,177 @@ namespace OpenSim.Region.ClientStack.Linden
                 caps.RegisterHandler("GetMesh", m_URL);
             }
         }
+        private void DeregisterCaps(UUID agentID, Caps caps)
+        {
+            string capUrl;
+            PollServiceMeshEventArgs args;
+            if (m_capsDict.TryGetValue(agentID, out capUrl))
+            {
+                MainServer.Instance.RemoveHTTPHandler("", capUrl);
+                m_capsDict.Remove(agentID);
+            }
+            if (m_pollservices.TryGetValue(agentID, out args))
+            {
+                m_pollservices.Remove(agentID);
+            }
+        }
+
+        internal sealed class MeshCapsDataThrottler
+        {
+
+            private volatile int currenttime = 0;
+            private volatile int lastTimeElapsed = 0;
+            private volatile int BytesSent = 0;
+            private int Lod3 = 0;
+            private int Lod2 = 0;
+            private int Lod1 = 0;
+            private int UserSetThrottle = 0;
+            private int UDPSetThrottle = 0;
+            private int CapSetThrottle = 0;
+            private float CapThrottleDistributon = 0.30f;
+            private readonly Scene m_scene;
+            private ThrottleOutPacketType Throttle;
+            private readonly UUID User;
+            
+            public MeshCapsDataThrottler(int pBytes, int max, int min, Scene pScene, UUID puser)
+            {
+                ThrottleBytes = pBytes;
+                lastTimeElapsed = Util.EnvironmentTickCount();
+                Throttle = ThrottleOutPacketType.Task;
+                m_scene = pScene;
+                User = puser;
+            }
+
+
+            public bool hasEvents(UUID key, Dictionary<UUID, aPollResponse> responses)
+            {
+                const float ThirtyPercent = 0.30f;
+                const float FivePercent = 0.05f;
+                PassTime();
+                // Note, this is called IN LOCK
+                bool haskey = responses.ContainsKey(key);
+
+                if (responses.Count > 2)
+                {
+                    SplitThrottle(ThirtyPercent);
+                }
+                else
+                {
+                    SplitThrottle(FivePercent);
+                }
+
+                if (!haskey)
+                {
+                    return false;
+                }
+                aPollResponse response;
+                if (responses.TryGetValue(key, out response))
+                {
+                    float LOD3Over = (((ThrottleBytes*CapThrottleDistributon)%50000) + 1);
+                    float LOD2Over = (((ThrottleBytes*CapThrottleDistributon)%10000) + 1);
+                    // Normal
+                    if (BytesSent + response.bytes <= ThrottleBytes)
+                    {
+                        BytesSent += response.bytes;
+                       
+                        return true;
+                    }
+                    // Lod3 Over Throttle protection to keep things processing even when the throttle bandwidth is set too little.
+                    else if (response.bytes > ThrottleBytes && Lod3 <= ((LOD3Over < 1)? 1: LOD3Over) )
+                    {
+                        Interlocked.Increment(ref Lod3);
+                        BytesSent += response.bytes;
+                       
+                        return true;
+                    }
+                    // Lod2 Over Throttle protection to keep things processing even when the throttle bandwidth is set too little.
+                    else if (response.bytes > ThrottleBytes && Lod2 <= ((LOD2Over < 1) ? 1 : LOD2Over))
+                    {
+                        Interlocked.Increment(ref Lod2);
+                        BytesSent += response.bytes;
+                       
+                        return true;
+                    }
+                    else
+                    {
+                        return false;
+                    }
+                }
+
+                return haskey;
+            }
+            public void SubtractBytes(int bytes,int lod)
+            {
+                BytesSent -= bytes;
+            }
+            private void SplitThrottle(float percentMultiplier)
+            {
+
+                if (CapThrottleDistributon != percentMultiplier) // don't switch it if it's already set at the % multipler
+                {
+                    CapThrottleDistributon = percentMultiplier;
+                    ScenePresence p;
+                    if (m_scene.TryGetScenePresence(User, out p)) // If we don't get a user they're not here anymore.
+                    {
+//                        AlterThrottle(UserSetThrottle, p);
+                        UpdateThrottle(UserSetThrottle, p);
+                    }
+                }
+            }
+           
+            public void ProcessTime()
+            {
+                PassTime();
+            }
+
+
+            private void PassTime()
+            {
+                currenttime = Util.EnvironmentTickCount();
+                int timeElapsed = Util.EnvironmentTickCountSubtract(currenttime, lastTimeElapsed);
+                //processTimeBasedActions(responses);
+                if (currenttime - timeElapsed >= 1000)
+                {
+                    lastTimeElapsed = Util.EnvironmentTickCount();
+                    BytesSent -= ThrottleBytes;
+                    if (BytesSent < 0) BytesSent = 0;
+                    if (BytesSent < ThrottleBytes)
+                    {
+                        Lod3 = 0;
+                        Lod2 = 0;
+                        Lod1 = 0;
+                    }
+                }
+            }
+            private void AlterThrottle(int setting, ScenePresence p)
+            {
+                p.ControllingClient.SetAgentThrottleSilent((int)Throttle,setting);
+            }
+
+            public int ThrottleBytes
+            {
+                get { return CapSetThrottle; }
+                set { CapSetThrottle = value; }
+            }
+
+            internal void UpdateThrottle(int pimagethrottle, ScenePresence p)
+            {
+                // Client set throttle !
+                UserSetThrottle = pimagethrottle;
+                CapSetThrottle = (int)(pimagethrottle*CapThrottleDistributon);
+//                UDPSetThrottle = (int) (pimagethrottle*(100 - CapThrottleDistributon));
+
+                float udp = 1.0f - CapThrottleDistributon;
+                if(udp < 0.5f)
+                    udp = 0.5f;
+                UDPSetThrottle = (int) ((float)pimagethrottle * udp);
+                if (CapSetThrottle < 4068)
+                    CapSetThrottle = 4068;  // at least two discovery mesh
+                p.ControllingClient.SetAgentThrottleSilent((int) Throttle, UDPSetThrottle);
+                ProcessTime();
+
+            }
+        }
 
     }
 }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index 13415f8..d4dbfb9 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -27,18 +27,13 @@
 
 using System;
 using System.Collections;
-using System.Collections.Specialized;
-using System.Drawing;
-using System.Drawing.Imaging;
+using System.Collections.Generic;
 using System.Reflection;
-using System.IO;
-using System.Web;
+using System.Threading;
 using log4net;
 using Nini.Config;
 using Mono.Addins;
 using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-using OpenMetaverse.Imaging;
 using OpenSim.Framework;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
@@ -47,6 +42,7 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 using Caps = OpenSim.Framework.Capabilities.Caps;
 using OpenSim.Capabilities.Handlers;
+using OpenSim.Framework.Monitoring;
 
 namespace OpenSim.Region.ClientStack.Linden
 {
@@ -54,57 +50,131 @@ namespace OpenSim.Region.ClientStack.Linden
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GetTextureModule")]
     public class GetTextureModule : INonSharedRegionModule
     {
-//        private static readonly ILog m_log =
-//            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
+        struct aPollRequest
+        {
+            public PollServiceTextureEventArgs thepoll;
+            public UUID reqID;
+            public Hashtable request;
+        }
+
+        public class aPollResponse
+        {
+            public Hashtable response;
+            public int bytes;
+        }
+
+
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         private Scene m_scene;
-        private IAssetService m_assetService;
 
-        private bool m_Enabled = false;
+        private static GetTextureHandler m_getTextureHandler;
+
+        private IAssetService m_assetService = null;
+
+        private Dictionary<UUID, string> m_capsDict = new Dictionary<UUID, string>();
+        private static Thread[] m_workerThreads = null;
 
-        // TODO: Change this to a config option
-        const string REDIRECT_URL = null;
+        private static OpenMetaverse.BlockingQueue<aPollRequest> m_queue =
+                new OpenMetaverse.BlockingQueue<aPollRequest>();
 
-        private string m_URL;
+        private Dictionary<UUID,PollServiceTextureEventArgs> m_pollservices = new Dictionary<UUID,PollServiceTextureEventArgs>();
 
         #region ISharedRegionModule Members
 
         public void Initialise(IConfigSource source)
         {
-            IConfig config = source.Configs["ClientStack.LindenCaps"];
-            if (config == null)
-                return;
-
-            m_URL = config.GetString("Cap_GetTexture", string.Empty);
-            // Cap doesn't exist
-            if (m_URL != string.Empty)
-                m_Enabled = true;
         }
 
         public void AddRegion(Scene s)
         {
-            if (!m_Enabled)
-                return;
-
             m_scene = s;
+            m_assetService = s.AssetService;
         }
 
         public void RemoveRegion(Scene s)
         {
-            if (!m_Enabled)
-                return;
-
             m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
+            m_scene.EventManager.OnDeregisterCaps -= DeregisterCaps;
+            m_scene.EventManager.OnThrottleUpdate -= ThrottleUpdate;
             m_scene = null;
         }
 
         public void RegionLoaded(Scene s)
         {
-            if (!m_Enabled)
-                return;
+            // We'll reuse the same handler for all requests.
+            m_getTextureHandler = new GetTextureHandler(m_assetService);
 
-            m_assetService = m_scene.RequestModuleInterface<IAssetService>();
             m_scene.EventManager.OnRegisterCaps += RegisterCaps;
+            m_scene.EventManager.OnDeregisterCaps += DeregisterCaps;
+            m_scene.EventManager.OnThrottleUpdate += ThrottleUpdate;
+
+            if (m_workerThreads == null)
+            {
+                m_workerThreads = new Thread[2];
+
+                for (uint i = 0; i < 2; i++)
+                {
+                    m_workerThreads[i] = Watchdog.StartThread(DoTextureRequests,
+                            String.Format("TextureWorkerThread{0}", i),
+                            ThreadPriority.Normal,
+                            false,
+                            false,
+                            null,
+                            int.MaxValue);
+                }
+            }
+        }
+        private int ExtractImageThrottle(byte[] pthrottles)
+        {
+       
+            byte[] adjData;
+            int pos = 0;
+
+            if (!BitConverter.IsLittleEndian)
+            {
+                byte[] newData = new byte[7 * 4];
+                Buffer.BlockCopy(pthrottles, 0, newData, 0, 7 * 4);
+
+                for (int i = 0; i < 7; i++)
+                    Array.Reverse(newData, i * 4, 4);
+
+                adjData = newData;
+            }
+            else
+            {
+                adjData = pthrottles;
+            }
+
+            // 0.125f converts from bits to bytes
+            //int resend = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); 
+            //pos += 4;
+           // int land = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); 
+            //pos += 4;
+           // int wind = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); 
+           // pos += 4;
+           // int cloud = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); 
+           // pos += 4;
+           // int task = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); 
+           // pos += 4;
+            pos = pos + 20;
+            int texture = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); //pos += 4;
+            //int asset = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f);
+            return texture;
+        }
+
+        // Now we know when the throttle is changed by the client in the case of a root agent or by a neighbor region in the case of a child agent.
+        public void ThrottleUpdate(ScenePresence p)
+        {
+            byte[] throttles = p.ControllingClient.GetThrottlesPacked(1);
+            UUID user = p.UUID;
+            int imagethrottle = ExtractImageThrottle(throttles);
+            PollServiceTextureEventArgs args;
+            if (m_pollservices.TryGetValue(user,out args))
+            {
+                args.UpdateThrottle(imagethrottle);
+            }
         }
 
         public void PostInitialise()
@@ -122,24 +192,250 @@ namespace OpenSim.Region.ClientStack.Linden
 
         #endregion
 
-        public void RegisterCaps(UUID agentID, Caps caps)
+        ~GetTextureModule()
+        {
+            foreach (Thread t in m_workerThreads)
+                Watchdog.AbortThread(t.ManagedThreadId);
+
+        }
+
+        private class PollServiceTextureEventArgs : PollServiceEventArgs
         {
-            UUID capID = UUID.Random();
+            private List<Hashtable> requests =
+                    new List<Hashtable>();
+            private Dictionary<UUID, aPollResponse> responses =
+                    new Dictionary<UUID, aPollResponse>();
 
-            //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture));
-            if (m_URL == "localhost")
+            private Scene m_scene;
+            private CapsDataThrottler m_throttler = new CapsDataThrottler(100000, 1400000,10000);
+            public PollServiceTextureEventArgs(UUID pId, Scene scene) :
+                    base(null, null, null, null, pId, int.MaxValue)              
             {
-//                m_log.DebugFormat("[GETTEXTURE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);
-                caps.RegisterHandler(
-                    "GetTexture",
-                    new GetTextureHandler("/CAPS/" + capID + "/", m_assetService, "GetTexture", agentID.ToString()));
+                m_scene = scene;
+                // x is request id, y is userid
+                HasEvents = (x, y) =>
+                {
+                    lock (responses)
+                    {
+                        bool ret = m_throttler.hasEvents(x, responses);
+                        m_throttler.ProcessTime();
+                        return ret;
+
+                    }
+                };
+                GetEvents = (x, y) =>
+                {
+                    lock (responses)
+                    {
+                        try
+                        {
+                            return responses[x].response;
+                        }
+                        finally
+                        {
+                            responses.Remove(x);
+                        }
+                    }
+                };
+                // x is request id, y is request data hashtable
+                Request = (x, y) =>
+                {
+                    aPollRequest reqinfo = new aPollRequest();
+                    reqinfo.thepoll = this;
+                    reqinfo.reqID = x;
+                    reqinfo.request = y;
+                    
+                    m_queue.Enqueue(reqinfo);
+                };
+
+                // this should never happen except possible on shutdown
+                NoEvents = (x, y) =>
+                {
+/*
+                    lock (requests)
+                    {
+                        Hashtable request = requests.Find(id => id["RequestID"].ToString() == x.ToString());
+                        requests.Remove(request);
+                    }
+*/
+                    Hashtable response = new Hashtable();
+
+                    response["int_response_code"] = 500;
+                    response["str_response_string"] = "Script timeout";
+                    response["content_type"] = "text/plain";
+                    response["keepalive"] = false;
+                    response["reusecontext"] = false;
+
+                    return response;
+                };
             }
-            else
+
+            public void Process(aPollRequest requestinfo)
+            {
+                Hashtable response;
+
+                UUID requestID = requestinfo.reqID;
+
+                // If the avatar is gone, don't bother to get the texture
+                if (m_scene.GetScenePresence(Id) == null)
+                {
+                    response = new Hashtable();
+
+                    response["int_response_code"] = 500;
+                    response["str_response_string"] = "Script timeout";
+                    response["content_type"] = "text/plain";
+                    response["keepalive"] = false;
+                    response["reusecontext"] = false;
+                    
+                    lock (responses)
+                        responses[requestID] = new aPollResponse() {bytes = 0, response = response};
+
+                    return;
+                }
+                
+                response = m_getTextureHandler.Handle(requestinfo.request);
+                lock (responses)
+                {
+                    responses[requestID] = new aPollResponse()
+                                               {
+                                                   bytes = (int) response["int_bytes"],
+                                                   response = response
+                                               };
+                   
+                } 
+                m_throttler.ProcessTime();
+            }
+
+            internal void UpdateThrottle(int pimagethrottle)
+            {
+                m_throttler.ThrottleBytes = pimagethrottle;
+            }
+        }
+
+        private void RegisterCaps(UUID agentID, Caps caps)
+        {
+            string capUrl = "/CAPS/" + UUID.Random() + "/";
+
+            // Register this as a poll service           
+            PollServiceTextureEventArgs args = new PollServiceTextureEventArgs(agentID, m_scene);
+            
+            args.Type = PollServiceEventArgs.EventType.Texture;
+            MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args);
+
+            string hostName = m_scene.RegionInfo.ExternalHostName;
+            uint port = (MainServer.Instance == null) ? 0 : MainServer.Instance.Port;
+            string protocol = "http";
+            
+            if (MainServer.Instance.UseSSL)
+            {
+                hostName = MainServer.Instance.SSLCommonName;
+                port = MainServer.Instance.SSLPort;
+                protocol = "https";
+            }
+            caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
+            m_pollservices[agentID] = args;
+            m_capsDict[agentID] = capUrl;
+        }
+
+        private void DeregisterCaps(UUID agentID, Caps caps)
+        {
+            string capUrl;
+            PollServiceTextureEventArgs args;
+            if (m_capsDict.TryGetValue(agentID, out capUrl))
+            {
+                MainServer.Instance.RemoveHTTPHandler("", capUrl);
+                m_capsDict.Remove(agentID);
+            }
+            if (m_pollservices.TryGetValue(agentID, out args))
             {
-//                m_log.DebugFormat("[GETTEXTURE]: {0} in region {1}", m_URL, m_scene.RegionInfo.RegionName);
-                caps.RegisterHandler("GetTexture", m_URL);
+                m_pollservices.Remove(agentID);
             }
         }
 
+        private void DoTextureRequests()
+        {
+            while (true)
+            {
+                aPollRequest poolreq = m_queue.Dequeue();
+
+                poolreq.thepoll.Process(poolreq);
+            }
+        }
+        internal sealed class CapsDataThrottler
+        {
+
+            private volatile int currenttime = 0;
+            private volatile int lastTimeElapsed = 0;
+            private volatile int BytesSent = 0;
+            private int oversizedImages = 0;
+            public CapsDataThrottler(int pBytes, int max, int min)
+            {
+                ThrottleBytes = pBytes;
+                lastTimeElapsed = Util.EnvironmentTickCount();
+            }
+            public bool hasEvents(UUID key, Dictionary<UUID, GetTextureModule.aPollResponse> responses)
+            {
+                PassTime();
+                // Note, this is called IN LOCK
+                bool haskey = responses.ContainsKey(key);
+                if (!haskey)
+                {
+                    return false;
+                }
+                GetTextureModule.aPollResponse response;
+                if (responses.TryGetValue(key, out response))
+                {
+
+                    // Normal
+                    if (BytesSent + response.bytes <= ThrottleBytes)
+                    {
+                        BytesSent += response.bytes;
+                        //TimeBasedAction timeBasedAction = new TimeBasedAction { byteRemoval = response.bytes, requestId = key, timeMS = currenttime + 1000, unlockyn = false };
+                        //m_actions.Add(timeBasedAction);
+                        return true;
+                    }
+                    // Big textures
+                    else if (response.bytes > ThrottleBytes && oversizedImages <= ((ThrottleBytes % 50000) + 1))
+                    {
+                        Interlocked.Increment(ref oversizedImages);
+                        BytesSent += response.bytes;
+                        //TimeBasedAction timeBasedAction = new TimeBasedAction { byteRemoval = response.bytes, requestId = key, timeMS = currenttime + (((response.bytes % ThrottleBytes)+1)*1000) , unlockyn = false };
+                        //m_actions.Add(timeBasedAction);
+                        return true;
+                    }
+                    else
+                    {
+                        return false;
+                    }
+                }
+
+                return haskey;
+            }
+            public void ProcessTime()
+            {
+                PassTime();
+            }
+
+
+            private void PassTime()
+            {
+                currenttime = Util.EnvironmentTickCount();
+                int timeElapsed = Util.EnvironmentTickCountSubtract(currenttime, lastTimeElapsed);
+                //processTimeBasedActions(responses);
+                if (Util.EnvironmentTickCountSubtract(currenttime, timeElapsed) >= 1000)
+                {
+                    lastTimeElapsed = Util.EnvironmentTickCount();
+                    BytesSent -= ThrottleBytes;
+                    if (BytesSent < 0) BytesSent = 0;
+                    if (BytesSent < ThrottleBytes)
+                    {
+                        oversizedImages = 0;
+                    }
+                }
+            }
+            public int ThrottleBytes;
+        }
     }
+
+    
 }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
index 33b1f77..60c1814 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
@@ -129,15 +129,15 @@ namespace OpenSim.Region.ClientStack.Linden
 //            m_log.DebugFormat("[MESH UPLOAD FLAG MODULE]: MeshUploadFlag request");
 
             OSDMap data = new OSDMap();
-            ScenePresence sp = m_scene.GetScenePresence(m_agentID);
-            data["username"] = sp.Firstname + "." + sp.Lastname;
-            data["display_name_next_update"] = new OSDDate(DateTime.Now);
-            data["legacy_first_name"] = sp.Firstname;
+//          ScenePresence sp = m_scene.GetScenePresence(m_agentID);
+//          data["username"] = sp.Firstname + "." + sp.Lastname;
+//          data["display_name_next_update"] = new OSDDate(DateTime.Now);
+//          data["legacy_first_name"] = sp.Firstname;
             data["mesh_upload_status"] = "valid";
-            data["display_name"] = sp.Firstname + " " + sp.Lastname;
-            data["legacy_last_name"] = sp.Lastname;
-            data["id"] = m_agentID;
-            data["is_display_name_default"] = true;
+//          data["display_name"] = sp.Firstname + " " + sp.Lastname;
+//          data["legacy_last_name"] = sp.Lastname;
+//          data["id"] = m_agentID;
+//          data["is_display_name_default"] = true;
 
             //Send back data
             Hashtable responsedata = new Hashtable();
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
deleted file mode 100644
index 5529550..0000000
--- a/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Reflection;
-using System.IO;
-using System.Web;
-using Mono.Addins;
-using log4net;
-using Nini.Config;
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-using OpenSim.Framework;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Services.Interfaces;
-using Caps = OpenSim.Framework.Capabilities.Caps;
-using OpenSim.Framework.Capabilities;
-
-namespace OpenSim.Region.ClientStack.Linden
-{
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "NewFileAgentInventoryVariablePriceModule")]
-    public class NewFileAgentInventoryVariablePriceModule : INonSharedRegionModule
-    {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
-        private Scene m_scene;
-//        private IAssetService m_assetService;
-        private bool m_dumpAssetsToFile = false;
-        private bool m_enabled = true;
-        private int  m_levelUpload = 0;
-
-        #region Region Module interfaceBase Members
-
-
-        public Type ReplaceableInterface
-        {
-            get { return null; }
-        }
-
-        public void Initialise(IConfigSource source)
-        {
-            IConfig meshConfig = source.Configs["Mesh"];
-            if (meshConfig == null)
-                return;
-
-            m_enabled = meshConfig.GetBoolean("AllowMeshUpload", true);
-            m_levelUpload = meshConfig.GetInt("LevelUpload", 0);
-        }
-
-        public void AddRegion(Scene pScene)
-        {
-            m_scene = pScene;
-        }
-
-        public void RemoveRegion(Scene scene)
-        {
-            
-            m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
-            m_scene = null;
-        }
-
-        public void RegionLoaded(Scene scene)
-        {
-            
-//            m_assetService = m_scene.RequestModuleInterface<IAssetService>();
-            m_scene.EventManager.OnRegisterCaps += RegisterCaps;
-        }
-
-        #endregion
-
-
-        #region Region Module interface
-
-       
-
-        public void Close() { }
-
-        public string Name { get { return "NewFileAgentInventoryVariablePriceModule"; } }
-
-
-        public void RegisterCaps(UUID agentID, Caps caps)
-        {
-            if(!m_enabled)
-                return;
-
-            UUID capID = UUID.Random();
-
-//            m_log.Debug("[NEW FILE AGENT INVENTORY VARIABLE PRICE]: /CAPS/" + capID);
-            caps.RegisterHandler(
-                "NewFileAgentInventoryVariablePrice",
-                new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDNewFileAngentInventoryVariablePriceReplyResponse>(
-                    "POST",
-                    "/CAPS/" + capID.ToString(),
-                    req => NewAgentInventoryRequest(req, agentID),
-                    "NewFileAgentInventoryVariablePrice",
-                    agentID.ToString()));         
-        }
-
-        #endregion
-
-        public LLSDNewFileAngentInventoryVariablePriceReplyResponse NewAgentInventoryRequest(LLSDAssetUploadRequest llsdRequest, UUID agentID)
-        {
-            //TODO:  The Mesh uploader uploads many types of content. If you're going to implement a Money based limit
-            // you need to be aware of this
-
-            //if (llsdRequest.asset_type == "texture" ||
-           //     llsdRequest.asset_type == "animation" ||
-           //     llsdRequest.asset_type == "sound")
-           // {
-                // check user level
-
-            ScenePresence avatar = null;
-            IClientAPI client = null;
-            m_scene.TryGetScenePresence(agentID, out avatar);
-
-            if (avatar != null)
-            {
-                client = avatar.ControllingClient;
-
-                if (avatar.UserLevel < m_levelUpload)
-                {
-                    if (client != null)
-                        client.SendAgentAlertMessage("Unable to upload asset. Insufficient permissions.", false);
-
-                    LLSDNewFileAngentInventoryVariablePriceReplyResponse errorResponse = new LLSDNewFileAngentInventoryVariablePriceReplyResponse();
-                    errorResponse.rsvp = "";
-                    errorResponse.state = "error";
-                    return errorResponse;
-                }
-            }
-
-            // check funds
-            IMoneyModule mm = m_scene.RequestModuleInterface<IMoneyModule>();
-
-            if (mm != null)
-            {
-                if (!mm.UploadCovered(agentID, mm.UploadCharge))
-                {
-                    if (client != null)
-                        client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
-
-                    LLSDNewFileAngentInventoryVariablePriceReplyResponse errorResponse = new LLSDNewFileAngentInventoryVariablePriceReplyResponse();
-                    errorResponse.rsvp = "";
-                    errorResponse.state = "error";
-                    return errorResponse;
-                }
-            }
-
-           // }
-
-            string assetName = llsdRequest.name;
-            string assetDes = llsdRequest.description;
-            string capsBase = "/CAPS/NewFileAgentInventoryVariablePrice/";
-            UUID newAsset = UUID.Random();
-            UUID newInvItem = UUID.Random();
-            UUID parentFolder = llsdRequest.folder_id;
-            string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000") + "/";
-
-            AssetUploader uploader =
-                new AssetUploader(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type,
-                                  llsdRequest.asset_type, capsBase + uploaderPath, MainServer.Instance, m_dumpAssetsToFile);
-
-            MainServer.Instance.AddStreamHandler(
-                new BinaryStreamHandler(
-                    "POST",
-                    capsBase + uploaderPath,
-                    uploader.uploaderCaps,
-                    "NewFileAgentInventoryVariablePrice",
-                    agentID.ToString()));
-
-            string protocol = "http://";
-
-            if (MainServer.Instance.UseSSL)
-                protocol = "https://";
-
-            string uploaderURL = protocol + m_scene.RegionInfo.ExternalHostName + ":" + MainServer.Instance.Port.ToString() + capsBase +
-                                 uploaderPath;
-
-
-            LLSDNewFileAngentInventoryVariablePriceReplyResponse uploadResponse = new LLSDNewFileAngentInventoryVariablePriceReplyResponse();
-            
-            uploadResponse.rsvp = uploaderURL;
-            uploadResponse.state = "upload";
-            uploadResponse.resource_cost = 0;
-            uploadResponse.upload_price = 0;
-
-            uploader.OnUpLoad += //UploadCompleteHandler;
-                
-                delegate(
-                string passetName, string passetDescription, UUID passetID,
-                UUID pinventoryItem, UUID pparentFolder, byte[] pdata, string pinventoryType,
-                string passetType)
-               {
-                   UploadCompleteHandler(passetName, passetDescription,  passetID,
-                                          pinventoryItem, pparentFolder, pdata,  pinventoryType,
-                                          passetType,agentID);
-               };
-
-            return uploadResponse;
-        }
-
-        public void UploadCompleteHandler(string assetName, string assetDescription, UUID assetID,
-                                          UUID inventoryItem, UUID parentFolder, byte[] data, string inventoryType,
-                                          string assetType,UUID AgentID)
-        {
-//            m_log.DebugFormat(
-//                "[NEW FILE AGENT INVENTORY VARIABLE PRICE MODULE]: Upload complete for {0}", inventoryItem);
-
-            sbyte assType = 0;
-            sbyte inType = 0;
-
-            if (inventoryType == "sound")
-            {
-                inType = 1;
-                assType = 1;
-            }
-            else if (inventoryType == "animation")
-            {
-                inType = 19;
-                assType = 20;
-            }
-            else if (inventoryType == "wearable")
-            {
-                inType = 18;
-                switch (assetType)
-                {
-                    case "bodypart":
-                        assType = 13;
-                        break;
-                    case "clothing":
-                        assType = 5;
-                        break;
-                }
-            }
-            else if (inventoryType == "mesh")
-            {
-                inType = (sbyte)InventoryType.Mesh; 
-                assType = (sbyte)AssetType.Mesh;
-            }
-
-            AssetBase asset;
-            asset = new AssetBase(assetID, assetName, assType, AgentID.ToString());
-            asset.Data = data;
-    
-            if (m_scene.AssetService != null)
-                m_scene.AssetService.Store(asset);
-
-            InventoryItemBase item = new InventoryItemBase();
-            item.Owner = AgentID;
-            item.CreatorId = AgentID.ToString();
-            item.ID = inventoryItem;
-            item.AssetID = asset.FullID;
-            item.Description = assetDescription;
-            item.Name = assetName;
-            item.AssetType = assType;
-            item.InvType = inType;
-            item.Folder = parentFolder;
-            item.CurrentPermissions
-                = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer);
-            item.BasePermissions = (uint)PermissionMask.All;
-            item.EveryOnePermissions = 0;
-            item.NextPermissions = (uint)PermissionMask.All;
-            item.CreationDate = Util.UnixTimeSinceEpoch();
-            m_scene.AddInventoryItem(item);
-        }
-    }
-}
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs
index 17c7270..fcac182 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs
@@ -64,6 +64,8 @@ namespace OpenSim.Region.ClientStack.Linden
         private Commands m_commands = new Commands();
         public ICommands Commands { get { return m_commands; } }
 
+        public event ConsoleMessage OnConsoleMessage;
+
         public void Initialise(IConfigSource source)
         {
             m_commands.AddCommand( "Help", false, "help", "help [<item>]", "Display help on a particular command or on a list of commands in a category", Help);
@@ -102,7 +104,7 @@ namespace OpenSim.Region.ClientStack.Linden
 
         public void RegisterCaps(UUID agentID, Caps caps)
         {
-            if (!m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(agentID))
+            if (!m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(agentID) && !m_scene.Permissions.IsGod(agentID))
                 return;
 
             UUID capID = UUID.Random();
@@ -118,6 +120,11 @@ namespace OpenSim.Region.ClientStack.Linden
             OSD osd = OSD.FromString(message);
 
             m_eventQueue.Enqueue(EventQueueHelper.BuildEvent("SimConsoleResponse", osd), agentID);
+
+            ConsoleMessage handlerConsoleMessage = OnConsoleMessage;
+
+            if (handlerConsoleMessage != null)
+                handlerConsoleMessage( agentID, message);
         }
 
         public bool RunCommand(string command, UUID invokerID)
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
index 3b0ccd7..eca576d 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Drawing;
 using System.Drawing.Imaging;
@@ -53,8 +54,8 @@ namespace OpenSim.Region.ClientStack.Linden
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "UploadBakedTextureModule")]
     public class UploadBakedTextureModule : INonSharedRegionModule
     {
-//        private static readonly ILog m_log =
-//            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+       private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         /// <summary>
         /// For historical reasons this is fixed, but there
@@ -64,31 +65,210 @@ namespace OpenSim.Region.ClientStack.Linden
         private Scene m_scene;
         private bool m_persistBakedTextures;
 
+        private IBakedTextureModule m_BakedTextureModule;
+
         public void Initialise(IConfigSource source)
         {
             IConfig appearanceConfig = source.Configs["Appearance"];
             if (appearanceConfig != null)
                 m_persistBakedTextures = appearanceConfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures);
+
+
         }
 
         public void AddRegion(Scene s)
         {
             m_scene = s;
+           
         }
 
         public void RemoveRegion(Scene s)
         {
+            s.EventManager.OnRegisterCaps -= RegisterCaps;
+            s.EventManager.OnNewPresence -= RegisterNewPresence;
+            s.EventManager.OnRemovePresence -= DeRegisterPresence;
+            m_BakedTextureModule = null;
+            m_scene = null;
         }
 
+       
+
         public void RegionLoaded(Scene s)
         {
             m_scene.EventManager.OnRegisterCaps += RegisterCaps;
+            m_scene.EventManager.OnNewPresence += RegisterNewPresence;
+            m_scene.EventManager.OnRemovePresence += DeRegisterPresence;
+            
+        }
+
+        private void DeRegisterPresence(UUID agentId)
+        {
+            ScenePresence presence = null;
+            if (m_scene.TryGetScenePresence(agentId, out presence))
+            {
+                presence.ControllingClient.OnSetAppearance -= CaptureAppearanceSettings;
+            }
+
+        }
+
+        private void RegisterNewPresence(ScenePresence presence)
+        {
+           presence.ControllingClient.OnSetAppearance += CaptureAppearanceSettings;
+
+        }
+
+        private void CaptureAppearanceSettings(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams, Vector3 avSize, WearableCacheItem[] cacheItems)
+        {
+            int maxCacheitemsLoop = cacheItems.Length;
+            if (maxCacheitemsLoop > AvatarWearable.MAX_WEARABLES)
+            {
+                maxCacheitemsLoop = AvatarWearable.MAX_WEARABLES;
+                m_log.WarnFormat("[CACHEDBAKES]: Too Many Cache items Provided {0}, the max is {1}.  Truncating!", cacheItems.Length, AvatarWearable.MAX_WEARABLES);
+            }
+
+            m_BakedTextureModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
+            if (cacheItems.Length > 0)
+            {
+                m_log.Debug("[Cacheitems]: " + cacheItems.Length);
+                for (int iter = 0; iter < maxCacheitemsLoop; iter++)
+                {
+                    m_log.Debug("[Cacheitems] {" + iter + "/" + cacheItems[iter].TextureIndex + "}: c-" + cacheItems[iter].CacheId + ", t-" +
+                                      cacheItems[iter].TextureID);
+                }
+               
+                ScenePresence p = null;
+                if (m_scene.TryGetScenePresence(remoteClient.AgentId, out p))
+                {
+
+                    WearableCacheItem[] existingitems = p.Appearance.WearableCacheItems;
+                    if (existingitems == null)
+                    {
+                        if (m_BakedTextureModule != null)
+                        {
+                            WearableCacheItem[] savedcache = null;
+                            try
+                            {
+                                if (p.Appearance.WearableCacheItemsDirty)
+                                {
+                                    savedcache = m_BakedTextureModule.Get(p.UUID);
+                                    p.Appearance.WearableCacheItems = savedcache;
+                                    p.Appearance.WearableCacheItemsDirty = false;
+                                }
+
+                            }
+                            /*
+                             * The following Catch types DO NOT WORK with m_BakedTextureModule.Get
+                             * it jumps to the General Packet Exception Handler if you don't catch Exception!
+                             * 
+                            catch (System.Net.Sockets.SocketException)
+                            {
+                                cacheItems = null;
+                            }
+                            catch (WebException)
+                            {
+                                cacheItems = null;
+                            }
+                            catch (InvalidOperationException)
+                            {
+                                cacheItems = null;
+                            } */
+                            catch (Exception)
+                            {
+                               // The service logs a sufficient error message.
+                            }
+                            
+
+                            if (savedcache != null)
+                                existingitems = savedcache;
+                        }
+                    }
+                    // Existing items null means it's a fully new appearance
+                    if (existingitems == null)
+                    {
+
+                        for (int i = 0; i < maxCacheitemsLoop; i++)
+                        {
+                            if (textureEntry.FaceTextures.Length > cacheItems[i].TextureIndex)
+                            {
+                                Primitive.TextureEntryFace face = textureEntry.FaceTextures[cacheItems[i].TextureIndex];
+                                if (face == null)
+                                {
+                                    textureEntry.CreateFace(cacheItems[i].TextureIndex);
+                                    textureEntry.FaceTextures[cacheItems[i].TextureIndex].TextureID =
+                                        AppearanceManager.DEFAULT_AVATAR_TEXTURE;
+                                    continue;
+                                }
+                                cacheItems[i].TextureID =face.TextureID;
+                                if (m_scene.AssetService != null)
+                                    cacheItems[i].TextureAsset =
+                                        m_scene.AssetService.GetCached(cacheItems[i].TextureID.ToString());
+                            }
+                            else
+                            {
+                                m_log.WarnFormat("[CACHEDBAKES]: Invalid Texture Index Provided, Texture doesn't exist or hasn't been uploaded yet {0}, the max is {1}.  Skipping!", cacheItems[i].TextureIndex, textureEntry.FaceTextures.Length);
+                            }
+
+
+                        }
+                    }
+                    else
+
+
+                    {
+                        // for each uploaded baked texture
+                        for (int i = 0; i < maxCacheitemsLoop; i++)
+                        {
+                            if (textureEntry.FaceTextures.Length > cacheItems[i].TextureIndex)
+                            {
+                                Primitive.TextureEntryFace face = textureEntry.FaceTextures[cacheItems[i].TextureIndex];
+                                if (face == null)
+                                {
+                                    textureEntry.CreateFace(cacheItems[i].TextureIndex);
+                                    textureEntry.FaceTextures[cacheItems[i].TextureIndex].TextureID =
+                                        AppearanceManager.DEFAULT_AVATAR_TEXTURE;
+                                    continue;
+                                }
+                                cacheItems[i].TextureID =
+                                    face.TextureID;
+                            }
+                            else
+                            {
+                                m_log.WarnFormat("[CACHEDBAKES]: Invalid Texture Index Provided, Texture doesn't exist or hasn't been uploaded yet {0}, the max is {1}.  Skipping!", cacheItems[i].TextureIndex, textureEntry.FaceTextures.Length);
+                            }
+                        }
+
+                        for (int i = 0; i < maxCacheitemsLoop; i++)
+                        {
+                            if (cacheItems[i].TextureAsset == null)
+                            {
+                                cacheItems[i].TextureAsset =
+                                    m_scene.AssetService.GetCached(cacheItems[i].TextureID.ToString());
+                            }
+                        }
+                    }
+
+
+
+                    p.Appearance.WearableCacheItems = cacheItems;
+                    
+                   
+
+                    if (m_BakedTextureModule != null)
+                    {
+                        m_BakedTextureModule.Store(remoteClient.AgentId, cacheItems);
+                        p.Appearance.WearableCacheItemsDirty = true;
+                        
+                    }
+                }
+            }
         }
 
         public void PostInitialise()
         {
         }
 
+
+
         public void Close() { }
 
         public string Name { get { return "UploadBakedTextureModule"; } }
@@ -100,15 +280,23 @@ namespace OpenSim.Region.ClientStack.Linden
 
         public void RegisterCaps(UUID agentID, Caps caps)
         {
+            UploadBakedTextureHandler avatarhandler = new UploadBakedTextureHandler(
+                caps, m_scene.AssetService, m_persistBakedTextures);
+
+           
+            
             caps.RegisterHandler(
                 "UploadBakedTexture",
                 new RestStreamHandler(
                     "POST",
                     "/CAPS/" + caps.CapsObjectPath + m_uploadBakedTexturePath,
-                    new UploadBakedTextureHandler(
-                        caps, m_scene.AssetService, m_persistBakedTextures).UploadBakedTexture,
+                    avatarhandler.UploadBakedTexture,
                     "UploadBakedTexture",
                     agentID.ToString()));
+
+           
+            
+
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index 6890f4a..a823dd8 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -27,18 +27,25 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Reflection;
+using System.Threading;
 using log4net;
 using Nini.Config;
 using Mono.Addins;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Framework.Capabilities;
 using OpenSim.Services.Interfaces;
 using Caps = OpenSim.Framework.Capabilities.Caps;
 using OpenSim.Capabilities.Handlers;
+using OpenSim.Framework.Monitoring;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
 
 namespace OpenSim.Region.ClientStack.Linden
 {
@@ -48,67 +55,74 @@ namespace OpenSim.Region.ClientStack.Linden
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "WebFetchInvDescModule")]
     public class WebFetchInvDescModule : INonSharedRegionModule
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        class aPollRequest
+        {
+            public PollServiceInventoryEventArgs thepoll;
+            public UUID reqID;
+            public Hashtable request;
+            public ScenePresence presence;
+            public List<UUID> folders;
+        }
+
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private Scene m_scene;
 
         private IInventoryService m_InventoryService;
         private ILibraryService m_LibraryService;
 
-        private bool m_Enabled;
+        private static WebFetchInvDescHandler m_webFetchHandler;
 
-        private string m_fetchInventoryDescendents2Url;
-        private string m_webFetchInventoryDescendentsUrl;
+        private Dictionary<UUID, string> m_capsDict = new Dictionary<UUID, string>();
+        private static Thread[] m_workerThreads = null;
 
-        private WebFetchInvDescHandler m_webFetchHandler;
+        private static DoubleQueue<aPollRequest> m_queue =
+                new DoubleQueue<aPollRequest>();
 
         #region ISharedRegionModule Members
 
         public void Initialise(IConfigSource source)
         {
-            IConfig config = source.Configs["ClientStack.LindenCaps"];
-            if (config == null)
-                return;
-
-            m_fetchInventoryDescendents2Url = config.GetString("Cap_FetchInventoryDescendents2", string.Empty);
-            m_webFetchInventoryDescendentsUrl = config.GetString("Cap_WebFetchInventoryDescendents", string.Empty);
-
-            if (m_fetchInventoryDescendents2Url != string.Empty || m_webFetchInventoryDescendentsUrl != string.Empty)
-            {
-                m_Enabled = true;
-            }
         }
 
         public void AddRegion(Scene s)
         {
-            if (!m_Enabled)
-                return;
-
             m_scene = s;
         }
 
         public void RemoveRegion(Scene s)
         {
-            if (!m_Enabled)
-                return;
-
             m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
+            m_scene.EventManager.OnDeregisterCaps -= DeregisterCaps;
             m_scene = null;
         }
 
         public void RegionLoaded(Scene s)
         {
-            if (!m_Enabled)
-                return;
-
             m_InventoryService = m_scene.InventoryService;
             m_LibraryService = m_scene.LibraryService;
 
             // We'll reuse the same handler for all requests.
-            if (m_fetchInventoryDescendents2Url == "localhost" || m_webFetchInventoryDescendentsUrl == "localhost")
-                m_webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService);
+            m_webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService);
 
             m_scene.EventManager.OnRegisterCaps += RegisterCaps;
+            m_scene.EventManager.OnDeregisterCaps += DeregisterCaps;
+
+            if (m_workerThreads == null)
+            {
+                m_workerThreads = new Thread[2];
+
+                for (uint i = 0; i < 2; i++)
+                {
+                    m_workerThreads[i] = Watchdog.StartThread(DoInventoryRequests,
+                            String.Format("InventoryWorkerThread{0}", i),
+                            ThreadPriority.Normal,
+                            false,
+                            true,
+                            null,
+                            int.MaxValue);
+                }
+            }
         }
 
         public void PostInitialise()
@@ -126,43 +140,188 @@ namespace OpenSim.Region.ClientStack.Linden
 
         #endregion
 
-        private void RegisterCaps(UUID agentID, Caps caps)
+        ~WebFetchInvDescModule()
         {
-            if (m_webFetchInventoryDescendentsUrl != "")
-                RegisterFetchCap(agentID, caps, "WebFetchInventoryDescendents", m_webFetchInventoryDescendentsUrl);
-
-            if (m_fetchInventoryDescendents2Url != "")
-                RegisterFetchCap(agentID, caps, "FetchInventoryDescendents2", m_fetchInventoryDescendents2Url);
+            foreach (Thread t in m_workerThreads)
+                Watchdog.AbortThread(t.ManagedThreadId);               
         }
 
-        private void RegisterFetchCap(UUID agentID, Caps caps, string capName, string url)
+        private class PollServiceInventoryEventArgs : PollServiceEventArgs
         {
-            string capUrl;
+            private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+            private Dictionary<UUID, Hashtable> responses =
+                    new Dictionary<UUID, Hashtable>();
+
+            private Scene m_scene;
 
-            if (url == "localhost")
+            public PollServiceInventoryEventArgs(Scene scene, UUID pId) :
+                    base(null, null, null, null, pId, int.MaxValue)
             {
-                capUrl = "/CAPS/" + UUID.Random();
+                m_scene = scene;
+
+                HasEvents = (x, y) => { lock (responses) return responses.ContainsKey(x); };
+                GetEvents = (x, y) =>
+                {
+                    lock (responses)
+                    {
+                        try
+                        {
+                            return responses[x];
+                        }
+                        finally
+                        {
+                            responses.Remove(x);
+                        }
+                    }
+                };
+
+                Request = (x, y) =>
+                {
+                    ScenePresence sp = m_scene.GetScenePresence(Id);
+                    if (sp == null)
+                    {
+                        m_log.ErrorFormat("[INVENTORY]: Unable to find ScenePresence for {0}", Id);
+                        return;
+                    }
+
+                    aPollRequest reqinfo = new aPollRequest();
+                    reqinfo.thepoll = this;
+                    reqinfo.reqID = x;
+                    reqinfo.request = y;
+                    reqinfo.presence = sp;
+                    reqinfo.folders = new List<UUID>();
+
+                    // Decode the request here
+                    string request = y["body"].ToString();
+
+                    request = request.Replace("<string>00000000-0000-0000-0000-000000000000</string>", "<uuid>00000000-0000-0000-0000-000000000000</uuid>");
+
+                    request = request.Replace("<key>fetch_folders</key><integer>0</integer>", "<key>fetch_folders</key><boolean>0</boolean>");
+                    request = request.Replace("<key>fetch_folders</key><integer>1</integer>", "<key>fetch_folders</key><boolean>1</boolean>");
+
+                    Hashtable hash = new Hashtable();
+                    try
+                    {
+                        hash = (Hashtable)LLSD.LLSDDeserialize(Utils.StringToBytes(request));
+                    }
+                    catch (LLSD.LLSDParseException e)
+                    {
+                        m_log.ErrorFormat("[INVENTORY]: Fetch error: {0}{1}" + e.Message, e.StackTrace);
+                        m_log.Error("Request: " + request);
+                        return;
+                    }
+
+                    ArrayList foldersrequested = (ArrayList)hash["folders"];
+
+                    bool highPriority = false;
+
+                    for (int i = 0; i < foldersrequested.Count; i++)
+                    {
+                        Hashtable inventoryhash = (Hashtable)foldersrequested[i];
+                        string folder = inventoryhash["folder_id"].ToString();
+                        UUID folderID;
+                        if (UUID.TryParse(folder, out folderID))
+                        {
+                            if (!reqinfo.folders.Contains(folderID))
+                            {
+                                if (sp.COF != UUID.Zero && sp.COF == folderID)
+                                    highPriority = true;
+                                reqinfo.folders.Add(folderID);
+                            }
+                        }
+                    }
+
+                    if (highPriority)
+                        m_queue.EnqueueHigh(reqinfo);
+                    else
+                        m_queue.EnqueueLow(reqinfo);
+                };
+
+                NoEvents = (x, y) =>
+                {
+/*
+                    lock (requests)
+                    {
+                        Hashtable request = requests.Find(id => id["RequestID"].ToString() == x.ToString());
+                        requests.Remove(request);
+                    }
+*/
+                    Hashtable response = new Hashtable();
+
+                    response["int_response_code"] = 500;
+                    response["str_response_string"] = "Script timeout";
+                    response["content_type"] = "text/plain";
+                    response["keepalive"] = false;
+                    response["reusecontext"] = false;
+
+                    return response;
+                };
+            }
 
-                IRequestHandler reqHandler
-                    = new RestStreamHandler(
-                        "POST",
-                        capUrl,
-                        m_webFetchHandler.FetchInventoryDescendentsRequest,
-                        "FetchInventoryDescendents2",
-                        agentID.ToString());
+            public void Process(aPollRequest requestinfo)
+            {
+                UUID requestID = requestinfo.reqID;
+
+                Hashtable response = new Hashtable();
+
+                response["int_response_code"] = 200;
+                response["content_type"] = "text/plain";
+                response["keepalive"] = false;
+                response["reusecontext"] = false;
 
-                caps.RegisterHandler(capName, reqHandler);
+                response["str_response_string"] = m_webFetchHandler.FetchInventoryDescendentsRequest(
+                        requestinfo.request["body"].ToString(), String.Empty, String.Empty, null, null);
+
+                lock (responses)
+                    responses[requestID] = response; 
             }
-            else
+        }
+
+        private void RegisterCaps(UUID agentID, Caps caps)
+        {
+            string capUrl = "/CAPS/" + UUID.Random() + "/";
+
+            // Register this as a poll service          
+            PollServiceInventoryEventArgs args = new PollServiceInventoryEventArgs(m_scene, agentID);
+            
+            args.Type = PollServiceEventArgs.EventType.Inventory;
+            MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args);
+
+            string hostName = m_scene.RegionInfo.ExternalHostName;
+            uint port = (MainServer.Instance == null) ? 0 : MainServer.Instance.Port;
+            string protocol = "http";
+            
+            if (MainServer.Instance.UseSSL)
             {
-                capUrl = url;
+                hostName = MainServer.Instance.SSLCommonName;
+                port = MainServer.Instance.SSLPort;
+                protocol = "https";
+            }
+            caps.RegisterHandler("FetchInventoryDescendents2", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
+
+            m_capsDict[agentID] = capUrl;
+        }
 
-                caps.RegisterHandler(capName, capUrl);
+        private void DeregisterCaps(UUID agentID, Caps caps)
+        {
+            string capUrl;
+
+            if (m_capsDict.TryGetValue(agentID, out capUrl))
+            {
+                MainServer.Instance.RemoveHTTPHandler("", capUrl);
+                m_capsDict.Remove(agentID);
             }
+        }
 
-//            m_log.DebugFormat(
-//                "[WEB FETCH INV DESC MODULE]: Registered capability {0} at {1} in region {2} for {3}",
-//                capName, capUrl, m_scene.RegionInfo.RegionName, agentID);
+        private void DoInventoryRequests()
+        {
+            while (true)
+            {
+                aPollRequest poolreq = m_queue.Dequeue();
+
+                poolreq.thepoll.Process(poolreq);
+            }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
index afbe56b..3995620 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
@@ -234,6 +234,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             m_stopPacket = TexturePacketCount();
                         }
 
+                        //Give them at least two packets, to play nice with some broken viewers (SL also behaves this way)
+                        if (m_stopPacket == 1 && m_layers[0].End > FIRST_PACKET_SIZE) m_stopPacket++;
+
                         m_currentPacket = StartPacket;
                     }
                 }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index bd4a2d1..f1fe6e1 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -99,6 +99,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event AvatarPickerRequest OnAvatarPickerRequest;
         public event StartAnim OnStartAnim;
         public event StopAnim OnStopAnim;
+        public event ChangeAnim OnChangeAnim;
         public event Action<IClientAPI> OnRequestAvatarsData;
         public event LinkObjects OnLinkObjects;
         public event DelinkObjects OnDelinkObjects;
@@ -126,6 +127,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily;
         public event UpdatePrimFlags OnUpdatePrimFlags;
         public event UpdatePrimTexture OnUpdatePrimTexture;
+        public event ClientChangeObject onClientChangeObject;
         public event UpdateVector OnUpdatePrimGroupPosition;
         public event UpdateVector OnUpdatePrimSinglePosition;
         public event UpdatePrimRotation OnUpdatePrimGroupRotation;
@@ -159,6 +161,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event RequestTaskInventory OnRequestTaskInventory;
         public event UpdateInventoryItem OnUpdateInventoryItem;
         public event CopyInventoryItem OnCopyInventoryItem;
+        public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
         public event MoveInventoryItem OnMoveInventoryItem;
         public event RemoveInventoryItem OnRemoveInventoryItem;
         public event RemoveInventoryFolder OnRemoveInventoryFolder;
@@ -257,7 +260,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event ClassifiedInfoRequest OnClassifiedInfoRequest;
         public event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
         public event ClassifiedDelete OnClassifiedDelete;
-        public event ClassifiedDelete OnClassifiedGodDelete;
+        public event ClassifiedGodDelete OnClassifiedGodDelete;
         public event EventNotificationAddRequest OnEventNotificationAddRequest;
         public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
         public event EventGodDelete OnEventGodDelete;
@@ -288,10 +291,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
         public event SimWideDeletesDelegate OnSimWideDeletes;
         public event SendPostcard OnSendPostcard;
+        public event ChangeInventoryItemFlags OnChangeInventoryItemFlags;
         public event MuteListEntryUpdate OnUpdateMuteListEntry;
         public event MuteListEntryRemove OnRemoveMuteListEntry;
         public event GodlikeMessage onGodlikeMessage;
         public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate;
+        public event GenericCall2 OnUpdateThrottles;
 
         #endregion Events
 
@@ -326,6 +331,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private Prioritizer m_prioritizer;
         private bool m_disableFacelights = false;
 
+        private bool m_VelocityInterpolate = false;
+        private const uint MaxTransferBytesPerPacket = 600;
+
+
         /// <value>
         /// List used in construction of data blocks for an object update packet.  This is to stop us having to
         /// continually recreate it.
@@ -337,14 +346,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// thread servicing the m_primFullUpdates queue after a kill.  If this happens the object persists as an
         /// ownerless phantom.
         ///
-        /// All manipulation of this set has to occur under a lock
+        /// All manipulation of this set has to occur under an m_entityUpdates.SyncRoot lock
         ///
         /// </value>
-        protected HashSet<uint> m_killRecord;
+//        protected HashSet<uint> m_killRecord;
 
 //        protected HashSet<uint> m_attachmentsSent;
 
         private int m_moneyBalance;
+        private bool m_deliverPackets = true;
         private int m_animationSequenceNumber = 1;
         private bool m_SendLogoutPacketWhenClosing = true;
 
@@ -391,6 +401,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             get { return m_startpos; }
             set { m_startpos = value; }
         }
+        public bool DeliverPackets
+        {
+            get { return m_deliverPackets; }
+            set {
+                m_deliverPackets = value;
+                m_udpClient.m_deliverPackets = value;
+            }
+        }
         public UUID AgentId { get { return m_agentId; } }
         public ISceneAgent SceneAgent { get; set; }
         public UUID ActiveGroupId { get { return m_activeGroupID; } }
@@ -442,6 +460,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         }
 
         public bool SendLogoutPacketWhenClosing { set { m_SendLogoutPacketWhenClosing = value; } }
+       
 
         #endregion Properties
 
@@ -468,7 +487,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_entityUpdates = new PriorityQueue(m_scene.Entities.Count);
             m_entityProps = new PriorityQueue(m_scene.Entities.Count);
             m_fullUpdateDataBlocksBuilder = new List<ObjectUpdatePacket.ObjectDataBlock>();
-            m_killRecord = new HashSet<uint>();
+//            m_killRecord = new HashSet<uint>();
 //            m_attachmentsSent = new HashSet<uint>();
 
             m_assetService = m_scene.RequestModuleInterface<IAssetService>();
@@ -498,12 +517,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         #region Client Methods
 
+
+        /// <summary>
+        /// Close down the client view
+        /// </summary>
         public void Close()
         {
-            Close(false);
+            Close(true, false);
         }
 
-        public void Close(bool force)
+        public void Close(bool sendStop, bool force)
         {
             // We lock here to prevent race conditions between two threads calling close simultaneously (e.g.
             // a simultaneous relog just as a client is being closed out due to no packet ack from the old connection.
@@ -515,7 +538,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     return;
 
                 IsActive = false;
-                CloseWithoutChecks();
+                CloseWithoutChecks(sendStop);
             }
         }
 
@@ -528,12 +551,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         ///
         /// Callers must lock ClosingSyncLock before calling.
         /// </remarks>
-        public void CloseWithoutChecks()
+        public void CloseWithoutChecks(bool sendStop)
         {
             m_log.DebugFormat(
                 "[CLIENT]: Close has been called for {0} attached to scene {1}",
                 Name, m_scene.RegionInfo.RegionName);
 
+            if (sendStop)
+            {
+                // Send the STOP packet
+                DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator);
+                OutPacket(disable, ThrottleOutPacketType.Unknown);
+            }
+
             // Shutdown the image manager
             ImageManager.Close();
 
@@ -556,6 +586,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // Disable UDP handling for this client
             m_udpClient.Shutdown();
 
+            
             //m_log.InfoFormat("[CLIENTVIEW] Memory pre  GC {0}", System.GC.GetTotalMemory(false));
             //GC.Collect();
             //m_log.InfoFormat("[CLIENTVIEW] Memory post GC {0}", System.GC.GetTotalMemory(true));
@@ -791,7 +822,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             handshake.RegionInfo3.ProductName = Util.StringToBytes256(regionInfo.RegionType);
             handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes;
 
-            OutPacket(handshake, ThrottleOutPacketType.Task);
+//            OutPacket(handshake, ThrottleOutPacketType.Task);
+            // use same as MoveAgentIntoRegion (both should be task )
+            OutPacket(handshake, ThrottleOutPacketType.Unknown);
         }
 
         public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look)
@@ -831,7 +864,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             reply.ChatData.OwnerID = ownerID;
             reply.ChatData.SourceID = fromAgentID;
 
-            OutPacket(reply, ThrottleOutPacketType.Task);
+            OutPacket(reply, ThrottleOutPacketType.Unknown);
         }
 
         /// <summary>
@@ -864,32 +897,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 msg.MessageBlock.Message = Util.StringToBytes1024(im.message);
                 msg.MessageBlock.BinaryBucket = im.binaryBucket;
 
-                if (im.message.StartsWith("[grouptest]"))
-                { // this block is test code for implementing group IM - delete when group IM is finished
-                    IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
-                    if (eq != null)
-                    {
-                        im.dialog = 17;
-
-                        //eq.ChatterboxInvitation(
-                        //    new UUID("00000000-68f9-1111-024e-222222111123"),
-                        //    "OpenSimulator Testing", im.fromAgentID, im.message, im.toAgentID, im.fromAgentName, im.dialog, 0,
-                        //    false, 0, new Vector3(), 1, im.imSessionID, im.fromGroup, im.binaryBucket);
-
-                        eq.ChatterboxInvitation(
-                            new UUID("00000000-68f9-1111-024e-222222111123"),
-                            "OpenSimulator Testing", new UUID(im.fromAgentID), im.message, new UUID(im.toAgentID), im.fromAgentName, im.dialog, 0,
-                            false, 0, new Vector3(), 1, new UUID(im.imSessionID), im.fromGroup, Util.StringToBytes256("OpenSimulator Testing"));
-
-                        eq.ChatterBoxSessionAgentListUpdates(
-                            new UUID("00000000-68f9-1111-024e-222222111123"),
-                            new UUID(im.fromAgentID), new UUID(im.toAgentID), false, false, false);
-                    }
-
-                    Console.WriteLine("SendInstantMessage: " + msg);
-                }
-                else
-                    OutPacket(msg, ThrottleOutPacketType.Task);
+                OutPacket(msg, ThrottleOutPacketType.Task);
             }
         }
 
@@ -1117,6 +1125,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public virtual void SendLayerData(float[] map)
         {
             Util.FireAndForget(DoSendLayerData, map);
+
+            // Send it sync, and async. It's not that much data
+            // and it improves user experience just so much!
+            DoSendLayerData(map);
         }
 
         /// <summary>
@@ -1129,16 +1141,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             try
             {
-                //for (int y = 0; y < 16; y++)
-                //{
-                //    for (int x = 0; x < 16; x++)
-                //    {
-                //        SendLayerData(x, y, map);
-                //    }
-                //}
-
-                // Send LayerData in a spiral pattern. Fun!
-                SendLayerTopRight(map, 0, 0, 15, 15);
+                for (int y = 0; y < 16; y++)
+                {
+                    for (int x = 0; x < 16; x+=4)
+                    {
+                        SendLayerPacket(x, y, map);
+                    }
+                }
             }
             catch (Exception e)
             {
@@ -1146,51 +1155,35 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
 
-        private void SendLayerTopRight(float[] map, int x1, int y1, int x2, int y2)
-        {
-            // Row
-            for (int i = x1; i <= x2; i++)
-                SendLayerData(i, y1, map);
-
-            // Column
-            for (int j = y1 + 1; j <= y2; j++)
-                SendLayerData(x2, j, map);
-
-            if (x2 - x1 > 0)
-                SendLayerBottomLeft(map, x1, y1 + 1, x2 - 1, y2);
-        }
-
-        void SendLayerBottomLeft(float[] map, int x1, int y1, int x2, int y2)
-        {
-            // Row in reverse
-            for (int i = x2; i >= x1; i--)
-                SendLayerData(i, y2, map);
-
-            // Column in reverse
-            for (int j = y2 - 1; j >= y1; j--)
-                SendLayerData(x1, j, map);
-
-            if (x2 - x1 > 0)
-                SendLayerTopRight(map, x1 + 1, y1, x2, y2 - 1);
-        }
-
         /// <summary>
         /// Sends a set of four patches (x, x+1, ..., x+3) to the client
         /// </summary>
         /// <param name="map">heightmap</param>
         /// <param name="px">X coordinate for patches 0..12</param>
         /// <param name="py">Y coordinate for patches 0..15</param>
-        // private void SendLayerPacket(float[] map, int y, int x)
-        // {
-        //     int[] patches = new int[4];
-        //     patches[0] = x + 0 + y * 16;
-        //     patches[1] = x + 1 + y * 16;
-        //     patches[2] = x + 2 + y * 16;
-        //     patches[3] = x + 3 + y * 16;
-
-        //     Packet layerpack = LLClientView.TerrainManager.CreateLandPacket(map, patches);
-        //     OutPacket(layerpack, ThrottleOutPacketType.Land);
-        // }
+        private void SendLayerPacket(int x, int y, float[] map)
+        {
+            int[] patches = new int[4];
+            patches[0] = x + 0 + y * 16;
+            patches[1] = x + 1 + y * 16;
+            patches[2] = x + 2 + y * 16;
+            patches[3] = x + 3 + y * 16;
+
+            float[] heightmap = (map.Length == 65536) ?
+                map :
+                LLHeightFieldMoronize(map);
+
+            try
+            {
+                Packet layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches);
+                OutPacket(layerpack, ThrottleOutPacketType.Land);
+            }
+            catch
+            {
+                for (int px = x ; px < x + 4 ; px++)
+                    SendLayerData(px, y, map);
+            }
+        }
 
         /// <summary>
         /// Sends a specified patch to a client
@@ -1210,7 +1203,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches);
                 layerpack.Header.Reliable = true;
 
-                OutPacket(layerpack, ThrottleOutPacketType.Land);
+                OutPacket(layerpack, ThrottleOutPacketType.Task);
             }
             catch (Exception e)
             {
@@ -1573,7 +1566,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public void SendKillObject(ulong regionHandle, List<uint> localIDs)
         {
-//            m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, localID, regionHandle);
+//            foreach (uint id in localIDs)
+//                m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, id, regionHandle);
 
             KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject);
             // TODO: don't create new blocks if recycling an old packet
@@ -1595,17 +1589,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // We MUST lock for both manipulating the kill record and sending the packet, in order to avoid a race
                 // condition where a kill can be processed before an out-of-date update for the same object.
                 // ProcessEntityUpdates() also takes the m_killRecord lock.
-                lock (m_killRecord)
-                {
-                    foreach (uint localID in localIDs)
-                        m_killRecord.Add(localID);
+//                lock (m_killRecord)
+//                {
+//                    foreach (uint localID in localIDs)
+//                        m_killRecord.Add(localID);
 
                     // The throttle queue used here must match that being used for updates.  Otherwise, there is a
                     // chance that a kill packet put on a separate queue will be sent to the client before an existing
                     // update packet on another queue.  Receiving updates after kills results in unowned and undeletable
                     // scene objects in a viewer until that viewer is relogged in.
                     OutPacket(kill, ThrottleOutPacketType.Task);
-                }
+//                }
             }
         }
 
@@ -2063,9 +2057,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OutPacket(bulkUpdate, ThrottleOutPacketType.Asset);
         }
 
-        /// <see>IClientAPI.SendInventoryItemCreateUpdate(InventoryItemBase)</see>
         public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId)
         {
+            SendInventoryItemCreateUpdate(Item, UUID.Zero, callbackId);
+        }
+
+        /// <see>IClientAPI.SendInventoryItemCreateUpdate(InventoryItemBase)</see>
+        public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId)
+        {
             const uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All;
 
             UpdateCreateInventoryItemPacket InventoryReply
@@ -2075,6 +2074,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // TODO: don't create new blocks if recycling an old packet
             InventoryReply.AgentData.AgentID = AgentId;
             InventoryReply.AgentData.SimApproved = true;
+            InventoryReply.AgentData.TransactionID = transactionID;
             InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1];
             InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock();
             InventoryReply.InventoryData[0].ItemID = Item.ID;
@@ -2144,16 +2144,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             replytask.InventoryData.TaskID = taskID;
             replytask.InventoryData.Serial = serial;
             replytask.InventoryData.Filename = fileName;
-            OutPacket(replytask, ThrottleOutPacketType.Asset);
+            OutPacket(replytask, ThrottleOutPacketType.Task);
         }
 
-        public void SendXferPacket(ulong xferID, uint packet, byte[] data)
+        public void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory)
         {
+            ThrottleOutPacketType type = ThrottleOutPacketType.Asset;
+            if (isTaskInventory)
+                type = ThrottleOutPacketType.Task;
+
             SendXferPacketPacket sendXfer = (SendXferPacketPacket)PacketPool.Instance.GetPacket(PacketType.SendXferPacket);
             sendXfer.XferID.ID = xferID;
             sendXfer.XferID.Packet = packet;
             sendXfer.DataPacket.Data = data;
-            OutPacket(sendXfer, ThrottleOutPacketType.Asset);
+            OutPacket(sendXfer, type);
         }
 
         public void SendAbortXferPacket(ulong xferID)
@@ -2335,6 +2339,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OutPacket(sound, ThrottleOutPacketType.Task);
         }
 
+        public void SendTransferAbort(TransferRequestPacket transferRequest)
+        {
+            TransferAbortPacket abort = (TransferAbortPacket)PacketPool.Instance.GetPacket(PacketType.TransferAbort);
+            abort.TransferInfo.TransferID = transferRequest.TransferInfo.TransferID;
+            abort.TransferInfo.ChannelType = transferRequest.TransferInfo.ChannelType;
+            m_log.Debug("[Assets] Aborting transfer; asset request failed");
+            OutPacket(abort, ThrottleOutPacketType.Task);
+        }
+
         public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain)
         {
             SoundTriggerPacket sound = (SoundTriggerPacket)PacketPool.Instance.GetPacket(PacketType.SoundTrigger);
@@ -2643,6 +2656,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         float friction = part.Friction;
                         float bounce = part.Restitution;
                         float gravmod = part.GravityModifier;
+
                         eq.partPhysicsProperties(localid, physshapetype, density, friction, bounce, gravmod,AgentId);
                     }
                 }
@@ -2713,8 +2727,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     req.AssetInf.ID, req.AssetInf.Metadata.ContentType);
                 return;
             }
+            int WearableOut = 0;
+            bool isWearable = false;
+
+            if (req.AssetInf != null)
+                isWearable =
+                    ((AssetType) req.AssetInf.Type ==
+                     AssetType.Bodypart || (AssetType) req.AssetInf.Type == AssetType.Clothing);
 
-            //m_log.Debug("sending asset " + req.RequestAssetID);
+            
+            //m_log.Debug("sending asset " + req.RequestAssetID + ", iswearable: " + isWearable);
+           
+            
+            //if (isWearable) 
+            //    m_log.Debug((AssetType)req.AssetInf.Type);
+            
             TransferInfoPacket Transfer = new TransferInfoPacket();
             Transfer.TransferInfo.ChannelType = 2;
             Transfer.TransferInfo.Status = 0;
@@ -2736,7 +2763,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             Transfer.TransferInfo.Size = req.AssetInf.Data.Length;
             Transfer.TransferInfo.TransferID = req.TransferRequestID;
             Transfer.Header.Zerocoded = true;
-            OutPacket(Transfer, ThrottleOutPacketType.Asset);
+            OutPacket(Transfer, isWearable ? ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority : ThrottleOutPacketType.Asset);
 
             if (req.NumPackets == 1)
             {
@@ -2747,12 +2774,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 TransferPacket.TransferData.Data = req.AssetInf.Data;
                 TransferPacket.TransferData.Status = 1;
                 TransferPacket.Header.Zerocoded = true;
-                OutPacket(TransferPacket, ThrottleOutPacketType.Asset);
+                OutPacket(TransferPacket, isWearable ? ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority : ThrottleOutPacketType.Asset);
             }
             else
             {
                 int processedLength = 0;
-                int maxChunkSize = Settings.MAX_PACKET_SIZE - 100;
+//                int maxChunkSize = Settings.MAX_PACKET_SIZE - 100;
+
+                int maxChunkSize = (int) MaxTransferBytesPerPacket;
                 int packetNumber = 0;
 
                 while (processedLength < req.AssetInf.Data.Length)
@@ -2778,7 +2807,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         TransferPacket.TransferData.Status = 1;
                     }
                     TransferPacket.Header.Zerocoded = true;
-                    OutPacket(TransferPacket, ThrottleOutPacketType.Asset);
+                    OutPacket(TransferPacket, isWearable ? ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority : ThrottleOutPacketType.Asset);
 
                     processedLength += chunkSize;
                     packetNumber++;
@@ -2823,7 +2852,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             reply.Data.ParcelID = parcelID;
             reply.Data.OwnerID = land.OwnerID;
             reply.Data.Name = Utils.StringToBytes(land.Name);
-            reply.Data.Desc = Utils.StringToBytes(land.Description);
+            if (land != null && land.Description != null && land.Description != String.Empty)
+                reply.Data.Desc = Utils.StringToBytes(land.Description.Substring(0, land.Description.Length > 254 ? 254: land.Description.Length));
+            else
+                reply.Data.Desc = new Byte[0];
             reply.Data.ActualArea = land.Area;
             reply.Data.BillableArea = land.Area; // TODO: what is this?
 
@@ -3530,24 +3562,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[count];
             AgentWearablesUpdatePacket.WearableDataBlock awb;
             int idx = 0;
-            for (int i = 0; i < wearables.Length; i++)
-            {
-                for (int j = 0; j < wearables[i].Count; j++)
-                {
-                    awb = new AgentWearablesUpdatePacket.WearableDataBlock();
-                    awb.WearableType = (byte)i;
-                    awb.AssetID = wearables[i][j].AssetID;
-                    awb.ItemID = wearables[i][j].ItemID;
-                    aw.WearableData[idx] = awb;
-                    idx++;
-
-//                                m_log.DebugFormat(
-//                                    "[APPEARANCE]: Sending wearable item/asset {0} {1} (index {2}) for {3}",
-//                                    awb.ItemID, awb.AssetID, i, Name);
-                }
-            }
+           
+                    for (int i = 0; i < wearables.Length; i++)
+                    {
+                        for (int j = 0; j < wearables[i].Count; j++)
+                        {
+                            awb = new AgentWearablesUpdatePacket.WearableDataBlock();
+                            awb.WearableType = (byte) i;
+                            awb.AssetID = wearables[i][j].AssetID;
+                            awb.ItemID = wearables[i][j].ItemID;
+                            aw.WearableData[idx] = awb;
+                            idx++;
+
+                            //                                m_log.DebugFormat(
+                            //                                    "[APPEARANCE]: Sending wearable item/asset {0} {1} (index {2}) for {3}",
+                            //                                    awb.ItemID, awb.AssetID, i, Name);
+                        }
+                    }    
 
-            OutPacket(aw, ThrottleOutPacketType.Task);
+            OutPacket(aw, ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority);
         }
 
         public void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry)
@@ -3558,7 +3591,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             AvatarAppearancePacket avp = (AvatarAppearancePacket)PacketPool.Instance.GetPacket(PacketType.AvatarAppearance);
             // TODO: don't create new blocks if recycling an old packet
-            avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218];
+            avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[visualParams.Length];
             avp.ObjectData.TextureEntry = textureEntry;
 
             AvatarAppearancePacket.VisualParamBlock avblock = null;
@@ -3571,7 +3604,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             avp.Sender.IsTrial = false;
             avp.Sender.ID = agentID;
-            //m_log.DebugFormat("[CLIENT]: Sending appearance for {0} to {1}", agentID.ToString(), AgentId.ToString());
+            m_log.DebugFormat("[CLIENT]: Sending appearance for {0} to {1}", agentID.ToString(), AgentId.ToString());
             OutPacket(avp, ThrottleOutPacketType.Task);
         }
 
@@ -3688,7 +3721,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// </summary>
         public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
         {
-            //double priority = m_prioritizer.GetUpdatePriority(this, entity);
+            if (entity is SceneObjectPart)
+            {
+                SceneObjectPart e = (SceneObjectPart)entity;
+                SceneObjectGroup g = e.ParentGroup;
+                if (g.RootPart.Shape.State > 30) // HUD
+                    if (g.OwnerID != AgentId)
+                        return; // Don't send updates for other people's HUDs
+            }
+
             uint priority = m_prioritizer.GetUpdatePriority(this, entity);
 
             lock (m_entityUpdates.SyncRoot)
@@ -3755,27 +3796,74 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             // We must lock for both manipulating the kill record and sending the packet, in order to avoid a race
             // condition where a kill can be processed before an out-of-date update for the same object.                        
-            lock (m_killRecord)
+            float avgTimeDilation = 1.0f;
+            IEntityUpdate iupdate;
+            Int32 timeinqueue; // this is just debugging code & can be dropped later
+                
+            while (updatesThisCall < maxUpdates)
             {
-                float avgTimeDilation = 1.0f;
-                IEntityUpdate iupdate;
-                Int32 timeinqueue; // this is just debugging code & can be dropped later
+                lock (m_entityUpdates.SyncRoot)
+                    if (!m_entityUpdates.TryDequeue(out iupdate, out timeinqueue))
+                        break;
+
+                EntityUpdate update = (EntityUpdate)iupdate;
+                    
+                avgTimeDilation += update.TimeDilation;
+                avgTimeDilation *= 0.5f;
 
-                while (updatesThisCall < maxUpdates)
+                if (update.Entity is SceneObjectPart)
                 {
-                    lock (m_entityUpdates.SyncRoot)
-                        if (!m_entityUpdates.TryDequeue(out iupdate, out timeinqueue))
-                            break;
+                    SceneObjectPart part = (SceneObjectPart)update.Entity;
 
-                    EntityUpdate update = (EntityUpdate)iupdate;
-                    
-                    avgTimeDilation += update.TimeDilation;
-                    avgTimeDilation *= 0.5f;
+                    if (part.ParentGroup.IsDeleted)
+                        continue;
 
-                    if (update.Entity is SceneObjectPart)
+                    if (part.ParentGroup.IsAttachment)
+                    {   // Someone else's HUD, why are we getting these?
+                        if (part.ParentGroup.OwnerID != AgentId &&
+                            part.ParentGroup.RootPart.Shape.State > 30)
+                            continue;
+                        ScenePresence sp;
+                        // Owner is not in the sim, don't update it to
+                        // anyone
+                        if (!m_scene.TryGetScenePresence(part.OwnerID, out sp))
+                            continue;
+
+                        List<SceneObjectGroup> atts = sp.GetAttachments();
+                        bool found = false;
+                        foreach (SceneObjectGroup att in atts)
+                        {
+                            if (att == part.ParentGroup)
+                            {
+                                found = true;
+                                break;
+                            }
+                        }
+
+                        // It's an attachment of a valid avatar, but
+                        // doesn't seem to be attached, skip
+                        if (!found)
+                            continue;
+
+                        // On vehicle crossing, the attachments are received
+                        // while the avatar is still a child. Don't send
+                        // updates here because the LocalId has not yet
+                        // been updated and the viewer will derender the
+                        // attachments until the avatar becomes root.
+                        if (sp.IsChildAgent)
+                            continue;
+
+                        // If the object is an attachment we don't want it to be in the kill
+                        // record. Else attaching from inworld and subsequently dropping
+                        // it will no longer work.
+//                        lock (m_killRecord)
+//                        {
+//                            m_killRecord.Remove(part.LocalId);
+//                            m_killRecord.Remove(part.ParentGroup.RootPart.LocalId);
+//                        }
+                    }
+                    else
                     {
-                        SceneObjectPart part = (SceneObjectPart)update.Entity;
-    
                         // Please do not remove this unless you can demonstrate on the OpenSim mailing list that a client
                         // will never receive an update after a prim kill.  Even then, keeping the kill record may be a good
                         // safety measure.
@@ -3786,241 +3874,177 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         // 
                         // This doesn't appear to apply to child prims - a client will happily ignore these updates
                         // after the root prim has been deleted.
-                        if (m_killRecord.Contains(part.LocalId))
-                        {
-        //                        m_log.WarnFormat(
-        //                            "[CLIENT]: Preventing update for prim with local id {0} after client for user {1} told it was deleted",
-        //                            part.LocalId, Name);
-                            continue;
-                        }                        
-                            
-                        if (part.ParentGroup.IsAttachment && m_disableFacelights)
+                        //
+                        // We ignore this for attachments because attaching something from inworld breaks unless we do.
+//                        lock (m_killRecord)
+//                        {
+//                            if (m_killRecord.Contains(part.LocalId))
+//                                continue;
+//                            if (m_killRecord.Contains(part.ParentGroup.RootPart.LocalId))
+//                                continue;
+//                        }
+                    }
+
+                    if (part.ParentGroup.IsAttachment && m_disableFacelights)
+                    {
+                        if (part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.LeftHand &&
+                            part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.RightHand)
                         {
-                            if (part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.LeftHand &&
-                                part.ParentGroup.RootPart.Shape.State != (byte)AttachmentPoint.RightHand)
-                            {
-                                part.Shape.LightEntry = false;
-                            }
+                            part.Shape.LightEntry = false;
                         }
                     }
-    
-                    #region UpdateFlags to packet type conversion
-    
-                    PrimUpdateFlags updateFlags = (PrimUpdateFlags)update.Flags;
-    
-                    bool canUseCompressed = true;
-                    bool canUseImproved = true;
-    
-                    // Compressed object updates only make sense for LL primitives
-                    if (!(update.Entity is SceneObjectPart))
+                }
+
+                ++updatesThisCall;
+
+                #region UpdateFlags to packet type conversion
+
+                PrimUpdateFlags updateFlags = (PrimUpdateFlags)update.Flags;
+
+                bool canUseCompressed = true;
+                bool canUseImproved = true;
+
+                // Compressed object updates only make sense for LL primitives
+                if (!(update.Entity is SceneObjectPart))
+                {
+                    canUseCompressed = false;
+                }
+
+                if (updateFlags.HasFlag(PrimUpdateFlags.FullUpdate))
+                {
+                    canUseCompressed = false;
+                    canUseImproved = false;
+                }
+                else
+                {
+                    if (updateFlags.HasFlag(PrimUpdateFlags.Velocity) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.Acceleration) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.CollisionPlane) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.Joint))
                     {
                         canUseCompressed = false;
                     }
-    
-                    if (updateFlags.HasFlag(PrimUpdateFlags.FullUpdate))
+
+                    if (updateFlags.HasFlag(PrimUpdateFlags.PrimFlags) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.ParentID) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.Scale) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.PrimData) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.Text) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.NameValue) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.ExtraData) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.TextureAnim) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.Sound) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.Particles) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.Material) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.ClickAction) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.MediaURL) ||
+                        updateFlags.HasFlag(PrimUpdateFlags.Joint))
                     {
-                        canUseCompressed = false;
                         canUseImproved = false;
                     }
-                    else
-                    {
-                        if (updateFlags.HasFlag(PrimUpdateFlags.Velocity) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.Acceleration) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.CollisionPlane) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.Joint))
-                        {
-                            canUseCompressed = false;
-                        }
-    
-                        if (updateFlags.HasFlag(PrimUpdateFlags.PrimFlags) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.ParentID) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.Scale) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.PrimData) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.Text) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.NameValue) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.ExtraData) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.TextureAnim) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.Sound) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.Particles) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.Material) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.ClickAction) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.MediaURL) ||
-                            updateFlags.HasFlag(PrimUpdateFlags.Joint))
-                        {
-                            canUseImproved = false;
-                        }
-                    }
-    
-                    #endregion UpdateFlags to packet type conversion
-    
-                    #region Block Construction
-    
-                    // TODO: Remove this once we can build compressed updates
-                    canUseCompressed = false;
+                }
     
-                    if (!canUseImproved && !canUseCompressed)
-                    {
-                        ObjectUpdatePacket.ObjectDataBlock updateBlock;
+                #endregion UpdateFlags to packet type conversion
 
-                        if (update.Entity is ScenePresence)
-                        {
-                            updateBlock = CreateAvatarUpdateBlock((ScenePresence)update.Entity);
-                        }
-                        else
-                        {
-                            SceneObjectPart part = (SceneObjectPart)update.Entity;
-                            updateBlock = CreatePrimUpdateBlock(part, AgentId);
-
-                            // If the part has become a private hud since the update was scheduled then we do not
-                            // want to send it to other avatars.
-                            if (part.ParentGroup.IsAttachment
-                                && part.ParentGroup.HasPrivateAttachmentPoint
-                                && part.ParentGroup.AttachedAvatar != AgentId)
-                                continue;
-
-                            // If the part has since been deleted, then drop the update.  In the case of attachments,
-                            // this is to avoid spurious updates to other viewers since post-processing of attachments
-                            // has to change the IsAttachment flag for various reasons (which will end up in a pass
-                            // of the test above).
-                            //
-                            // Actual deletions (kills) happen in another method.
-                            if (part.ParentGroup.IsDeleted)
-                                continue;
-                        }
+                #region Block Construction
 
-                        objectUpdateBlocks.Value.Add(updateBlock);
-                        objectUpdates.Value.Add(update);
-                    }
-                    else if (!canUseImproved)
-                    {
-                        SceneObjectPart part = (SceneObjectPart)update.Entity;
-                        ObjectUpdateCompressedPacket.ObjectDataBlock compressedBlock
-                            = CreateCompressedUpdateBlock(part, updateFlags);
-
-                        // If the part has since been deleted, then drop the update.  In the case of attachments,
-                        // this is to avoid spurious updates to other viewers since post-processing of attachments
-                        // has to change the IsAttachment flag for various reasons (which will end up in a pass
-                        // of the test above).
-                        //
-                        // Actual deletions (kills) happen in another method.
-                        if (part.ParentGroup.IsDeleted)
-                            continue;
+                // TODO: Remove this once we can build compressed updates
+                canUseCompressed = false;
 
-                        compressedUpdateBlocks.Value.Add(compressedBlock);
-                        compressedUpdates.Value.Add(update);
+                if (!canUseImproved && !canUseCompressed)
+                {
+                    if (update.Entity is ScenePresence)
+                    {
+                        objectUpdateBlocks.Value.Add(CreateAvatarUpdateBlock((ScenePresence)update.Entity));
                     }
                     else
                     {
-                        if (update.Entity is ScenePresence && ((ScenePresence)update.Entity).UUID == AgentId)
-                        {
-                            // Self updates go into a special list
-                            terseAgentUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures)));
-                            terseAgentUpdates.Value.Add(update);
-                        }
-                        else
-                        {
-                            ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseUpdateBlock
-                                = CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures));
-
-                            // Everything else goes here
-                            if (update.Entity is SceneObjectPart)
-                            {
-                                SceneObjectPart part = (SceneObjectPart)update.Entity;
-
-                                // If the part has become a private hud since the update was scheduled then we do not
-                                // want to send it to other avatars.
-                                if (part.ParentGroup.IsAttachment
-                                    && part.ParentGroup.HasPrivateAttachmentPoint
-                                    && part.ParentGroup.AttachedAvatar != AgentId)
-                                    continue;
-
-                                // If the part has since been deleted, then drop the update.  In the case of attachments,
-                                // this is to avoid spurious updates to other viewers since post-processing of attachments
-                                // has to change the IsAttachment flag for various reasons (which will end up in a pass
-                                // of the test above).
-                                //
-                                // Actual deletions (kills) happen in another method.
-                                if (part.ParentGroup.IsDeleted)
-                                    continue;
-                            }
-
-                            terseUpdateBlocks.Value.Add(terseUpdateBlock);
-                            terseUpdates.Value.Add(update);
-                        }
+                        objectUpdateBlocks.Value.Add(CreatePrimUpdateBlock((SceneObjectPart)update.Entity, this.m_agentId));
                     }
-
-                    ++updatesThisCall;
-    
-                    #endregion Block Construction
                 }
-    
-                #region Packet Sending
-                ushort timeDilation = Utils.FloatToUInt16(avgTimeDilation, 0.0f, 1.0f);
-
-                if (terseAgentUpdateBlocks.IsValueCreated)
+                else if (!canUseImproved)
+                {
+                    compressedUpdateBlocks.Value.Add(CreateCompressedUpdateBlock((SceneObjectPart)update.Entity, updateFlags));
+                }
+                else
                 {
-                    List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseAgentUpdateBlocks.Value;
+                    if (update.Entity is ScenePresence && ((ScenePresence)update.Entity).UUID == AgentId)
+                        // Self updates go into a special list
+                        terseAgentUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures)));
+                    else
+                        // Everything else goes here
+                        terseUpdateBlocks.Value.Add(CreateImprovedTerseBlock(update.Entity, updateFlags.HasFlag(PrimUpdateFlags.Textures)));
+                }
 
-                    ImprovedTerseObjectUpdatePacket packet
-                        = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate);
+                #endregion Block Construction
+            }
 
-                    packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
-                    packet.RegionData.TimeDilation = timeDilation;
-                    packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count];
+            #region Packet Sending
+    
+            const float TIME_DILATION = 1.0f;
+            ushort timeDilation = Utils.FloatToUInt16(avgTimeDilation, 0.0f, 1.0f);
+    
+            if (terseAgentUpdateBlocks.IsValueCreated)
+            {
+                List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseAgentUpdateBlocks.Value;
 
-                    for (int i = 0; i < blocks.Count; i++)
-                        packet.ObjectData[i] = blocks[i];
-                    // If any of the packets created from this call go unacknowledged, all of the updates will be resent
-                    OutPacket(packet, ThrottleOutPacketType.Unknown, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseAgentUpdates.Value, oPacket); });
-                }
+                ImprovedTerseObjectUpdatePacket packet
+                    = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate);
+                packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
+                packet.RegionData.TimeDilation = timeDilation;
+                packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count];
 
-                if (objectUpdateBlocks.IsValueCreated)
-                {
-                    List<ObjectUpdatePacket.ObjectDataBlock> blocks = objectUpdateBlocks.Value;
-        
-                    ObjectUpdatePacket packet = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate);
-                    packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
-                    packet.RegionData.TimeDilation = timeDilation;
-                    packet.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[blocks.Count];
-        
-                    for (int i = 0; i < blocks.Count; i++)
-                        packet.ObjectData[i] = blocks[i];
-                    // If any of the packets created from this call go unacknowledged, all of the updates will be resent
-                    OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(objectUpdates.Value, oPacket); });
-                }
-        
-                if (compressedUpdateBlocks.IsValueCreated)
-                {
-                    List<ObjectUpdateCompressedPacket.ObjectDataBlock> blocks = compressedUpdateBlocks.Value;
-        
-                    ObjectUpdateCompressedPacket packet = (ObjectUpdateCompressedPacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdateCompressed);
-                    packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
-                    packet.RegionData.TimeDilation = timeDilation;
-                    packet.ObjectData = new ObjectUpdateCompressedPacket.ObjectDataBlock[blocks.Count];
-        
-                    for (int i = 0; i < blocks.Count; i++)
-                        packet.ObjectData[i] = blocks[i];
-                    // If any of the packets created from this call go unacknowledged, all of the updates will be resent
-                    OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(compressedUpdates.Value, oPacket); });
-                }
+                for (int i = 0; i < blocks.Count; i++)
+                    packet.ObjectData[i] = blocks[i];
 
-                if (terseUpdateBlocks.IsValueCreated)
-                {
-                    List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseUpdateBlocks.Value;
-        
-                    ImprovedTerseObjectUpdatePacket packet
-                        = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(
-                            PacketType.ImprovedTerseObjectUpdate);
+                OutPacket(packet, ThrottleOutPacketType.Unknown, true);
+            }
 
-                    packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
-                    packet.RegionData.TimeDilation = timeDilation;
-                    packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count];
-        
-                    for (int i = 0; i < blocks.Count; i++)
-                        packet.ObjectData[i] = blocks[i];
-                    // If any of the packets created from this call go unacknowledged, all of the updates will be resent
-                    OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseUpdates.Value, oPacket); });
-                }
+            if (objectUpdateBlocks.IsValueCreated)
+            {
+                List<ObjectUpdatePacket.ObjectDataBlock> blocks = objectUpdateBlocks.Value;
+    
+                ObjectUpdatePacket packet = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate);
+                packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
+                packet.RegionData.TimeDilation = timeDilation;
+                packet.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[blocks.Count];
+    
+                for (int i = 0; i < blocks.Count; i++)
+                    packet.ObjectData[i] = blocks[i];
+    
+                OutPacket(packet, ThrottleOutPacketType.Task, true);
+            }
+    
+            if (compressedUpdateBlocks.IsValueCreated)
+            {
+                List<ObjectUpdateCompressedPacket.ObjectDataBlock> blocks = compressedUpdateBlocks.Value;
+    
+                ObjectUpdateCompressedPacket packet = (ObjectUpdateCompressedPacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdateCompressed);
+                packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
+                packet.RegionData.TimeDilation = timeDilation;
+                packet.ObjectData = new ObjectUpdateCompressedPacket.ObjectDataBlock[blocks.Count];
+
+                for (int i = 0; i < blocks.Count; i++)
+                    packet.ObjectData[i] = blocks[i];
+    
+                OutPacket(packet, ThrottleOutPacketType.Task, true);
+            }
+    
+            if (terseUpdateBlocks.IsValueCreated)
+            {
+                List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> blocks = terseUpdateBlocks.Value;
+    
+                ImprovedTerseObjectUpdatePacket packet
+                    = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(
+                        PacketType.ImprovedTerseObjectUpdate);
+                packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
+                packet.RegionData.TimeDilation = timeDilation;
+                packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[blocks.Count];
+    
+                for (int i = 0; i < blocks.Count; i++)
+                    packet.ObjectData[i] = blocks[i];
+    
+                OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseUpdates.Value, oPacket); });
             }
 
             #endregion Packet Sending
@@ -4313,11 +4337,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 // Pass in the delegate so that if this packet needs to be resent, we send the current properties
                 // of the object rather than the properties when the packet was created
-                OutPacket(packet, ThrottleOutPacketType.Task, true,
-                          delegate(OutgoingPacket oPacket)
-                          {
-                              ResendPropertyUpdates(updates, oPacket);
-                          });
+                // HACK : Remove intelligent resending until it's fixed in core
+                //OutPacket(packet, ThrottleOutPacketType.Task, true,
+                //          delegate(OutgoingPacket oPacket)
+                //          {
+                //              ResendPropertyUpdates(updates, oPacket);
+                //          });
+                OutPacket(packet, ThrottleOutPacketType.Task, true);
 
                 // pbcnt += blocks.Count;
                 // ppcnt++;
@@ -4343,11 +4369,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     // of the object rather than the properties when the packet was created
                     List<ObjectPropertyUpdate> updates = new List<ObjectPropertyUpdate>();
                     updates.Add(familyUpdates.Value[i]);
-                    OutPacket(packet, ThrottleOutPacketType.Task, true,
-                              delegate(OutgoingPacket oPacket)
-                              {
-                                  ResendPropertyUpdates(updates, oPacket);
-                              });
+                    // HACK : Remove intelligent resending until it's fixed in core
+                    //OutPacket(packet, ThrottleOutPacketType.Task, true,
+                    //          delegate(OutgoingPacket oPacket)
+                    //          {
+                    //              ResendPropertyUpdates(updates, oPacket);
+                    //          });
+                    OutPacket(packet, ThrottleOutPacketType.Task, true);
 
                     // fpcnt++;
                     // fbcnt++;
@@ -4719,7 +4747,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             
             if (landData.SimwideArea > 0)
             {
-                int simulatorCapacity = (int)(((float)landData.SimwideArea / 65536.0f) * (float)m_scene.RegionInfo.ObjectCapacity * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus);
+                int simulatorCapacity = (int)((long)landData.SimwideArea * (long)m_scene.RegionInfo.ObjectCapacity * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus / 65536L);
+                // Never report more than sim total capacity
+                if (simulatorCapacity > m_scene.RegionInfo.ObjectCapacity)
+                    simulatorCapacity = m_scene.RegionInfo.ObjectCapacity;
                 updateMessage.SimWideMaxPrims = simulatorCapacity;
             }
             else
@@ -4848,14 +4879,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             if (notifyCount > 0)
             {
-                if (notifyCount > 32)
-                {
-                    m_log.InfoFormat(
-                        "[LAND]: More than {0} avatars own prims on this parcel.  Only sending back details of first {0}"
-                        + " - a developer might want to investigate whether this is a hard limit", 32);
-
-                    notifyCount = 32;
-                }
+//                if (notifyCount > 32)
+//                {
+//                    m_log.InfoFormat(
+//                        "[LAND]: More than {0} avatars own prims on this parcel.  Only sending back details of first {0}"
+//                        + " - a developer might want to investigate whether this is a hard limit", 32);
+//
+//                    notifyCount = 32;
+//                }
 
                 ParcelObjectOwnersReplyPacket.DataBlock[] dataBlock
                     = new ParcelObjectOwnersReplyPacket.DataBlock[notifyCount];
@@ -4910,9 +4941,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 ScenePresence presence = (ScenePresence)entity;
 
+                position = presence.OffsetPosition;
+                rotation = presence.Rotation;
+
+                if (presence.ParentID != 0)
+                {
+                    SceneObjectPart part = m_scene.GetSceneObjectPart(presence.ParentID);
+                    if (part != null && part != part.ParentGroup.RootPart)
+                    {
+                        position = part.OffsetPosition + presence.OffsetPosition * part.RotationOffset;
+                        rotation = part.RotationOffset * presence.Rotation;
+                    }
+                }
+
                 attachPoint = 0;
                 collisionPlane = presence.CollisionPlane;
-                position = presence.OffsetPosition;
                 velocity = presence.Velocity;
                 acceleration = Vector3.Zero;
 
@@ -5029,13 +5072,28 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         protected ObjectUpdatePacket.ObjectDataBlock CreateAvatarUpdateBlock(ScenePresence data)
         {
+            Vector3 offsetPosition = data.OffsetPosition;
+            Quaternion rotation = data.Rotation;
+            uint parentID = data.ParentID;
+
+            if (parentID != 0)
+            {
+                SceneObjectPart part = m_scene.GetSceneObjectPart(parentID);
+                if (part != null && part != part.ParentGroup.RootPart)
+                {
+                    offsetPosition = part.OffsetPosition + data.OffsetPosition * part.RotationOffset;
+                    rotation = part.RotationOffset * data.Rotation;
+                    parentID = part.ParentGroup.RootPart.LocalId;
+                }
+            }
+
             byte[] objectData = new byte[76];
 
             data.CollisionPlane.ToBytes(objectData, 0);
-            data.OffsetPosition.ToBytes(objectData, 16);
+            offsetPosition.ToBytes(objectData, 16);
 //            data.Velocity.ToBytes(objectData, 28);
 //            data.Acceleration.ToBytes(objectData, 40);
-            data.Rotation.ToBytes(objectData, 52);
+            rotation.ToBytes(objectData, 52);
             //data.AngularVelocity.ToBytes(objectData, 64);
 
             ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock();
@@ -5049,14 +5107,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " +
                 data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle);
             update.ObjectData = objectData;
-            update.ParentID = data.ParentID;
+            update.ParentID = parentID;
             update.PathCurve = 16;
             update.PathScaleX = 100;
             update.PathScaleY = 100;
             update.PCode = (byte)PCode.Avatar;
             update.ProfileCurve = 1;
             update.PSBlock = Utils.EmptyBytes;
-            update.Scale = new Vector3(0.45f, 0.6f, 1.9f);
+            update.Scale = data.Appearance.AvatarSize;
+//            update.Scale.Z -= 0.2f;
+
             update.Text = Utils.EmptyBytes;
             update.TextColor = new byte[4];
 
@@ -5067,10 +5127,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             update.TextureEntry = Utils.EmptyBytes;
 //            update.TextureEntry = (data.Appearance.Texture != null) ? data.Appearance.Texture.GetBytes() : Utils.EmptyBytes;
 
+/*  all this flags seem related to prims and not avatars. This allow for wrong viewer side move of a avatar in prim edition mode (anv mantis 854)
             update.UpdateFlags = (uint)(
                 PrimFlags.Physics | PrimFlags.ObjectModify | PrimFlags.ObjectCopy | PrimFlags.ObjectAnyOwner |
                 PrimFlags.ObjectYouOwner | PrimFlags.ObjectMove | PrimFlags.InventoryEmpty | PrimFlags.ObjectTransfer |
                 PrimFlags.ObjectOwnerModify);
+*/
+            update.UpdateFlags = 0;
 
             return update;
         }
@@ -5241,8 +5304,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // If AgentUpdate is ever handled asynchronously, then we will also need to construct a new AgentUpdateArgs
             // for each AgentUpdate packet.
             AddLocalPacketHandler(PacketType.AgentUpdate, HandleAgentUpdate, false);
-            
+
             AddLocalPacketHandler(PacketType.ViewerEffect, HandleViewerEffect, false);
+            AddLocalPacketHandler(PacketType.VelocityInterpolateOff, HandleVelocityInterpolateOff, false);
+            AddLocalPacketHandler(PacketType.VelocityInterpolateOn, HandleVelocityInterpolateOn, false);
             AddLocalPacketHandler(PacketType.AgentCachedTexture, HandleAgentTextureCached, false);
             AddLocalPacketHandler(PacketType.MultipleObjectUpdate, HandleMultipleObjUpdate, false);
             AddLocalPacketHandler(PacketType.MoneyTransferRequest, HandleMoneyTransferRequest, false);
@@ -5394,6 +5459,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             AddLocalPacketHandler(PacketType.TransferAbort, HandleTransferAbort, false);
             AddLocalPacketHandler(PacketType.MuteListRequest, HandleMuteListRequest, false);
             AddLocalPacketHandler(PacketType.UseCircuitCode, HandleUseCircuitCode);
+            AddLocalPacketHandler(PacketType.CreateNewOutfitAttachments, HandleCreateNewOutfitAttachments);
             AddLocalPacketHandler(PacketType.AgentHeightWidth, HandleAgentHeightWidth, false);
             AddLocalPacketHandler(PacketType.InventoryDescendents, HandleInventoryDescendents);
             AddLocalPacketHandler(PacketType.DirPlacesQuery, HandleDirPlacesQuery);
@@ -5460,6 +5526,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             AddLocalPacketHandler(PacketType.GroupVoteHistoryRequest, HandleGroupVoteHistoryRequest);
             AddLocalPacketHandler(PacketType.SimWideDeletes, HandleSimWideDeletes);
             AddLocalPacketHandler(PacketType.SendPostcard, HandleSendPostcard);
+            AddLocalPacketHandler(PacketType.ChangeInventoryItemFlags, HandleChangeInventoryItemFlags);
 
             AddGenericPacketHandler("autopilot", HandleAutopilot);
         }
@@ -5498,6 +5565,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         (x.CameraLeftAxis != m_lastAgentUpdateArgs.CameraLeftAxis) ||
                         (x.CameraUpAxis != m_lastAgentUpdateArgs.CameraUpAxis) ||
                         (x.ControlFlags != m_lastAgentUpdateArgs.ControlFlags) ||
+                        (x.ControlFlags != 0) ||
                         (x.Far != m_lastAgentUpdateArgs.Far) ||
                         (x.Flags != m_lastAgentUpdateArgs.Flags) ||
                         (x.State != m_lastAgentUpdateArgs.State) ||
@@ -5757,6 +5825,29 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             return true;
         }
 
+        private bool HandleVelocityInterpolateOff(IClientAPI sender, Packet Pack)
+        {
+            VelocityInterpolateOffPacket p = (VelocityInterpolateOffPacket)Pack;
+            if (p.AgentData.SessionID != SessionId ||
+                p.AgentData.AgentID != AgentId)
+                return true;
+
+            m_VelocityInterpolate = false;
+            return true;
+        }
+
+        private bool HandleVelocityInterpolateOn(IClientAPI sender, Packet Pack)
+        {
+            VelocityInterpolateOnPacket p = (VelocityInterpolateOnPacket)Pack;
+            if (p.AgentData.SessionID != SessionId ||
+                p.AgentData.AgentID != AgentId)
+                return true;
+
+            m_VelocityInterpolate = true;
+            return true;
+        }
+
+
         private bool HandleAvatarPropertiesRequest(IClientAPI sender, Packet Pack)
         {
             AvatarPropertiesRequestPacket avatarProperties = (AvatarPropertiesRequestPacket)Pack;
@@ -6177,17 +6268,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // Temporarily protect ourselves from the mantis #951 failure.
                 // However, we could do this for several other handlers where a failure isn't terminal
                 // for the client session anyway, in order to protect ourselves against bad code in plugins
+                Vector3 avSize = appear.AgentData.Size;
                 try
                 {
                     byte[] visualparams = new byte[appear.VisualParam.Length];
                     for (int i = 0; i < appear.VisualParam.Length; i++)
                         visualparams[i] = appear.VisualParam[i].ParamValue;
-
+                    //var b = appear.WearableData[0]; 
+                    
                     Primitive.TextureEntry te = null;
                     if (appear.ObjectData.TextureEntry.Length > 1)
                         te = new Primitive.TextureEntry(appear.ObjectData.TextureEntry, 0, appear.ObjectData.TextureEntry.Length);
+                    
+                    WearableCacheItem[] cacheitems = new WearableCacheItem[appear.WearableData.Length];
+                    for (int i=0; i<appear.WearableData.Length;i++)
+                        cacheitems[i] = new WearableCacheItem(){CacheId = appear.WearableData[i].CacheID,TextureIndex=Convert.ToUInt32(appear.WearableData[i].TextureIndex)};
 
-                    handlerSetAppearance(sender, te, visualparams);
+                    
+
+                    handlerSetAppearance(sender, te, visualparams,avSize, cacheitems);
                 }
                 catch (Exception e)
                 {
@@ -6396,6 +6495,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 handlerCompleteMovementToRegion(sender, true);
             }
+            else
+                m_log.Debug("HandleCompleteAgentMovement NULL handler");
+
             handlerCompleteMovementToRegion = null;
 
             return true;
@@ -6413,7 +6515,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     return true;
             }
             #endregion
-
+/*
             StartAnim handlerStartAnim = null;
             StopAnim handlerStopAnim = null;
 
@@ -6437,6 +6539,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 }
             }
             return true;
+*/
+            ChangeAnim handlerChangeAnim = null;
+
+            for (int i = 0; i < AgentAni.AnimationList.Length; i++)
+            {
+                handlerChangeAnim = OnChangeAnim;
+                if (handlerChangeAnim != null)
+                {
+                    handlerChangeAnim(AgentAni.AnimationList[i].AnimID, AgentAni.AnimationList[i].StartAnim, false);
+                }
+            }
+
+            handlerChangeAnim = OnChangeAnim;
+            if (handlerChangeAnim != null)
+            {
+                handlerChangeAnim(UUID.Zero, false, true);
+            }
+
+            return true;
         }
 
         private bool HandleAgentRequestSit(IClientAPI sender, Packet Pack)
@@ -6662,6 +6783,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             #endregion
 
             m_udpClient.SetThrottles(atpack.Throttle.Throttles);
+            GenericCall2 handler = OnUpdateThrottles;
+            if (handler != null)
+            {
+                handler();
+            }
             return true;
         }
 
@@ -7086,7 +7212,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     physdata.Bounce = phsblock.Restitution;
                     physdata.Density = phsblock.Density;
                     physdata.Friction = phsblock.Friction;
-                    physdata.GravitationModifier = phsblock.GravityMultiplier;   
+                    physdata.GravitationModifier = phsblock.GravityMultiplier;                   
                 }
 
                 handlerUpdatePrimFlags(flags.AgentData.ObjectLocalID, UsePhysics, IsTemporary, IsPhantom, physdata, this);
@@ -7672,6 +7798,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // surrounding scene
                 if ((ImageType)block.Type == ImageType.Baked)
                     args.Priority *= 2.0f;
+                int wearableout = 0;
 
                 ImageManager.EnqueueReq(args);
             }
@@ -8690,16 +8817,61 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         #region Parcel related packets
 
+        // acumulate several HandleRegionHandleRequest consecutive overlaping requests
+        // to be done with minimal resources as possible
+        // variables temporary here while in test
+
+        Queue<UUID> RegionHandleRequests = new Queue<UUID>();
+        bool RegionHandleRequestsInService = false;
+
         private bool HandleRegionHandleRequest(IClientAPI sender, Packet Pack)
         {
-            RegionHandleRequestPacket rhrPack = (RegionHandleRequestPacket)Pack;
+            UUID currentUUID;
 
             RegionHandleRequest handlerRegionHandleRequest = OnRegionHandleRequest;
-            if (handlerRegionHandleRequest != null)
+
+            if (handlerRegionHandleRequest == null)
+                return true;
+
+            RegionHandleRequestPacket rhrPack = (RegionHandleRequestPacket)Pack;
+
+            lock (RegionHandleRequests)
             {
-                handlerRegionHandleRequest(this, rhrPack.RequestBlock.RegionID);
+                if (RegionHandleRequestsInService)
+                {
+                    // we are already busy doing a previus request
+                    // so enqueue it
+                    RegionHandleRequests.Enqueue(rhrPack.RequestBlock.RegionID);
+                    return true;
+                }
+
+                // else do it
+                currentUUID = rhrPack.RequestBlock.RegionID;
+                RegionHandleRequestsInService = true;
             }
-            return true;
+
+            while (true)
+            {
+                handlerRegionHandleRequest(this, currentUUID);
+
+                lock (RegionHandleRequests)
+                {
+                    // exit condition, nothing to do or closed
+                    // current code seems to assume we may loose the handler at anytime,
+                    // so keep checking it
+                    handlerRegionHandleRequest = OnRegionHandleRequest;
+
+                    if (RegionHandleRequests.Count == 0 || !IsActive || handlerRegionHandleRequest == null)
+                    {
+                        RegionHandleRequests.Clear();
+                        RegionHandleRequestsInService = false;
+                        return true;
+                    }
+                    currentUUID = RegionHandleRequests.Dequeue();
+                }
+            }
+
+            return true; // actually unreached
         }
 
         private bool HandleParcelInfoRequest(IClientAPI sender, Packet Pack)
@@ -9955,7 +10127,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 handlerUpdateMuteListEntry(this, UpdateMuteListEntry.MuteData.MuteID,
                                            Utils.BytesToString(UpdateMuteListEntry.MuteData.MuteName),
                                            UpdateMuteListEntry.MuteData.MuteType,
-                                           UpdateMuteListEntry.AgentData.AgentID);
+                                           UpdateMuteListEntry.MuteData.MuteFlags);
                 return true;
             }
             return false;
@@ -9970,8 +10142,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 handlerRemoveMuteListEntry(this,
                                            RemoveMuteListEntry.MuteData.MuteID,
-                                           Utils.BytesToString(RemoveMuteListEntry.MuteData.MuteName),
-                                           RemoveMuteListEntry.AgentData.AgentID);
+                                           Utils.BytesToString(RemoveMuteListEntry.MuteData.MuteName));
                 return true;
             }
             return false;
@@ -10015,10 +10186,55 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             return false;
         }
 
+        private bool HandleChangeInventoryItemFlags(IClientAPI client, Packet packet)
+        {
+            ChangeInventoryItemFlagsPacket ChangeInventoryItemFlags =
+                (ChangeInventoryItemFlagsPacket)packet;
+            ChangeInventoryItemFlags handlerChangeInventoryItemFlags = OnChangeInventoryItemFlags;
+            if (handlerChangeInventoryItemFlags != null)
+            {
+                foreach(ChangeInventoryItemFlagsPacket.InventoryDataBlock b in ChangeInventoryItemFlags.InventoryData)
+                    handlerChangeInventoryItemFlags(this, b.ItemID, b.Flags);
+                return true;
+            }
+            return false;
+        }
+
         private bool HandleUseCircuitCode(IClientAPI sender, Packet Pack)
         {
             return true;
         }
+        
+        private bool HandleCreateNewOutfitAttachments(IClientAPI sender, Packet Pack)
+        {
+            CreateNewOutfitAttachmentsPacket packet = (CreateNewOutfitAttachmentsPacket)Pack;
+
+            #region Packet Session and User Check
+            if (m_checkPackets)
+            {
+                if (packet.AgentData.SessionID != SessionId ||
+                    packet.AgentData.AgentID != AgentId)
+                    return true;
+            }
+            #endregion
+            MoveItemsAndLeaveCopy handlerMoveItemsAndLeaveCopy = null;
+            List<InventoryItemBase> items = new List<InventoryItemBase>();
+            foreach (CreateNewOutfitAttachmentsPacket.ObjectDataBlock n in packet.ObjectData)
+            {
+                InventoryItemBase b = new InventoryItemBase();
+                b.ID = n.OldItemID;
+                b.Folder = n.OldFolderID;
+                items.Add(b);
+            }
+
+            handlerMoveItemsAndLeaveCopy = OnMoveItemsAndLeaveCopy;
+            if (handlerMoveItemsAndLeaveCopy != null)
+            {
+                handlerMoveItemsAndLeaveCopy(this, items, packet.HeaderData.NewFolderID);
+            }
+
+            return true;
+        }
 
         private bool HandleAgentHeightWidth(IClientAPI sender, Packet Pack)
         {
@@ -10445,6 +10661,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 groupProfileReply.GroupData.MaturePublish = d.MaturePublish;
                 groupProfileReply.GroupData.OwnerRole = d.OwnerRole;
 
+                Scene scene = (Scene)m_scene;
+                if (scene.Permissions.IsGod(sender.AgentId) && (!sender.IsGroupMember(groupProfileRequest.GroupData.GroupID)))
+                {
+                    ScenePresence p;
+                    if (scene.TryGetScenePresence(sender.AgentId, out p))
+                    {
+                        if (p.GodLevel >= 200)
+                        {
+                            groupProfileReply.GroupData.OpenEnrollment = true;
+                            groupProfileReply.GroupData.MembershipFee = 0;
+                        }
+                    }
+                }
+
                 OutPacket(groupProfileReply, ThrottleOutPacketType.Task);
             }
             return true;
@@ -11018,11 +11248,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             StartLure handlerStartLure = OnStartLure;
             if (handlerStartLure != null)
-                handlerStartLure(startLureRequest.Info.LureType,
-                                 Utils.BytesToString(
-                                    startLureRequest.Info.Message),
-                                 startLureRequest.TargetData[0].TargetID,
-                                 this);
+            {
+                for (int i = 0 ; i < startLureRequest.TargetData.Length ; i++)
+                {
+                    handlerStartLure(startLureRequest.Info.LureType,
+                                     Utils.BytesToString(
+                                             startLureRequest.Info.Message),
+                                     startLureRequest.TargetData[i].TargetID,
+                                     this);
+                }
+            }
             return true;
         }
         private bool HandleTeleportLureRequest(IClientAPI sender, Packet Pack)
@@ -11136,10 +11371,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
             #endregion
 
-            ClassifiedDelete handlerClassifiedGodDelete = OnClassifiedGodDelete;
+            ClassifiedGodDelete handlerClassifiedGodDelete = OnClassifiedGodDelete;
             if (handlerClassifiedGodDelete != null)
                 handlerClassifiedGodDelete(
                          classifiedGodDelete.Data.ClassifiedID,
+                         classifiedGodDelete.Data.QueryID,
                          this);
             return true;
         }
@@ -11452,6 +11688,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             if (cachedtex.AgentData.SessionID != SessionId)
                 return false;
+            
 
             // TODO: don't create new blocks if recycling an old packet
             cachedresp.AgentData.AgentID = AgentId;
@@ -11461,14 +11698,140 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             cachedresp.WearableData =
                 new AgentCachedTextureResponsePacket.WearableDataBlock[cachedtex.WearableData.Length];
 
-            for (int i = 0; i < cachedtex.WearableData.Length; i++)
+            //IAvatarFactoryModule fac = m_scene.RequestModuleInterface<IAvatarFactoryModule>();
+           // var item = fac.GetBakedTextureFaces(AgentId);
+            //WearableCacheItem[] items = fac.GetCachedItems(AgentId);
+
+            IAssetService cache = m_scene.AssetService;
+            IBakedTextureModule bakedTextureModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
+            //bakedTextureModule = null;
+            int maxWearablesLoop = cachedtex.WearableData.Length;
+            if (maxWearablesLoop > AvatarWearable.MAX_WEARABLES)
+                maxWearablesLoop = AvatarWearable.MAX_WEARABLES;
+
+            if (bakedTextureModule != null && cache != null)
             {
-                cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
-                cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
-                cachedresp.WearableData[i].TextureID = UUID.Zero;
-                cachedresp.WearableData[i].HostName = new byte[0];
+                // We need to make sure the asset stored in the bake is available on this server also by it's assetid before we map it to a Cacheid
+
+                WearableCacheItem[] cacheItems = null;
+                ScenePresence p = m_scene.GetScenePresence(AgentId);
+                if (p.Appearance != null)
+                    if (p.Appearance.WearableCacheItems == null || p.Appearance.WearableCacheItemsDirty)
+                    {
+                        try
+                        {
+                            cacheItems = bakedTextureModule.Get(AgentId);
+                            p.Appearance.WearableCacheItems = cacheItems;
+                            p.Appearance.WearableCacheItemsDirty = false;
+                        }
+
+                        /*
+                         * The following Catch types DO NOT WORK, it jumps to the General Packet Exception Handler if you don't catch Exception!
+                         * 
+                        catch (System.Net.Sockets.SocketException)
+                        {
+                            cacheItems = null;
+                        }
+                        catch (WebException)
+                        {
+                            cacheItems = null;
+                        }
+                        catch (InvalidOperationException)
+                        {
+                            cacheItems = null;
+                        } */
+                        catch (Exception)
+                        {
+                            cacheItems = null;
+                        }
+                        
+                    }
+                    else if (p.Appearance.WearableCacheItems != null)
+                    {
+                        cacheItems = p.Appearance.WearableCacheItems;
+                    }
+
+                if (cache != null && cacheItems != null)
+                {
+                    foreach (WearableCacheItem item in cacheItems)
+                    {
+                       
+                        if (cache.GetCached(item.TextureID.ToString()) == null)
+                        {
+                            item.TextureAsset.Temporary = true;
+                            cache.Store(item.TextureAsset);
+                        }
+
+
+                    }
+                }
+               
+                if (cacheItems != null)
+                {
+                   
+                    for (int i = 0; i < maxWearablesLoop; i++)
+                    {
+                        WearableCacheItem item =
+                            WearableCacheItem.SearchTextureIndex(cachedtex.WearableData[i].TextureIndex,cacheItems);
+
+                        cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
+                        cachedresp.WearableData[i].TextureIndex= cachedtex.WearableData[i].TextureIndex;
+                        cachedresp.WearableData[i].HostName = new byte[0];
+                        if (item != null && cachedtex.WearableData[i].ID == item.CacheId)
+                        {
+                            
+                            cachedresp.WearableData[i].TextureID = item.TextureID;
+                        }
+                        else
+                        {
+                            cachedresp.WearableData[i].TextureID = UUID.Zero;
+                        }
+                    }
+                }
+                else
+                {
+                    for (int i = 0; i < maxWearablesLoop; i++)
+                    {
+                        cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
+                        cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
+                        cachedresp.WearableData[i].TextureID = UUID.Zero;
+                        //UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
+                        cachedresp.WearableData[i].HostName = new byte[0];
+                    }
+                }
             }
+            else
+            {
+                if (cache == null)
+                {
+                    for (int i = 0; i < maxWearablesLoop; i++)
+                    {
+                        cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
+                        cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
+                        cachedresp.WearableData[i].TextureID = UUID.Zero;
+                            //UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
+                        cachedresp.WearableData[i].HostName = new byte[0];
+                    }
+                }
+                else
+                {
+                    for (int i = 0; i < maxWearablesLoop; i++)
+                    {
+                        cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
+                        cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
+
 
+
+                        if (cache.GetCached(cachedresp.WearableData[i].TextureID.ToString()) == null)
+                            cachedresp.WearableData[i].TextureID = UUID.Zero;
+                            //UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
+                        else
+                            cachedresp.WearableData[i].TextureID = UUID.Zero;
+                                // UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
+                        cachedresp.WearableData[i].HostName = new byte[0];
+                    }
+                }
+            }
             cachedresp.Header.Zerocoded = true;
             OutPacket(cachedresp, ThrottleOutPacketType.Task);
 
@@ -11505,209 +11868,147 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     }
                     else
                     {
-//                        m_log.DebugFormat(
-//                            "[CLIENT]: Processing block {0} type {1} for {2} {3}",
-//                            i, block.Type, part.Name, part.LocalId);
+                        ClientChangeObject updatehandler = onClientChangeObject;
 
-//                        // Do this once since fetch parts creates a new array.
-//                        SceneObjectPart[] parts = part.ParentGroup.Parts;
-//                        for (int j = 0; j < parts.Length; j++)
-//                        {
-//                            part.StoreUndoState();
-//                            parts[j].IgnoreUndoUpdate = true;
-//                        }
+                        if (updatehandler != null)
+                        {
+                            ObjectChangeData udata = new ObjectChangeData();
 
-                        UpdatePrimGroupRotation handlerUpdatePrimGroupRotation;
+                            /*ubit from ll JIRA:
+                             * 0x01 position
+                             * 0x02 rotation
+                             * 0x04 scale
+  
+                             * 0x08 LINK_SET
+                             * 0x10 UNIFORM for scale
+                             */
 
-                        switch (block.Type)
-                        {
-                            case 1:
-                                Vector3 pos1 = new Vector3(block.Data, 0);
+                            // translate to internal changes
+                            // not all cases .. just the ones older code did
 
-                                UpdateVector handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
-                                if (handlerUpdatePrimSinglePosition != null)
-                                {
-                                    // m_log.Debug("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
-                                    handlerUpdatePrimSinglePosition(localId, pos1, this);
-                                }
-                                break;
+                            switch (block.Type)
+                            {
+                                case 1: //change position sp
+                                    udata.position = new Vector3(block.Data, 0);
 
-                            case 2:
-                                Quaternion rot1 = new Quaternion(block.Data, 0, true);
+                                    udata.change = ObjectChangeType.primP;
+                                    updatehandler(localId, udata, this);
+                                    break;
 
-                                UpdatePrimSingleRotation handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation;
-                                if (handlerUpdatePrimSingleRotation != null)
-                                {
-                                    // m_log.Info("new tab rotation is " + rot1.X + " , " + rot1.Y + " , " + rot1.Z + " , " + rot1.W);
-                                    handlerUpdatePrimSingleRotation(localId, rot1, this);
-                                }
-                                break;
+                                case 2: // rotation sp
+                                    udata.rotation = new Quaternion(block.Data, 0, true);
 
-                            case 3:
-                                Vector3 rotPos = new Vector3(block.Data, 0);
-                                Quaternion rot2 = new Quaternion(block.Data, 12, true);
+                                    udata.change = ObjectChangeType.primR;
+                                    updatehandler(localId, udata, this);
+                                    break;
 
-                                UpdatePrimSingleRotationPosition handlerUpdatePrimSingleRotationPosition = OnUpdatePrimSingleRotationPosition;
-                                if (handlerUpdatePrimSingleRotationPosition != null)
-                                {
-                                    // m_log.Debug("new mouse rotation position is " + rotPos.X + " , " + rotPos.Y + " , " + rotPos.Z);
-                                    // m_log.Info("new mouse rotation is " + rot2.X + " , " + rot2.Y + " , " + rot2.Z + " , " + rot2.W);
-                                    handlerUpdatePrimSingleRotationPosition(localId, rot2, rotPos, this);
-                                }
-                                break;
+                                case 3: // position plus rotation
+                                    udata.position = new Vector3(block.Data, 0);
+                                    udata.rotation = new Quaternion(block.Data, 12, true);
 
-                            case 4:
-                            case 20:
-                                Vector3 scale4 = new Vector3(block.Data, 0);
+                                    udata.change = ObjectChangeType.primPR;
+                                    updatehandler(localId, udata, this);
+                                    break;
 
-                                UpdateVector handlerUpdatePrimScale = OnUpdatePrimScale;
-                                if (handlerUpdatePrimScale != null)
-                                {
-                                    //                                     m_log.Debug("new scale is " + scale4.X + " , " + scale4.Y + " , " + scale4.Z);
-                                    handlerUpdatePrimScale(localId, scale4, this);
-                                }
-                                break;
+                                case 4: // scale sp
+                                    udata.scale = new Vector3(block.Data, 0);
+                                    udata.change = ObjectChangeType.primS;
 
-                            case 5:
-                                Vector3 scale1 = new Vector3(block.Data, 12);
-                                Vector3 pos11 = new Vector3(block.Data, 0);
+                                    updatehandler(localId, udata, this);
+                                    break;
 
-                                handlerUpdatePrimScale = OnUpdatePrimScale;
-                                if (handlerUpdatePrimScale != null)
-                                {
-                                    // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
-                                    handlerUpdatePrimScale(localId, scale1, this);
+                                case 0x14: // uniform scale sp 
+                                    udata.scale = new Vector3(block.Data, 0);
 
-                                    handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
-                                    if (handlerUpdatePrimSinglePosition != null)
-                                    {
-                                        handlerUpdatePrimSinglePosition(localId, pos11, this);
-                                    }
-                                }
-                                break;
+                                    udata.change = ObjectChangeType.primUS;
+                                    updatehandler(localId, udata, this);
+                                    break;
 
-                            case 9:
-                                Vector3 pos2 = new Vector3(block.Data, 0);
+                                case 5: // scale and position sp
+                                    udata.position = new Vector3(block.Data, 0);
+                                    udata.scale = new Vector3(block.Data, 12);
 
-                                UpdateVector handlerUpdateVector = OnUpdatePrimGroupPosition;
+                                    udata.change = ObjectChangeType.primPS;
+                                    updatehandler(localId, udata, this);
+                                    break;
 
-                                if (handlerUpdateVector != null)
-                                {
-                                    handlerUpdateVector(localId, pos2, this);
-                                }
-                                break;
+                                case 0x15: //uniform scale and position
+                                    udata.position = new Vector3(block.Data, 0);
+                                    udata.scale = new Vector3(block.Data, 12);
 
-                            case 10:
-                                Quaternion rot3 = new Quaternion(block.Data, 0, true);
+                                    udata.change = ObjectChangeType.primPUS;
+                                    updatehandler(localId, udata, this);
+                                    break;
 
-                                UpdatePrimRotation handlerUpdatePrimRotation = OnUpdatePrimGroupRotation;
-                                if (handlerUpdatePrimRotation != null)
-                                {
-                                    //  Console.WriteLine("new rotation is " + rot3.X + " , " + rot3.Y + " , " + rot3.Z + " , " + rot3.W);
-                                    handlerUpdatePrimRotation(localId, rot3, this);
-                                }
-                                break;
+                                // now group related (bit 4)
+                                case 9: //( 8 + 1 )group position
+                                    udata.position = new Vector3(block.Data, 0);
 
-                            case 11:
-                                Vector3 pos3 = new Vector3(block.Data, 0);
-                                Quaternion rot4 = new Quaternion(block.Data, 12, true);
+                                    udata.change = ObjectChangeType.groupP;
+                                    updatehandler(localId, udata, this);
+                                    break;
 
-                                handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation;
-                                if (handlerUpdatePrimGroupRotation != null)
-                                {
-                                    //  m_log.Debug("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
-                                    // m_log.Debug("new group mouse rotation is " + rot4.X + " , " + rot4.Y + " , " + rot4.Z + " , " + rot4.W);
-                                    handlerUpdatePrimGroupRotation(localId, pos3, rot4, this);
-                                }
-                                break;
-                            case 12:
-                            case 28:
-                                Vector3 scale7 = new Vector3(block.Data, 0);
+                                case 0x0A: // (8 + 2) group rotation
+                                    udata.rotation = new Quaternion(block.Data, 0, true);
 
-                                UpdateVector handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale;
-                                if (handlerUpdatePrimGroupScale != null)
-                                {
-                                    //                                     m_log.Debug("new scale is " + scale7.X + " , " + scale7.Y + " , " + scale7.Z);
-                                    handlerUpdatePrimGroupScale(localId, scale7, this);
-                                }
-                                break;
+                                    udata.change = ObjectChangeType.groupR;
+                                    updatehandler(localId, udata, this);
+                                    break;
 
-                            case 13:
-                                Vector3 scale2 = new Vector3(block.Data, 12);
-                                Vector3 pos4 = new Vector3(block.Data, 0);
+                                case 0x0B: //( 8 + 2 + 1) group rotation and position
+                                    udata.position = new Vector3(block.Data, 0);
+                                    udata.rotation = new Quaternion(block.Data, 12, true);
 
-                                handlerUpdatePrimScale = OnUpdatePrimScale;
-                                if (handlerUpdatePrimScale != null)
-                                {
-                                    //m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
-                                    handlerUpdatePrimScale(localId, scale2, this);
+                                    udata.change = ObjectChangeType.groupPR;
+                                    updatehandler(localId, udata, this);
+                                    break;
 
-                                    // Change the position based on scale (for bug number 246)
-                                    handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
-                                    // m_log.Debug("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
-                                    if (handlerUpdatePrimSinglePosition != null)
-                                    {
-                                        handlerUpdatePrimSinglePosition(localId, pos4, this);
-                                    }
-                                }
-                                break;
+                                case 0x0C: // (8 + 4) group scale
+                                    // only afects root prim and only sent by viewer editor object tab scaling
+                                    // mouse edition only allows uniform scaling
+                                    // SL MAY CHANGE THIS in viewers
 
-                            case 29:
-                                Vector3 scale5 = new Vector3(block.Data, 12);
-                                Vector3 pos5 = new Vector3(block.Data, 0);
+                                    udata.scale = new Vector3(block.Data, 0);
 
-                                handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale;
-                                if (handlerUpdatePrimGroupScale != null)
-                                {
-                                    // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
-                                    part.StoreUndoState(true);
-                                    part.IgnoreUndoUpdate = true;
-                                    handlerUpdatePrimGroupScale(localId, scale5, this);
-                                    handlerUpdateVector = OnUpdatePrimGroupPosition;
+                                    udata.change = ObjectChangeType.groupS;
+                                    updatehandler(localId, udata, this);
 
-                                    if (handlerUpdateVector != null)
-                                    {
-                                        handlerUpdateVector(localId, pos5, this);
-                                    }
+                                    break;
 
-                                    part.IgnoreUndoUpdate = false;
-                                }
+                                case 0x0D: //(8 + 4 + 1) group scale and position
+                                    // exception as above
 
-                                break;
+                                    udata.position = new Vector3(block.Data, 0);
+                                    udata.scale = new Vector3(block.Data, 12);
 
-                            case 21:
-                                Vector3 scale6 = new Vector3(block.Data, 12);
-                                Vector3 pos6 = new Vector3(block.Data, 0);
+                                    udata.change = ObjectChangeType.groupPS;
+                                    updatehandler(localId, udata, this);
+                                    break;
 
-                                handlerUpdatePrimScale = OnUpdatePrimScale;
-                                if (handlerUpdatePrimScale != null)
-                                {
-                                    part.StoreUndoState(false);
-                                    part.IgnoreUndoUpdate = true;
+                                case 0x1C: // (0x10 + 8 + 4 ) group scale UNIFORM
+                                    udata.scale = new Vector3(block.Data, 0);
 
-                                    // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
-                                    handlerUpdatePrimScale(localId, scale6, this);
-                                    handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
-                                    if (handlerUpdatePrimSinglePosition != null)
-                                    {
-                                        handlerUpdatePrimSinglePosition(localId, pos6, this);
-                                    }
+                                    udata.change = ObjectChangeType.groupUS;
+                                    updatehandler(localId, udata, this);
+                                    break;
 
-                                    part.IgnoreUndoUpdate = false;
-                                }
-                                break;
+                                case 0x1D: // (UNIFORM + GROUP + SCALE + POS)
+                                    udata.position = new Vector3(block.Data, 0);
+                                    udata.scale = new Vector3(block.Data, 12);
 
-                            default:
-                                m_log.Debug("[CLIENT]: MultipleObjUpdate recieved an unknown packet type: " + (block.Type));
-                                break;
+                                    udata.change = ObjectChangeType.groupPUS;
+                                    updatehandler(localId, udata, this);
+                                    break;
+
+                                default:
+                                    m_log.Debug("[CLIENT]: MultipleObjUpdate recieved an unknown packet type: " + (block.Type));
+                                    break;
+                            }
                         }
 
-//                        for (int j = 0; j < parts.Length; j++)
-//                            parts[j].IgnoreUndoUpdate = false;
                     }
                 }
             }
-
             return true;
         }
 
@@ -11768,9 +12069,26 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public void SetChildAgentThrottle(byte[] throttles)
         {
             m_udpClient.SetThrottles(throttles);
+            GenericCall2 handler = OnUpdateThrottles;
+            if (handler != null)
+            {
+                handler();
+            }
         }
 
         /// <summary>
+        /// Sets the throttles from values supplied by the client
+        /// </summary>
+        /// <param name="throttles"></param>
+        public void SetAgentThrottleSilent(int throttle, int setting)
+        {
+            m_udpClient.ForceThrottleSetting(throttle,setting);
+            //m_udpClient.SetThrottles(throttles);
+            
+        }
+
+
+        /// <summary>
         /// Get the current throttles for this client as a packed byte array
         /// </summary>
         /// <param name="multiplier">Unused</param>
@@ -12157,7 +12475,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 //                "[LLCLIENTVIEW]: Received transfer request for {0} in {1} type {2} by {3}",
 //                requestID, taskID, (SourceType)sourceType, Name);
 
+
+            //Note, the bool returned from the below function is useless since it is always false.
             m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived);
+
         }
 
         /// <summary>
@@ -12223,7 +12544,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <returns></returns>
         private static int CalculateNumPackets(byte[] data)
         {
-            const uint m_maxPacketSize = 600;
+//            const uint m_maxPacketSize = 600;
+            uint m_maxPacketSize = MaxTransferBytesPerPacket;
             int numPackets = 1;
 
             if (data == null)
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index 621e0fd..e52ac37 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <summary>Packets we have sent that need to be ACKed by the client</summary>
         public readonly UnackedPacketCollection NeedAcks = new UnackedPacketCollection();
         /// <summary>ACKs that are queued up, waiting to be sent to the client</summary>
-        public readonly OpenSim.Framework.LocklessQueue<uint> PendingAcks = new OpenSim.Framework.LocklessQueue<uint>();
+        public readonly DoubleLocklessQueue<uint> PendingAcks = new DoubleLocklessQueue<uint>();
 
         /// <summary>Current packet sequence number</summary>
         public int CurrentSequence;
@@ -146,7 +146,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <summary>Throttle buckets for each packet category</summary>
         private readonly TokenBucket[] m_throttleCategories;
         /// <summary>Outgoing queues for throttled packets</summary>
-        private readonly OpenSim.Framework.LocklessQueue<OutgoingPacket>[] m_packetOutboxes = new OpenSim.Framework.LocklessQueue<OutgoingPacket>[THROTTLE_CATEGORY_COUNT];
+        private readonly DoubleLocklessQueue<OutgoingPacket>[] m_packetOutboxes = new DoubleLocklessQueue<OutgoingPacket>[THROTTLE_CATEGORY_COUNT];
         /// <summary>A container that can hold one packet for each outbox, used to store
         /// dequeued packets that are being held for throttling</summary>
         private readonly OutgoingPacket[] m_nextPackets = new OutgoingPacket[THROTTLE_CATEGORY_COUNT];
@@ -158,6 +158,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private int m_defaultRTO = 1000; // 1sec is the recommendation in the RFC
         private int m_maxRTO = 60000;
+        public bool m_deliverPackets = true;
 
         /// <summary>
         /// Default constructor
@@ -201,7 +202,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 ThrottleOutPacketType type = (ThrottleOutPacketType)i;
 
                 // Initialize the packet outboxes, where packets sit while they are waiting for tokens
-                m_packetOutboxes[i] = new OpenSim.Framework.LocklessQueue<OutgoingPacket>();
+                m_packetOutboxes[i] = new DoubleLocklessQueue<OutgoingPacket>();
                 // Initialize the token buckets that control the throttling for each category
                 m_throttleCategories[i] = new TokenBucket(m_throttleCategory, rates.GetRate(type));
             }
@@ -429,11 +430,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// </returns>
         public bool EnqueueOutgoing(OutgoingPacket packet, bool forceQueue)
         {
+            return EnqueueOutgoing(packet, forceQueue, false);
+        }
+
+        public bool EnqueueOutgoing(OutgoingPacket packet, bool forceQueue, bool highPriority)
+        {
             int category = (int)packet.Category;
 
             if (category >= 0 && category < m_packetOutboxes.Length)
             {
-                OpenSim.Framework.LocklessQueue<OutgoingPacket> queue = m_packetOutboxes[category];
+                DoubleLocklessQueue<OutgoingPacket> queue = m_packetOutboxes[category];
+
+                if (m_deliverPackets == false)
+                {
+                    queue.Enqueue(packet, highPriority);
+                    return true;
+                }
+
                 TokenBucket bucket = m_throttleCategories[category];
 
                 // Don't send this packet if there is already a packet waiting in the queue
@@ -441,7 +454,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // queued packets
                 if (queue.Count > 0)
                 {
-                    queue.Enqueue(packet);
+                    queue.Enqueue(packet, highPriority);
                     return true;
                 }
                 
@@ -454,7 +467,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 else
                 {
                     // Force queue specified or not enough tokens in the bucket, queue this packet
-                    queue.Enqueue(packet);
+                    queue.Enqueue(packet, highPriority);
                     return true;
                 }
             }
@@ -483,8 +496,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <returns>True if any packets were sent, otherwise false</returns>
         public bool DequeueOutgoing()
         {
-            OutgoingPacket packet;
-            OpenSim.Framework.LocklessQueue<OutgoingPacket> queue;
+            if (m_deliverPackets == false) return false;
+
+            OutgoingPacket packet = null;
+            DoubleLocklessQueue<OutgoingPacket> queue;
             TokenBucket bucket;
             bool packetSent = false;
             ThrottleOutPacketTypeFlags emptyCategories = 0;
@@ -515,32 +530,49 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     // No dequeued packet waiting to be sent, try to pull one off
                     // this queue
                     queue = m_packetOutboxes[i];
-                    if (queue.Dequeue(out packet))
+                    if (queue != null)
                     {
-                        // A packet was pulled off the queue. See if we have
-                        // enough tokens in the bucket to send it out
-                        if (bucket.RemoveTokens(packet.Buffer.DataLength))
+                        bool success = false;
+                        try
                         {
-                            // Send the packet
-                            m_udpServer.SendPacketFinal(packet);
-                            packetSent = true;
+                            success = queue.Dequeue(out packet);
                         }
-                        else
+                        catch
                         {
-                            // Save the dequeued packet for the next iteration
-                            m_nextPackets[i] = packet;
+                            m_packetOutboxes[i] = new DoubleLocklessQueue<OutgoingPacket>();
                         }
-
-                        // If the queue is empty after this dequeue, fire the queue
-                        // empty callback now so it has a chance to fill before we 
-                        // get back here
-                        if (queue.Count == 0)
+                        if (success)
+                        {
+                            // A packet was pulled off the queue. See if we have
+                            // enough tokens in the bucket to send it out
+                            if (bucket.RemoveTokens(packet.Buffer.DataLength))
+                            {
+                                // Send the packet
+                                m_udpServer.SendPacketFinal(packet);
+                                packetSent = true;
+                            }
+                            else
+                            {
+                                // Save the dequeued packet for the next iteration
+                                m_nextPackets[i] = packet;
+                            }
+
+                            // If the queue is empty after this dequeue, fire the queue
+                            // empty callback now so it has a chance to fill before we 
+                            // get back here
+                            if (queue.Count == 0)
+                                emptyCategories |= CategoryToFlag(i);
+                        }
+                        else
+                        {
+                            // No packets in this queue. Fire the queue empty callback
+                            // if it has not been called recently
                             emptyCategories |= CategoryToFlag(i);
+                        }
                     }
                     else
                     {
-                        // No packets in this queue. Fire the queue empty callback
-                        // if it has not been called recently
+                        m_packetOutboxes[i] = new DoubleLocklessQueue<OutgoingPacket>();
                         emptyCategories |= CategoryToFlag(i);
                     }
                 }
@@ -649,6 +681,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (m_nextOnQueueEmpty == 0)
                 m_nextOnQueueEmpty = 1;
         }
+        internal void ForceThrottleSetting(int throttle, int setting)
+        {
+            m_throttleCategories[throttle].RequestedDripRate = Math.Max(setting, LLUDPServer.MTU); ;
+        }
 
         /// <summary>
         /// Converts a <seealso cref="ThrottleOutPacketType"/> integer to a
@@ -693,4 +729,33 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
     }
+
+    public class DoubleLocklessQueue<T> : OpenSim.Framework.LocklessQueue<T>
+    {
+        OpenSim.Framework.LocklessQueue<T> highQueue = new OpenSim.Framework.LocklessQueue<T>();
+
+        public override int Count
+        {
+            get
+            {
+                return base.Count + highQueue.Count;
+            }
+        }
+
+        public override bool Dequeue(out T item)
+        {
+            if (highQueue.Dequeue(out item))
+                return true;
+
+            return base.Dequeue(out item);
+        }
+
+        public void Enqueue(T item, bool highPriority)
+        {
+            if (highPriority)
+                highQueue.Enqueue(item);
+            else
+                Enqueue(item);
+        }
+    }
 }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index a7628d2..d49f1f7 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -126,7 +126,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <summary>Handlers for incoming packets</summary>
         //PacketEventDictionary packetEvents = new PacketEventDictionary();
         /// <summary>Incoming packets that are awaiting handling</summary>
-        private OpenMetaverse.BlockingQueue<IncomingPacket> packetInbox = new OpenMetaverse.BlockingQueue<IncomingPacket>();
+        //private OpenMetaverse.BlockingQueue<IncomingPacket> packetInbox = new OpenMetaverse.BlockingQueue<IncomingPacket>();
+
+        private DoubleQueue<IncomingPacket> packetInbox = new DoubleQueue<IncomingPacket>();
 
         /// <summary></summary>
         //private UDPClientCollection m_clients = new UDPClientCollection();
@@ -181,6 +183,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <summary>Flag to signal when clients should send pings</summary>
         protected bool m_sendPing;
 
+        private ExpiringCache<IPEndPoint, Queue<UDPPacketBuffer>> m_pendingCache = new ExpiringCache<IPEndPoint, Queue<UDPPacketBuffer>>();
         private Pool<IncomingPacket> m_incomingPacketPool;
 
         /// <summary>
@@ -800,6 +803,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             #region Queue or Send
 
+            bool highPriority = false;
+
+            if (category != ThrottleOutPacketType.Unknown && (category & ThrottleOutPacketType.HighPriority) != 0)
+            {
+                category = (ThrottleOutPacketType)((int)category & 127);
+                highPriority = true;
+            }
+
             OutgoingPacket outgoingPacket = new OutgoingPacket(udpClient, buffer, category, null);
             // If we were not provided a method for handling unacked, use the UDPServer default method
             outgoingPacket.UnackedMethod = ((method == null) ? delegate(OutgoingPacket oPacket) { ResendUnacked(oPacket); } : method);
@@ -808,7 +819,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // continue to display the deleted object until relog.  Therefore, we need to always queue a kill object
             // packet so that it isn't sent before a queued update packet.
             bool requestQueue = type == PacketType.KillObject;
-            if (!outgoingPacket.Client.EnqueueOutgoing(outgoingPacket, requestQueue))
+            if (!outgoingPacket.Client.EnqueueOutgoing(outgoingPacket, requestQueue, highPriority))
                 SendPacketFinal(outgoingPacket);
 
             #endregion Queue or Send
@@ -1093,21 +1104,46 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             #region Packet to Client Mapping
 
-            // UseCircuitCode handling
-            if (packet.Type == PacketType.UseCircuitCode)
+            // If there is already a client for this endpoint, don't process UseCircuitCode
+            IClientAPI client = null;
+            if (!m_scene.TryGetClient(endPoint, out client) || !(client is LLClientView))
             {
-                // We need to copy the endpoint so that it doesn't get changed when another thread reuses the
-                // buffer.
-                object[] array = new object[] { new IPEndPoint(endPoint.Address, endPoint.Port), packet };
+                // UseCircuitCode handling
+                if (packet.Type == PacketType.UseCircuitCode)
+                {
+                    // And if there is a UseCircuitCode pending, also drop it
+                    lock (m_pendingCache)
+                    {
+                        if (m_pendingCache.Contains(endPoint))
+                            return;
 
-                Util.FireAndForget(HandleUseCircuitCode, array);
+                        m_pendingCache.AddOrUpdate(endPoint, new Queue<UDPPacketBuffer>(), 60);
+                    }
 
-                return;
+                    // We need to copy the endpoint so that it doesn't get changed when another thread reuses the
+                    // buffer.
+                    object[] array = new object[] { new IPEndPoint(endPoint.Address, endPoint.Port), packet };
+
+                    Util.FireAndForget(HandleUseCircuitCode, array);
+
+                    return;
+                }
+            }
+
+            // If this is a pending connection, enqueue, don't process yet
+            lock (m_pendingCache)
+            {
+                Queue<UDPPacketBuffer> queue;
+                if (m_pendingCache.TryGetValue(endPoint, out queue))
+                {
+                    //m_log.DebugFormat("[LLUDPSERVER]: Enqueued a {0} packet into the pending queue", packet.Type);
+                    queue.Enqueue(buffer);
+                    return;
+                }
             }
 
             // Determine which agent this packet came from
-            IClientAPI client;
-            if (!m_scene.TryGetClient(endPoint, out client) || !(client is LLClientView))
+            if (client == null || !(client is LLClientView))
             {
                 //m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName);
                 return;
@@ -1116,7 +1152,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             udpClient = ((LLClientView)client).UDPClient;
 
             if (!udpClient.IsConnected)
+            {
+//                m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet for a unConnected client in " + m_scene.RegionInfo.RegionName);
                 return;
+            }
 
             #endregion Packet to Client Mapping
 
@@ -1246,7 +1285,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 incomingPacket = new IncomingPacket((LLClientView)client, packet);
             }
 
-            packetInbox.Enqueue(incomingPacket);
+            if (incomingPacket.Packet.Type == PacketType.AgentUpdate ||
+                incomingPacket.Packet.Type == PacketType.ChatFromViewer)
+                packetInbox.EnqueueHigh(incomingPacket);
+            else
+                packetInbox.EnqueueLow(incomingPacket);
         }
 
         #region BinaryStats
@@ -1366,6 +1409,32 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     // We only want to send initial data to new clients, not ones which are being converted from child to root.
                     if (client != null)
                         client.SceneAgent.SendInitialDataToMe();
+
+                    // Now we know we can handle more data
+                    Thread.Sleep(200);
+
+                    // Obtain the queue and remove it from the cache
+                    Queue<UDPPacketBuffer> queue = null;
+
+                    lock (m_pendingCache)
+                    {
+                        if (!m_pendingCache.TryGetValue(endPoint, out queue))
+                        {
+                            m_log.DebugFormat("[LLUDPSERVER]: Client created but no pending queue present");
+                            return;
+                        }
+                        m_pendingCache.Remove(endPoint);
+                    }
+
+                    m_log.DebugFormat("[LLUDPSERVER]: Client created, processing pending queue, {0} entries", queue.Count);
+
+                    // Reinject queued packets
+                    while(queue.Count > 0)
+                    {
+                        UDPPacketBuffer buf = queue.Dequeue();
+                        PacketReceived(buf);
+                    }
+                    queue = null;
                 }
                 else
                 {
@@ -1373,6 +1442,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     m_log.WarnFormat(
                         "[LLUDPSERVER]: Ignoring connection request for {0} to {1} with unknown circuit code {2} from IP {3}",
                         uccp.CircuitCode.ID, m_scene.RegionInfo.RegionName, uccp.CircuitCode.Code, endPoint);
+                    lock (m_pendingCache)
+                        m_pendingCache.Remove(endPoint);
                 }
     
                 //            m_log.DebugFormat(
@@ -1491,7 +1562,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if (!client.SceneAgent.IsChildAgent)
                      client.Kick("Simulator logged you out due to connection timeout");
     
-                client.CloseWithoutChecks();
+                client.CloseWithoutChecks(true);
             }
         }
 
@@ -1503,6 +1574,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             while (IsRunningInbound)
             {
+                m_scene.ThreadAlive(1);
                 try
                 {
                     IncomingPacket incomingPacket = null;
@@ -1550,6 +1622,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             while (base.IsRunningOutbound)
             {
+                m_scene.ThreadAlive(2);
                 try
                 {
                     m_packetSent = false;
@@ -1780,8 +1853,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             Packet packet = incomingPacket.Packet;
             LLClientView client = incomingPacket.Client;
 
-            if (client.IsActive)
-            {
+//            if (client.IsActive)
+//            {
                 m_currentIncomingClient = client;
 
                 try
@@ -1808,13 +1881,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 {
                     m_currentIncomingClient = null;
                 }
-            }
-            else
-            {
-                m_log.DebugFormat(
-                    "[LLUDPSERVER]: Dropped incoming {0} for dead client {1} in {2}",
-                    packet.Type, client.Name, m_scene.RegionInfo.RegionName);
-            }
+//            }
+//            else
+//            {
+//                m_log.DebugFormat(
+//                    "[LLUDPSERVER]: Dropped incoming {0} for dead client {1} in {2}",
+//                    packet.Type, client.Name, m_scene.RegionInfo.RegionName);
+//            }
 
             IncomingPacketsProcessed++;
         }
@@ -1826,8 +1899,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (!client.IsLoggingOut)
             {
                 client.IsLoggingOut = true;
-                client.Close();
+                client.Close(false, false);
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
index f143c32..7035e38 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
@@ -114,10 +114,6 @@ namespace OpenMetaverse
                 const int SIO_UDP_CONNRESET = -1744830452;
 
                 IPEndPoint ipep = new IPEndPoint(m_localBindAddress, m_udpPort);
-                
-                m_log.DebugFormat(
-                    "[UDPBASE]: Binding UDP listener using internal IP address config {0}:{1}", 
-                    ipep.Address, ipep.Port);                
 
                 m_udpSocket = new Socket(
                     AddressFamily.InterNetwork,
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index 0271738..da1ff2e 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -143,7 +143,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
             }
         }
 
-        public void RequestCreateInventoryItem(IClientAPI remoteClient,
+        public bool RequestCreateInventoryItem(IClientAPI remoteClient,
                 UUID transactionID, UUID folderID, uint callbackID,
                 string description, string name, sbyte invType,
                sbyte type, byte wearableType, uint nextOwnerMask)
@@ -153,6 +153,8 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
             uploader.RequestCreateInventoryItem(
                 remoteClient, folderID, callbackID,
                 description, name, invType, type, wearableType, nextOwnerMask);
+
+            return true;
         }
 
         public void RequestUpdateTaskInventoryItem(IClientAPI remoteClient,
@@ -172,4 +174,4 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
             uploader.RequestUpdateInventoryItem(remoteClient, item);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
index b67c0df..f489262 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         /// <param name="type"></param>
         /// <param name="wearableType"></param>
         /// <param name="nextOwnerMask"></param>
-        public void HandleItemCreationFromTransaction(IClientAPI remoteClient,
+        public bool HandleItemCreationFromTransaction(IClientAPI remoteClient,
                 UUID transactionID, UUID folderID, uint callbackID,
                 string description, string name, sbyte invType,
                 sbyte type, byte wearableType, uint nextOwnerMask)
@@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
             AgentAssetTransactions transactions =
                     GetUserTransactions(remoteClient.AgentId);
 
-            transactions.RequestCreateInventoryItem(remoteClient, transactionID,
+            return transactions.RequestCreateInventoryItem(remoteClient, transactionID,
                     folderID, callbackID, description, name, invType, type,
                     wearableType, nextOwnerMask);
         }
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
index 11efe6d..43b8b44 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -28,6 +28,7 @@
 using System;
 using System.IO;
 using System.Reflection;
+using System.Collections.Generic;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -38,6 +39,13 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 {
     public class AssetXferUploader
     {
+        // Viewer's notion of the default texture
+        private List<UUID> defaultIDs = new List<UUID> {
+                new UUID("5748decc-f629-461c-9a36-a35a221fe21f"),
+                new UUID("7ca39b4c-bd19-4699-aff7-f93fd03d3e7b"),
+                new UUID("6522e74d-1660-4e7f-b601-6f48c1659a77"),
+                new UUID("c228d1cf-4b5d-4ba8-84f4-899a0796aa97")
+                };
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         /// <summary>
@@ -85,6 +93,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 
         private sbyte type = 0;
         private byte wearableType = 0;
+        private byte[] m_oldData = null;
         public ulong XferID;
         private Scene m_Scene;
 
@@ -127,18 +136,27 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 
             if (XferID == xferID)
             {
-                if (m_asset.Data.Length > 1)
+                lock (this)
                 {
-                    byte[] destinationArray = new byte[m_asset.Data.Length + data.Length];
-                    Array.Copy(m_asset.Data, 0, destinationArray, 0, m_asset.Data.Length);
-                    Array.Copy(data, 0, destinationArray, m_asset.Data.Length, data.Length);
-                    m_asset.Data = destinationArray;
-                }
-                else
-                {
-                    byte[] buffer2 = new byte[data.Length - 4];
-                    Array.Copy(data, 4, buffer2, 0, data.Length - 4);
-                    m_asset.Data = buffer2;
+                    int assetLength = m_asset.Data.Length;
+                    int dataLength = data.Length;
+
+                    if (m_asset.Data.Length > 1)
+                    {
+                        byte[] destinationArray = new byte[assetLength + dataLength];
+                        Array.Copy(m_asset.Data, 0, destinationArray, 0, assetLength);
+                        Array.Copy(data, 0, destinationArray, assetLength, dataLength);
+                        m_asset.Data = destinationArray;
+                    }
+                    else
+                    {
+                        if (dataLength > 4)
+                        {
+                            byte[] buffer2 = new byte[dataLength - 4];
+                            Array.Copy(data, 4, buffer2, 0, dataLength - 4);
+                            m_asset.Data = buffer2;
+                        }
+                    }
                 }
 
                 ourClient.SendConfirmXfer(xferID, packetID);
@@ -394,6 +412,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 
         private void CompleteCreateItem(uint callbackID)
         {
+            ValidateAssets();
             m_Scene.AssetService.Store(m_asset);
 
             InventoryItemBase item = new InventoryItemBase();
@@ -414,6 +433,9 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
             item.Flags = (uint) wearableType;
             item.CreationDate = Util.UnixTimeSinceEpoch();
 
+            m_log.DebugFormat("[XFER]: Created item {0} with asset {1}",
+                    item.ID, item.AssetID);
+
             if (m_Scene.AddInventoryItem(item))
                 ourClient.SendInventoryItemCreateUpdate(item, callbackID);
             else
@@ -421,5 +443,132 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 
             m_transactions.RemoveXferUploader(m_transactionID);
         }
+
+        private void ValidateAssets()
+        {
+            if (m_asset.Type == (sbyte)AssetType.Clothing ||
+                m_asset.Type == (sbyte)AssetType.Bodypart)
+            {
+                string content = System.Text.Encoding.ASCII.GetString(m_asset.Data);
+                string[] lines = content.Split(new char[] {'\n'});
+
+                List<string> validated = new List<string>();
+
+                Dictionary<int, UUID> allowed = ExtractTexturesFromOldData();
+
+                int textures = 0;
+
+                foreach (string line in lines)
+                {
+                    try
+                    {
+                        if (line.StartsWith("textures "))
+                        {
+                            textures = Convert.ToInt32(line.Substring(9));
+                            validated.Add(line);
+                        }
+                        else if (textures > 0)
+                        {
+                            string[] parts = line.Split(new char[] {' '});
+
+                            UUID tx = new UUID(parts[1]);
+                            int id = Convert.ToInt32(parts[0]);
+
+                            if (defaultIDs.Contains(tx) || tx == UUID.Zero ||
+                                (allowed.ContainsKey(id) && allowed[id] == tx))
+                            {
+                                validated.Add(parts[0] + " " + tx.ToString());
+                            }
+                            else
+                            {
+                                int perms = m_Scene.InventoryService.GetAssetPermissions(ourClient.AgentId, tx);
+                                int full = (int)(PermissionMask.Modify | PermissionMask.Transfer | PermissionMask.Copy);
+
+                                if ((perms & full) != full)
+                                {
+                                    m_log.ErrorFormat("[ASSET UPLOADER]: REJECTED update with texture {0} from {1} because they do not own the texture", tx, ourClient.AgentId);
+                                    validated.Add(parts[0] + " " + UUID.Zero.ToString());
+                                }
+                                else
+                                {
+                                    validated.Add(line);
+                                }
+                            }
+                            textures--;
+                        }
+                        else
+                        {
+                            validated.Add(line);
+                        }
+                    }
+                    catch
+                    {
+                        // If it's malformed, skip it
+                    }
+                }
+
+                string final = String.Join("\n", validated.ToArray());
+
+                m_asset.Data = System.Text.Encoding.ASCII.GetBytes(final);
+            }
+        }
+
+        /// <summary>
+        /// Get the asset data uploaded in this transfer.
+        /// </summary>
+        /// <returns>null if the asset has not finished uploading</returns>
+        public AssetBase GetAssetData()
+        {
+            if (m_uploadState == UploadState.Complete)
+            {
+                ValidateAssets();
+                return m_asset;
+            }
+
+            return null;
+        }
+
+        public void SetOldData(byte[] d)
+        {
+            m_oldData = d;
+        }
+
+        private Dictionary<int,UUID> ExtractTexturesFromOldData()
+        {
+            Dictionary<int,UUID> result = new Dictionary<int,UUID>();
+            if (m_oldData == null)
+                return result;
+
+            string content = System.Text.Encoding.ASCII.GetString(m_oldData);
+            string[] lines = content.Split(new char[] {'\n'});
+
+            int textures = 0;
+
+            foreach (string line in lines)
+            {
+                try
+                {
+                    if (line.StartsWith("textures "))
+                    {
+                        textures = Convert.ToInt32(line.Substring(9));
+                    }
+                    else if (textures > 0)
+                    {
+                        string[] parts = line.Split(new char[] {' '});
+
+                        UUID tx = new UUID(parts[1]);
+                        int id = Convert.ToInt32(parts[0]);
+                        result[id] = tx;
+                        textures--;
+                    }
+                }
+                catch
+                {
+                    // If it's malformed, skip it
+                }
+            }
+
+            return result;
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
index 4299726..7113f4f 100644
--- a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
@@ -160,6 +160,8 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
                     {
                         byte[] fileData = NewFiles[fileName].Data;
                         XferDownLoad transaction = new XferDownLoad(fileName, fileData, xferID, remoteClient);
+                        if (fileName.StartsWith("inventory_"))
+                            transaction.isTaskInventory = true;
 
                         Transfers.Add(xferID, transaction);
 
@@ -243,6 +245,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
             public uint Packet = 0;
             public uint Serial = 1;
             public ulong XferID = 0;
+            public bool isTaskInventory = false;
 
             public XferDownLoad(string fileName, byte[] data, ulong xferID, IClientAPI client)
             {
@@ -268,7 +271,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
                     byte[] transferData = new byte[Data.Length + 4];
                     Array.Copy(Utils.IntToBytes(Data.Length), 0, transferData, 0, 4);
                     Array.Copy(Data, 0, transferData, 4, Data.Length);
-                    Client.SendXferPacket(XferID, 0 + 0x80000000, transferData);
+                    Client.SendXferPacket(XferID, 0 + 0x80000000, transferData, isTaskInventory);
                     complete = true;
                 }
                 else
@@ -276,7 +279,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
                     byte[] transferData = new byte[1000 + 4];
                     Array.Copy(Utils.IntToBytes(Data.Length), 0, transferData, 0, 4);
                     Array.Copy(Data, 0, transferData, 4, 1000);
-                    Client.SendXferPacket(XferID, 0, transferData);
+                    Client.SendXferPacket(XferID, 0, transferData, isTaskInventory);
                     Packet++;
                     DataPointer = 1000;
                 }
@@ -297,7 +300,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
                     {
                         byte[] transferData = new byte[1000];
                         Array.Copy(Data, DataPointer, transferData, 0, 1000);
-                        Client.SendXferPacket(XferID, Packet, transferData);
+                        Client.SendXferPacket(XferID, Packet, transferData, isTaskInventory);
                         Packet++;
                         DataPointer += 1000;
                     }
@@ -306,7 +309,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
                         byte[] transferData = new byte[Data.Length - DataPointer];
                         Array.Copy(Data, DataPointer, transferData, 0, Data.Length - DataPointer);
                         uint endPacket = Packet |= (uint) 0x80000000;
-                        Client.SendXferPacket(XferID, endPacket, transferData);
+                        Client.SendXferPacket(XferID, endPacket, transferData, isTaskInventory);
                         Packet++;
                         DataPointer += (Data.Length - DataPointer);
 
diff --git a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
index e40caec..f43305f 100644
--- a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
@@ -194,6 +194,12 @@ namespace OpenSim.Region.CoreModules.Asset
 
         #region IImprovedAssetCache Members
 
+
+        public bool Check(string id)
+        {
+            return false;
+        }
+
         /// <summary>
         /// Cache asset.
         /// </summary>
diff --git a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
index 9742a5c..58ce61a 100644
--- a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
@@ -112,6 +112,10 @@ namespace OpenSim.Region.CoreModules.Asset
         ////////////////////////////////////////////////////////////
         // IImprovedAssetCache
         //
+        public bool Check(string id)
+        {
+            return false;
+        }
 
         public void Cache(AssetBase asset)
         {
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 3cba9b4..96e8f35 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -251,57 +251,70 @@ namespace OpenSim.Region.CoreModules.Asset
 
         private void UpdateFileCache(string key, AssetBase asset)
         {
-            string filename = GetFileName(asset.ID);
-
-            try
+            // TODO: Spawn this off to some seperate thread to do the actual writing
+            if (asset != null)
             {
-                // If the file is already cached just update access time.
-                if (File.Exists(filename))
-                {
-                    lock (m_CurrentlyWriting)
-                    {
-                        if (!m_CurrentlyWriting.Contains(filename))
-                            File.SetLastAccessTime(filename, DateTime.Now);
-                    }
-                }
-                else
+                string filename = GetFileName(key);
+
+                try
                 {
-                    // Once we start writing, make sure we flag that we're writing
-                    // that object to the cache so that we don't try to write the
-                    // same file multiple times.
-                    lock (m_CurrentlyWriting)
+                    // If the file is already cached, don't cache it, just touch it so access time is updated
+                    if (File.Exists(filename))
                     {
-#if WAIT_ON_INPROGRESS_REQUESTS
-                        if (m_CurrentlyWriting.ContainsKey(filename))
+                        // We don't really want to know about sharing
+                        // violations here. If the file is locked, then
+                        // the other thread has updated the time for us.
+                        try
                         {
-                            return;
+                            lock (m_CurrentlyWriting)
+                            {
+                                if (!m_CurrentlyWriting.Contains(filename))
+                                    File.SetLastAccessTime(filename, DateTime.Now);
+                            }
                         }
-                        else
-                        {
-                            m_CurrentlyWriting.Add(filename, new ManualResetEvent(false));
-                       }
-
-#else
-                        if (m_CurrentlyWriting.Contains(filename))
+                        catch
                         {
-                            return;
                         }
-                        else
+                    } else {
+
+                        // Once we start writing, make sure we flag that we're writing
+                        // that object to the cache so that we don't try to write the 
+                        // same file multiple times.
+                        lock (m_CurrentlyWriting)
                         {
-                            m_CurrentlyWriting.Add(filename);
-                        }
+#if WAIT_ON_INPROGRESS_REQUESTS
+                            if (m_CurrentlyWriting.ContainsKey(filename))
+                            {
+                                return;
+                            }
+                            else
+                            {
+                                m_CurrentlyWriting.Add(filename, new ManualResetEvent(false));
+                            }
+
+#else
+                            if (m_CurrentlyWriting.Contains(filename))
+                            {
+                                return;
+                            }
+                            else
+                            {
+                                m_CurrentlyWriting.Add(filename);
+                            }
 #endif
-                    }
 
-                    Util.FireAndForget(
-                        delegate { WriteFileCache(filename, asset); });
+                        }
+
+                        Util.FireAndForget(
+                            delegate { WriteFileCache(filename, asset); });
+                    }
+                }
+                catch (Exception e)
+                {
+                    m_log.ErrorFormat(
+                        "[FLOTSAM ASSET CACHE]: Failed to update cache for asset {0}.  Exception {1} {2}",
+                        asset.ID, e.Message, e.StackTrace);
                 }
-            }
-            catch (Exception e)
-            {
-                m_log.WarnFormat(
-                    "[FLOTSAM ASSET CACHE]: Failed to update cache for asset {0}.  Exception {1} {2}",
-                    asset.ID, e.Message, e.StackTrace);
             }
         }
 
@@ -335,6 +348,17 @@ namespace OpenSim.Region.CoreModules.Asset
             return asset;
         }
 
+        private bool CheckFromMemoryCache(string id)
+        {
+            AssetBase asset = null;
+
+            if (m_MemoryCache.TryGetValue(id, out asset))
+                return true;
+
+            return false;
+        }
+
+
         /// <summary>
         /// Try to get an asset from the file cache.
         /// </summary>
@@ -408,6 +432,50 @@ namespace OpenSim.Region.CoreModules.Asset
             return asset;
         }
 
+        private bool CheckFromFileCache(string id)
+        {
+            bool found = false;
+
+            string filename = GetFileName(id);
+            if (File.Exists(filename))
+            {
+                // actually check if we can open it, and so update expire
+                FileStream stream = null;
+                try
+                {
+                    stream = File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.Read);
+                    if (stream != null)
+                    {
+                        found = true;
+                        stream.Close();
+                    }
+
+                }
+                catch (System.Runtime.Serialization.SerializationException e)
+                {
+                    found = false;
+                    m_log.ErrorFormat(
+                        "[FLOTSAM ASSET CACHE]: Failed to check file {0} for asset {1}.  Exception {2} {3}",
+                        filename, id, e.Message, e.StackTrace);
+
+                    // If there was a problem deserializing the asset, the asset may
+                    // either be corrupted OR was serialized under an old format
+                    // {different version of AssetBase} -- we should attempt to
+                    // delete it and re-cache
+                    File.Delete(filename);
+                }
+                catch (Exception e)
+                {
+                    found = false;
+                    m_log.ErrorFormat(
+                        "[FLOTSAM ASSET CACHE]: Failed to check file {0} for asset {1}.  Exception {2} {3}",
+                        filename, id, e.Message, e.StackTrace);
+                }
+            }
+
+            return found;
+        }
+
         public AssetBase Get(string id)
         {
             m_Requests++;
@@ -444,11 +512,26 @@ namespace OpenSim.Region.CoreModules.Asset
             return asset;
         }
 
+        public bool Check(string id)
+        {
+            if (m_MemoryCacheEnabled && CheckFromMemoryCache(id))
+                return true;
+
+            if (m_FileCacheEnabled && CheckFromFileCache(id))
+                return true;
+            return false;
+        }
+
         public AssetBase GetCached(string id)
         {
             return Get(id);
         }
 
+        public AssetBase CheckCached(string id)
+        {
+            return Get(id);
+        }
+
         public void Expire(string id)
         {
             if (m_LogLevel >= 2)
@@ -964,6 +1047,11 @@ namespace OpenSim.Region.CoreModules.Asset
             return asset.Data;
         }
 
+        public bool CheckData(string id)
+        {
+            return Check(id); ;
+        }
+
         public bool Get(string id, object sender, AssetRetrieved handler)
         {
             AssetBase asset = Get(id);
diff --git a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
index 9592ca0..ce9b546 100644
--- a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
@@ -115,6 +115,11 @@ namespace OpenSim.Region.CoreModules.Asset
         // IImprovedAssetCache
         //
 
+        public bool Check(string id)
+        {
+            return false;
+        }
+
         public void Cache(AssetBase asset)
         {
             if (asset != null)
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 8a3eeaa..6323160 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -40,6 +40,7 @@ using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
+using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.Avatar.Attachments
 {
@@ -75,40 +76,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             m_scene.RegisterModuleInterface<IAttachmentsModule>(this);
 
             if (Enabled)
-            {
                 m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
-                m_scene.EventManager.OnStartScript += (localID, itemID) => HandleScriptStateChange(localID, true);
-                m_scene.EventManager.OnStopScript += (localID, itemID) => HandleScriptStateChange(localID, false);
-            }
 
             // TODO: Should probably be subscribing to CloseClient too, but this doesn't yet give us IClientAPI
         }
-
-        /// <summary>
-        /// Listen for client triggered running state changes so that we can persist the script's object if necessary.
-        /// </summary>
-        /// <param name='localID'></param>
-        /// <param name='itemID'></param>
-        private void HandleScriptStateChange(uint localID, bool started)
-        {
-            SceneObjectGroup sog = m_scene.GetGroupByPrim(localID);
-            if (sog != null && sog.IsAttachment) 
-            {
-                if (!started)
-                {
-                    // FIXME: This is a convoluted way for working out whether the script state has changed to stop
-                    // because it has been manually stopped or because the stop was called in UpdateDetachedObject() below
-                    // This needs to be handled in a less tangled way.
-                    ScenePresence sp = m_scene.GetScenePresence(sog.AttachedAvatar);
-                    if (sp.ControllingClient.IsActive)
-                        sog.HasGroupChanged = true;
-                }
-                else
-                {
-                    sog.HasGroupChanged = true;
-                }
-            }
-        }
         
         public void RemoveRegion(Scene scene) 
         {
@@ -199,6 +170,40 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
 //            m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing any attachments for {0}", sp.Name);
 
+            XmlDocument doc = new XmlDocument();
+            string stateData = String.Empty;
+
+            IAttachmentsService attServ = m_scene.RequestModuleInterface<IAttachmentsService>();
+            if (attServ != null)
+            {
+                m_log.DebugFormat("[ATTACHMENT]: Loading attachment data from attachment service");
+                stateData = attServ.Get(sp.UUID.ToString());
+                if (stateData != String.Empty)
+                {
+                    try
+                    {
+                        doc.LoadXml(stateData);
+                    }
+                    catch { }
+                }
+            }
+
+            Dictionary<UUID, string> itemData = new Dictionary<UUID, string>();
+
+            XmlNodeList nodes = doc.GetElementsByTagName("Attachment");
+            if (nodes.Count > 0)
+            {
+                foreach (XmlNode n in nodes)
+                {
+                    XmlElement elem = (XmlElement)n;
+                    string itemID = elem.GetAttribute("ItemID");
+                    string xml = elem.InnerXml;
+
+                    itemData[new UUID(itemID)] = xml;
+                }
+            }
+
+
             List<AvatarAttachment> attachments = sp.Appearance.GetAttachments();
             foreach (AvatarAttachment attach in attachments)
             {
@@ -218,12 +223,22 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
                 try
                 {
+                    string xmlData;
+                    XmlDocument d = null;
+                    UUID asset;
+                    if (itemData.TryGetValue(attach.ItemID, out xmlData))
+                    {
+                        d = new XmlDocument();
+                        d.LoadXml(xmlData);
+                        m_log.InfoFormat("[ATTACHMENT]: Found saved state for item {0}, loading it", attach.ItemID);
+                    }
+
                     // If we're an NPC then skip all the item checks and manipulations since we don't have an
                     // inventory right now.
                     if (sp.PresenceType == PresenceType.Npc)
-                        RezSingleAttachmentFromInventoryInternal(sp, UUID.Zero, attach.AssetID, p);
+                        RezSingleAttachmentFromInventoryInternal(sp, UUID.Zero, attach.AssetID, p, null);
                     else
-                        RezSingleAttachmentFromInventory(sp, attach.ItemID, p);
+                        RezSingleAttachmentFromInventory(sp, attach.ItemID, p, d);
                 }
                 catch (Exception e)
                 {
@@ -268,13 +283,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             sp.ClearAttachments();
         }
-
-        public bool AttachObject(IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool silent, bool temp)
+        
+        public bool AttachObject(IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool silent, bool useAttachData, bool temp)
         {
             if (!Enabled)
                 return false;
 
-            if (AttachObjectInternal(sp, group, attachmentPt, silent, temp))
+            if (AttachObjectInternal(sp, group, attachmentPt, silent, useAttachData, temp))
             {
                 m_scene.EventManager.TriggerOnAttach(group.LocalId, group.FromItemID, sp.UUID);
                 return true;
@@ -283,7 +298,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             return false;
         }
         
-        private bool AttachObjectInternal(IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool silent, bool temp)
+        private bool AttachObjectInternal(IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool silent, bool useAttachData, bool temp)
         {
             lock (sp.AttachmentsSyncLock)
             {
@@ -338,6 +353,24 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     attachPos = Vector3.Zero;
                 }
     
+                if (useAttachData)
+                {
+                    group.RootPart.RotationOffset = group.RootPart.AttachRotation;
+                    attachPos = group.RootPart.AttachOffset;
+                    if (attachmentPt == 0)
+                    {
+                        attachmentPt = group.RootPart.AttachPoint;
+                        if (attachmentPt == 0)
+                        {
+                            attachmentPt = (uint)AttachmentPoint.LeftHand;
+                            attachPos = Vector3.Zero;
+                        }
+                    }
+                    else if (group.RootPart.AttachPoint != attachmentPt)
+                    {
+                        attachPos = Vector3.Zero;
+                    }
+                }
                 group.AttachmentPoint = attachmentPt;
                 group.AbsolutePosition = attachPos;
 
@@ -378,7 +411,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             }
         }
 
-        public SceneObjectGroup RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt)
+        public ISceneEntity RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt)
+                {
+                        return RezSingleAttachmentFromInventory(sp, itemID, AttachmentPt, null);
+                }
+
+                public ISceneEntity RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt, XmlDocument doc)
         {
             if (!Enabled)
                 return null;
@@ -417,7 +455,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 return null;
             }
 
-            return RezSingleAttachmentFromInventoryInternal(sp, itemID, UUID.Zero, AttachmentPt);
+            return RezSingleAttachmentFromInventoryInternal(sp, itemID, UUID.Zero, AttachmentPt, doc);
         }
 
         public void RezMultipleAttachmentsFromInventory(IScenePresence sp, List<KeyValuePair<UUID, uint>> rezlist)
@@ -491,7 +529,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 so.AttachedAvatar = UUID.Zero;
                 rootPart.SetParentLocalId(0);
                 so.ClearPartAttachmentData();
-                rootPart.ApplyPhysics(rootPart.GetEffectiveObjectFlags(), rootPart.VolumeDetectActive);
+                rootPart.ApplyPhysics(rootPart.GetEffectiveObjectFlags(), rootPart.VolumeDetectActive,false);
                 so.HasGroupChanged = true;
                 rootPart.Rezzed = DateTime.Now;
                 rootPart.RemFlag(PrimFlags.TemporaryOnRez);
@@ -803,8 +841,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             UpdateDetachedObject(sp, so);
         }
 
-        private SceneObjectGroup RezSingleAttachmentFromInventoryInternal(
-            IScenePresence sp, UUID itemID, UUID assetID, uint attachmentPt)
+        protected SceneObjectGroup RezSingleAttachmentFromInventoryInternal(
+            IScenePresence sp, UUID itemID, UUID assetID, uint attachmentPt, XmlDocument doc)
         {
             if (m_invAccessModule == null)
                 return null;
@@ -842,7 +880,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     // This will throw if the attachment fails
                     try
                     {
-                        AttachObjectInternal(sp, objatt, attachmentPt, false, false);
+                        AttachObjectInternal(sp, objatt, attachmentPt, false, false, false);
                     }
                     catch (Exception e)
                     {
@@ -855,10 +893,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                         m_scene.DeleteSceneObject(objatt, false);
                         return null;
                     }
-
+                    
                     if (tainted)
                         objatt.HasGroupChanged = true;
 
+                    if (doc != null)
+                    {
+                        objatt.LoadScriptState(doc);
+                        objatt.ResetOwnerChangeFlag();
+                    }
+
                     // Fire after attach, so we don't get messy perms dialogs
                     // 4 == AttachedRez
                     objatt.CreateScriptInstances(0, true, m_scene.DefaultScriptEngine, 4);
@@ -876,7 +920,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                         itemID, sp.Name, attachmentPt);
                 }
             }
-
+            
             return null;
         }
 
@@ -999,7 +1043,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 AttachmentPt &= 0x7f;
 
                 // Calls attach with a Zero position
-                AttachObject(sp, part.ParentGroup, AttachmentPt, false, false);
+                if (AttachObject(sp, part.ParentGroup, AttachmentPt, false, true, false))
+                {
+//                    m_log.Debug(
+//                        "[ATTACHMENTS MODULE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId
+//                        + ", AttachmentPoint: " + AttachmentPt);
+
+                    // Save avatar attachment information
+                    m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.FromItemID, remoteClient.AgentId);
+                }
             }
             catch (Exception e)
             {
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index 0ee01c7..4e9d3f9 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -197,7 +197,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, attName, sp.UUID);
 
             m_numberOfAttachEventsFired = 0;
-            scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false, false);
+            scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false, false, false);
 
             // Check status on scene presence
             Assert.That(sp.HasAttachments(), Is.True);
@@ -254,7 +254,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             sp2.AbsolutePosition = new Vector3(0, 0, 0);
             sp2.HandleAgentRequestSit(sp2.ControllingClient, sp2.UUID, so.UUID, Vector3.Zero);
 
-            scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false, false);
+            scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false, false, false);
 
             Assert.That(sp.HasAttachments(), Is.False);
             Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1));
@@ -438,7 +438,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             scene.EventManager.OnChatFromWorld += OnChatFromWorld;
 
             SceneObjectGroup rezzedSo
-                = scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest);
+                = (SceneObjectGroup)(scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest));
 
             // Wait for chat to signal rezzed script has been started.
             m_chatEvent.WaitOne(60000);
@@ -457,7 +457,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             Assert.That(scriptStateNodes.Count, Is.EqualTo(1));
 
             // Re-rez the attachment to check script running state
-            SceneObjectGroup reRezzedSo = scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest);
+            SceneObjectGroup reRezzedSo = (SceneObjectGroup)(scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest));
 
             // Wait for chat to signal rezzed script has been started.
             m_chatEvent.WaitOne(60000);
@@ -663,4 +663,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index ce79f07..208bc9e 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -140,9 +140,24 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         /// <param name="sp"></param>
         /// <param name="texture"></param>
         /// <param name="visualParam"></param>
-        public void SetAppearance(IScenePresence sp, AvatarAppearance appearance)
+        public void SetAppearance(IScenePresence sp, AvatarAppearance appearance, WearableCacheItem[] cacheItems)
         {
-            SetAppearance(sp, appearance.Texture, appearance.VisualParams);
+            SetAppearance(sp, appearance.Texture, appearance.VisualParams, cacheItems);
+        }
+
+
+        public void SetAppearance(IScenePresence sp, Primitive.TextureEntry textureEntry, byte[] visualParams, Vector3 avSize, WearableCacheItem[] cacheItems)
+        {
+            float oldoff = sp.Appearance.AvatarFeetOffset;
+            Vector3 oldbox = sp.Appearance.AvatarBoxSize;
+
+            SetAppearance(sp, textureEntry, visualParams, cacheItems);
+            sp.Appearance.SetSize(avSize);
+
+            float off = sp.Appearance.AvatarFeetOffset;
+            Vector3 box = sp.Appearance.AvatarBoxSize;
+            if (oldoff != off || oldbox != box)
+                ((ScenePresence)sp).SetSize(box, off);
         }
 
         /// <summary>
@@ -151,7 +166,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         /// <param name="sp"></param>
         /// <param name="texture"></param>
         /// <param name="visualParam"></param>
-        public void SetAppearance(IScenePresence sp, Primitive.TextureEntry textureEntry, byte[] visualParams)
+        public void SetAppearance(IScenePresence sp, Primitive.TextureEntry textureEntry, byte[] visualParams, WearableCacheItem[] cacheItems)
         {
 //            m_log.DebugFormat(
 //                "[AVFACTORY]: start SetAppearance for {0}, te {1}, visualParams {2}",
@@ -174,18 +189,27 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                     //                    m_log.DebugFormat(
                     //                        "[AVFACTORY]: Setting visual params for {0} to {1}",
                     //                        client.Name, string.Join(", ", visualParamsStrings));
-
+/*
                     float oldHeight = sp.Appearance.AvatarHeight;
                     changed = sp.Appearance.SetVisualParams(visualParams);
 
                     if (sp.Appearance.AvatarHeight != oldHeight && sp.Appearance.AvatarHeight > 0)
                         ((ScenePresence)sp).SetHeight(sp.Appearance.AvatarHeight);
-                }
+ */
+//                    float oldoff = sp.Appearance.AvatarFeetOffset;
+//                    Vector3 oldbox = sp.Appearance.AvatarBoxSize;
+                    changed = sp.Appearance.SetVisualParams(visualParams);
+//                    float off = sp.Appearance.AvatarFeetOffset;
+//                    Vector3 box = sp.Appearance.AvatarBoxSize;
+//                    if(oldoff != off || oldbox != box)
+//                        ((ScenePresence)sp).SetSize(box,off);
 
+                }
+            
                 // Process the baked texture array
                 if (textureEntry != null)
                 {
-//                    m_log.DebugFormat("[AVFACTORY]: Received texture update for {0} {1}", sp.Name, sp.UUID);
+                    m_log.DebugFormat("[AVFACTORY]: Received texture update for {0} {1}", sp.Name, sp.UUID);
 
 //                    WriteBakedTexturesReport(sp, m_log.DebugFormat);
 
@@ -254,6 +278,17 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             return GetBakedTextureFaces(sp);
         }
 
+        public WearableCacheItem[] GetCachedItems(UUID agentId)
+        {
+            ScenePresence sp = m_scene.GetScenePresence(agentId);
+            WearableCacheItem[] items = sp.Appearance.WearableCacheItems;
+            //foreach (WearableCacheItem item in items)
+            //{
+               
+            //}
+            return items;
+        }
+
         public bool SaveBakedTextures(UUID agentId)
         {
             ScenePresence sp = m_scene.GetScenePresence(agentId);
@@ -340,6 +375,53 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         public bool ValidateBakedTextureCache(IScenePresence sp)
         {
             bool defonly = true; // are we only using default textures
+            IImprovedAssetCache cache = m_scene.RequestModuleInterface<IImprovedAssetCache>();
+            IBakedTextureModule bakedModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
+            WearableCacheItem[] wearableCache = null;
+
+            // Cache wearable data for teleport.
+            // Only makes sense if there's a bake module and a cache module
+            if (bakedModule != null && cache != null)
+            {
+                try
+                {
+                    wearableCache = bakedModule.Get(sp.UUID);
+                }
+                catch (Exception)
+                {
+
+                }
+                if (wearableCache != null)
+                {
+                    for (int i = 0; i < wearableCache.Length; i++)
+                    {
+                       cache.Cache(wearableCache[i].TextureAsset);
+                    }
+                }
+            }
+            /*
+             IBakedTextureModule bakedModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
+            if (invService.GetRootFolder(userID) != null)
+            {
+                WearableCacheItem[] wearableCache = null;
+                if (bakedModule != null)
+                {
+                    try
+                    {
+                        wearableCache = bakedModule.Get(userID);
+                        appearance.WearableCacheItems = wearableCache;
+                        appearance.WearableCacheItemsDirty = false;
+                        foreach (WearableCacheItem item in wearableCache)
+                        {
+                            appearance.Texture.FaceTextures[item.TextureIndex].TextureID = item.TextureID;
+                        }
+                    }
+                    catch (Exception)
+                    {
+                        
+                    }
+                }
+             */
 
             // Process the texture entry
             for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++)
@@ -347,9 +429,32 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 int idx = AvatarAppearance.BAKE_INDICES[i];
                 Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[idx];
 
-                // if there is no texture entry, skip it
+                // No face, so lets check our baked service cache, teleport or login.
                 if (face == null)
-                    continue;
+                {
+                    if (wearableCache != null)
+                    {
+                        // If we find the an appearance item, set it as the textureentry and the face
+                        WearableCacheItem searchitem = WearableCacheItem.SearchTextureIndex((uint) idx, wearableCache);
+                        if (searchitem != null)
+                        {
+                            sp.Appearance.Texture.FaceTextures[idx] = sp.Appearance.Texture.CreateFace((uint) idx);
+                            sp.Appearance.Texture.FaceTextures[idx].TextureID = searchitem.TextureID;
+                            face = sp.Appearance.Texture.FaceTextures[idx];
+                        }
+                        else
+                        {
+                            // if there is no texture entry and no baked cache, skip it
+                            continue;
+                        }
+                    }
+                    else
+                    {
+                        //No texture entry face and no cache.  Skip this face.
+                        continue;
+                    }
+                }
+                    
 
 //                m_log.DebugFormat(
 //                    "[AVFACTORY]: Looking for texture {0}, id {1} for {2} {3}",
@@ -364,8 +469,16 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 
                 defonly = false; // found a non-default texture reference
 
-                if (m_scene.AssetService.Get(face.TextureID.ToString()) == null)
-                    return false;
+                if (cache != null)
+                {
+                    if (!cache.Check(face.TextureID.ToString()))
+                        return false;
+                }
+                else
+                {
+                    if (m_scene.AssetService.Get(face.TextureID.ToString()) == null)
+                        return false;
+                }
             }
 
 //            m_log.DebugFormat("[AVFACTORY]: Completed texture check for {0} {1}", sp.Name, sp.UUID);
@@ -377,6 +490,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         public int RequestRebake(IScenePresence sp, bool missingTexturesOnly)
         {
             int texturesRebaked = 0;
+            IImprovedAssetCache cache = m_scene.RequestModuleInterface<IImprovedAssetCache>();
 
             for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++)
             {
@@ -400,21 +514,36 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
                 if (missingTexturesOnly)
                 {
-                    if (m_scene.AssetService.Get(face.TextureID.ToString()) != null)
+                    if (cache != null)
                     {
-                        continue;
+                        if (cache.Check(face.TextureID.ToString()))
+                            continue;
+                        else
+                        {
+                            m_log.DebugFormat(
+                                "[AVFACTORY]: Missing baked texture {0} ({1}) for {2}, requesting rebake.",
+                                face.TextureID, idx, sp.Name);
+                        }
                     }
                     else
                     {
-                        // On inter-simulator teleports, this occurs if baked textures are not being stored by the
-                        // grid asset service (which means that they are not available to the new region and so have
-                        // to be re-requested from the client).
-                        //
-                        // The only available core OpenSimulator behaviour right now
-                        // is not to store these textures, temporarily or otherwise.
-                        m_log.DebugFormat(
-                            "[AVFACTORY]: Missing baked texture {0} ({1}) for {2}, requesting rebake.",
-                            face.TextureID, idx, sp.Name);
+                        if (m_scene.AssetService.Get(face.TextureID.ToString()) != null)
+                        {
+                            continue;
+                        }
+
+                        else
+                        {
+                            // On inter-simulator teleports, this occurs if baked textures are not being stored by the
+                            // grid asset service (which means that they are not available to the new region and so have
+                            // to be re-requested from the client).
+                            //
+                            // The only available core OpenSimulator behaviour right now
+                            // is not to store these textures, temporarily or otherwise.
+                            m_log.DebugFormat(
+                                "[AVFACTORY]: Missing baked texture {0} ({1}) for {2}, requesting rebake.",
+                                face.TextureID, idx, sp.Name);
+                        }
                     }
                 }
                 else
@@ -548,26 +677,70 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         private void SetAppearanceAssets(UUID userID, AvatarAppearance appearance)
         {
             IInventoryService invService = m_scene.InventoryService;
-
+            bool resetwearable = false;
             if (invService.GetRootFolder(userID) != null)
             {
                 for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
                 {
                     for (int j = 0; j < appearance.Wearables[i].Count; j++)
                     {
+                        // Check if the default wearables are not set
                         if (appearance.Wearables[i][j].ItemID == UUID.Zero)
+                        {
+                            switch ((WearableType) i)
+                            {
+                                case WearableType.Eyes:
+                                case WearableType.Hair:
+                                case WearableType.Shape:
+                                case WearableType.Skin:
+                                //case WearableType.Underpants:
+                                    TryAndRepairBrokenWearable((WearableType)i, invService, userID, appearance);
+                                    resetwearable = true;
+                                    m_log.Warn("[AVFACTORY]: UUID.Zero Wearables, passing fake values.");
+                                    resetwearable = true;
+                                    break;
+
+                            }
                             continue;
+                        }
 
-                        // Ignore ruth's assets
+                        // Ignore ruth's assets except for the body parts! missing body parts fail avatar appearance on V1
                         if (appearance.Wearables[i][j].ItemID == AvatarWearable.DefaultWearables[i][0].ItemID)
+                        {
+                            switch ((WearableType)i)
+                            {
+                                case WearableType.Eyes:
+                                case WearableType.Hair:
+                                case WearableType.Shape:
+                                case WearableType.Skin:
+                                //case WearableType.Underpants:
+                                    TryAndRepairBrokenWearable((WearableType)i, invService, userID, appearance);
+                            
+                                    m_log.WarnFormat("[AVFACTORY]: {0} Default Wearables, passing existing values.", (WearableType)i);
+                                    resetwearable = true;
+                                    break;
+
+                            }
                             continue;
-
+                        }
+                        
                         InventoryItemBase baseItem = new InventoryItemBase(appearance.Wearables[i][j].ItemID, userID);
                         baseItem = invService.GetItem(baseItem);
 
                         if (baseItem != null)
                         {
                             appearance.Wearables[i].Add(appearance.Wearables[i][j].ItemID, baseItem.AssetID);
+                            int unmodifiedWearableIndexForClosure = i;
+                            m_scene.AssetService.Get(baseItem.AssetID.ToString(), this,
+                                                                      delegate(string x, object y, AssetBase z)
+                                                                      {
+                                                                          if (z == null)
+                                                                          {
+                                                                              TryAndRepairBrokenWearable(
+                                                                                  (WearableType)unmodifiedWearableIndexForClosure, invService,
+                                                                                  userID, appearance);
+                                                                          }
+                                                                      });
                         }
                         else
                         {
@@ -575,17 +748,236 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                                 "[AVFACTORY]: Can't find inventory item {0} for {1}, setting to default",
                                 appearance.Wearables[i][j].ItemID, (WearableType)i);
 
-                            appearance.Wearables[i].RemoveItem(appearance.Wearables[i][j].ItemID);
+                            TryAndRepairBrokenWearable((WearableType)i, invService, userID, appearance);
+                            resetwearable = true;
+                            
                         }
                     }
                 }
+
+                // I don't know why we have to test for this again...  but the above switches do not capture these scenarios for some reason....
+                if (appearance.Wearables[(int) WearableType.Eyes] == null)
+                {
+                    m_log.WarnFormat("[AVFACTORY]: {0} Eyes are Null, passing existing values.", (WearableType.Eyes));
+                    
+                    TryAndRepairBrokenWearable(WearableType.Eyes, invService, userID, appearance);
+                    resetwearable = true;
+                }
+                else
+                {
+                    if (appearance.Wearables[(int) WearableType.Eyes][0].ItemID == UUID.Zero)
+                    {
+                        m_log.WarnFormat("[AVFACTORY]: Eyes are UUID.Zero are broken, {0} {1}",
+                                         appearance.Wearables[(int) WearableType.Eyes][0].ItemID,
+                                         appearance.Wearables[(int) WearableType.Eyes][0].AssetID);
+                        TryAndRepairBrokenWearable(WearableType.Eyes, invService, userID, appearance);
+                        resetwearable = true;
+
+                    }
+
+                }
+                // I don't know why we have to test for this again...  but the above switches do not capture these scenarios for some reason....
+                if (appearance.Wearables[(int)WearableType.Shape] == null)
+                {
+                    m_log.WarnFormat("[AVFACTORY]: {0} shape is Null, passing existing values.", (WearableType.Shape));
+
+                    TryAndRepairBrokenWearable(WearableType.Shape, invService, userID, appearance);
+                    resetwearable = true;
+                }
+                else
+                {
+                    if (appearance.Wearables[(int)WearableType.Shape][0].ItemID == UUID.Zero)
+                    {
+                        m_log.WarnFormat("[AVFACTORY]: Shape is UUID.Zero and broken, {0} {1}",
+                                         appearance.Wearables[(int)WearableType.Shape][0].ItemID,
+                                         appearance.Wearables[(int)WearableType.Shape][0].AssetID);
+                        TryAndRepairBrokenWearable(WearableType.Shape, invService, userID, appearance);
+                        resetwearable = true;
+
+                    }
+
+                }
+                // I don't know why we have to test for this again...  but the above switches do not capture these scenarios for some reason....
+                if (appearance.Wearables[(int)WearableType.Hair] == null)
+                {
+                    m_log.WarnFormat("[AVFACTORY]: {0} Hair is Null, passing existing values.", (WearableType.Hair));
+
+                    TryAndRepairBrokenWearable(WearableType.Hair, invService, userID, appearance);
+                    resetwearable = true;
+                }
+                else
+                {
+                    if (appearance.Wearables[(int)WearableType.Hair][0].ItemID == UUID.Zero)
+                    {
+                        m_log.WarnFormat("[AVFACTORY]: Hair is UUID.Zero and broken, {0} {1}",
+                                         appearance.Wearables[(int)WearableType.Hair][0].ItemID,
+                                         appearance.Wearables[(int)WearableType.Hair][0].AssetID);
+                        TryAndRepairBrokenWearable(WearableType.Hair, invService, userID, appearance);
+                        resetwearable = true;
+
+                    }
+
+                }
+                // I don't know why we have to test for this again...  but the above switches do not capture these scenarios for some reason....
+                if (appearance.Wearables[(int)WearableType.Skin] == null)
+                {
+                    m_log.WarnFormat("[AVFACTORY]: {0} Skin is Null, passing existing values.", (WearableType.Skin));
+
+                    TryAndRepairBrokenWearable(WearableType.Skin, invService, userID, appearance);
+                    resetwearable = true;
+                }
+                else
+                {
+                    if (appearance.Wearables[(int)WearableType.Skin][0].ItemID == UUID.Zero)
+                    {
+                        m_log.WarnFormat("[AVFACTORY]: Skin is UUID.Zero and broken, {0} {1}",
+                                         appearance.Wearables[(int)WearableType.Skin][0].ItemID,
+                                         appearance.Wearables[(int)WearableType.Skin][0].AssetID);
+                        TryAndRepairBrokenWearable(WearableType.Skin, invService, userID, appearance);
+                        resetwearable = true;
+
+                    }
+
+                }
+                if (resetwearable)
+                {
+                    ScenePresence presence = null;
+                    if (m_scene.TryGetScenePresence(userID, out presence))
+                    {
+                        presence.ControllingClient.SendWearables(presence.Appearance.Wearables,
+                                                                 presence.Appearance.Serial++);
+                    }
+                }
+
             }
             else
             {
                 m_log.WarnFormat("[AVFACTORY]: user {0} has no inventory, appearance isn't going to work", userID);
             }
         }
+        private void TryAndRepairBrokenWearable(WearableType type, IInventoryService invService, UUID userID,AvatarAppearance appearance)
+        {
+            UUID defaultwearable = GetDefaultItem(type);
+            if (defaultwearable != UUID.Zero)
+            {
+                UUID newInvItem = UUID.Random();
+                InventoryItemBase itembase = new InventoryItemBase(newInvItem, userID)
+                                                 {
+                                                     AssetID =
+                                                         defaultwearable,
+                                                     AssetType
+                                                         =
+                                                         (int)
+                                                         AssetType
+                                                             .Bodypart,
+                                                     CreatorId
+                                                         =
+                                                         userID
+                                                         .ToString
+                                                         (),
+                                                     //InvType = (int)InventoryType.Wearable,
+
+                                                     Description
+                                                         =
+                                                         "Failed Wearable Replacement",
+                                                     Folder =
+                                                         invService
+                                                         .GetFolderForType
+                                                         (userID,
+                                                          AssetType
+                                                              .Bodypart)
+                                                         .ID,
+                                                     Flags = (uint) type,
+                                                     Name = Enum.GetName(typeof (WearableType), type),
+                                                     BasePermissions = (uint) PermissionMask.Copy,
+                                                     CurrentPermissions = (uint) PermissionMask.Copy,
+                                                     EveryOnePermissions = (uint) PermissionMask.Copy,
+                                                     GroupPermissions = (uint) PermissionMask.Copy,
+                                                     NextPermissions = (uint) PermissionMask.Copy
+                                                 };
+                invService.AddItem(itembase);
+                UUID LinkInvItem = UUID.Random();
+                itembase = new InventoryItemBase(LinkInvItem, userID)
+                               {
+                                   AssetID =
+                                       newInvItem,
+                                   AssetType
+                                       =
+                                       (int)
+                                       AssetType
+                                           .Link,
+                                   CreatorId
+                                       =
+                                       userID
+                                       .ToString
+                                       (),
+                                   InvType = (int) InventoryType.Wearable,
+
+                                   Description
+                                       =
+                                       "Failed Wearable Replacement",
+                                   Folder =
+                                       invService
+                                       .GetFolderForType
+                                       (userID,
+                                        AssetType
+                                            .CurrentOutfitFolder)
+                                       .ID,
+                                   Flags = (uint) type,
+                                   Name = Enum.GetName(typeof (WearableType), type),
+                                   BasePermissions = (uint) PermissionMask.Copy,
+                                   CurrentPermissions = (uint) PermissionMask.Copy,
+                                   EveryOnePermissions = (uint) PermissionMask.Copy,
+                                   GroupPermissions = (uint) PermissionMask.Copy,
+                                   NextPermissions = (uint) PermissionMask.Copy
+                               };
+                invService.AddItem(itembase);
+                appearance.Wearables[(int)type] = new AvatarWearable(newInvItem, GetDefaultItem(type));
+                ScenePresence presence = null;
+                if (m_scene.TryGetScenePresence(userID, out presence))
+                {
+                    m_scene.SendInventoryUpdate(presence.ControllingClient,
+                                                invService.GetFolderForType(userID,
+                                                                            AssetType
+                                                                                .CurrentOutfitFolder),
+                                                false, true);
+                }
+            }
+        }
+        private UUID GetDefaultItem(WearableType wearable)
+        {
+            // These are ruth
+            UUID ret = UUID.Zero;
+            switch (wearable)
+            {
+                case WearableType.Eyes:
+                    ret = new UUID("4bb6fa4d-1cd2-498a-a84c-95c1a0e745a7");
+                    break;
+                case WearableType.Hair:
+                    ret = new UUID("d342e6c0-b9d2-11dc-95ff-0800200c9a66");
+                    break;
+                case WearableType.Pants:
+                    ret = new UUID("00000000-38f9-1111-024e-222222111120");
+                    break;
+                case WearableType.Shape:
+                    ret = new UUID("66c41e39-38f9-f75a-024e-585989bfab73");
+                    break;
+                case WearableType.Shirt:
+                    ret = new UUID("00000000-38f9-1111-024e-222222111110");
+                    break;
+                case WearableType.Skin:
+                    ret = new UUID("77c41e39-38f9-f75a-024e-585989bbabbb");
+                    break;
+                case WearableType.Undershirt:
+                    ret = new UUID("16499ebb-3208-ec27-2def-481881728f47");
+                    break;
+                case WearableType.Underpants:
+                    ret = new UUID("4ac2e9c7-3671-d229-316a-67717730841d");
+                    break;
+            }
 
+            return ret;
+        }
         #endregion
 
         #region Client Event Handlers
@@ -595,12 +987,17 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         /// <param name="client"></param>
         private void Client_OnRequestWearables(IClientAPI client)
         {
-            // m_log.DebugFormat("[AVFACTORY]: Client_OnRequestWearables called for {0} ({1})", client.Name, client.AgentId);
-            ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
-            if (sp != null)
-                client.SendWearables(sp.Appearance.Wearables, sp.Appearance.Serial++);
-            else
-                m_log.WarnFormat("[AVFACTORY]: Client_OnRequestWearables unable to find presence for {0}", client.AgentId);
+            Util.FireAndForget(delegate(object x)
+            {
+                Thread.Sleep(4000);
+
+                // m_log.DebugFormat("[AVFACTORY]: Client_OnRequestWearables called for {0} ({1})", client.Name, client.AgentId);
+                ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
+                if (sp != null)
+                    client.SendWearables(sp.Appearance.Wearables, sp.Appearance.Serial++);
+                else
+                    m_log.WarnFormat("[AVFACTORY]: Client_OnRequestWearables unable to find presence for {0}", client.AgentId);
+            });
         }
         
         /// <summary>
@@ -609,12 +1006,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         /// <param name="client"></param>
         /// <param name="texture"></param>
         /// <param name="visualParam"></param>
-        private void Client_OnSetAppearance(IClientAPI client, Primitive.TextureEntry textureEntry, byte[] visualParams)
+        private void Client_OnSetAppearance(IClientAPI client, Primitive.TextureEntry textureEntry, byte[] visualParams, Vector3 avSize, WearableCacheItem[] cacheItems)
         {
             // m_log.WarnFormat("[AVFACTORY]: Client_OnSetAppearance called for {0} ({1})", client.Name, client.AgentId);
             ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
             if (sp != null)
-                SetAppearance(sp, textureEntry, visualParams);
+                SetAppearance(sp, textureEntry, visualParams,avSize, cacheItems);
             else
                 m_log.WarnFormat("[AVFACTORY]: Client_OnSetAppearance unable to find presence for {0}", client.AgentId);
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
index 1830d41..f090e15 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             for (byte i = 0; i < visualParams.Length; i++)
                 visualParams[i] = i;
 
-            afm.SetAppearance(sp, new Primitive.TextureEntry(TestHelpers.ParseTail(0x10)), visualParams);
+            afm.SetAppearance(sp, new Primitive.TextureEntry(TestHelpers.ParseTail(0x10)), visualParams, new WearableCacheItem[0]);
 
             // TODO: Check baked texture
             Assert.AreEqual(visualParams, sp.Appearance.VisualParams);
@@ -102,7 +102,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             Primitive.TextureEntryFace eyesFace = bakedTextureEntry.CreateFace(eyesFaceIndex);
             eyesFace.TextureID = eyesTextureId;
 
-            afm.SetAppearance(sp, bakedTextureEntry, visualParams);
+            afm.SetAppearance(sp, bakedTextureEntry, visualParams, new WearableCacheItem[0]);
             afm.SaveBakedTextures(userId);
 //            Dictionary<BakeType, Primitive.TextureEntryFace> bakedTextures = afm.GetBakedTextureFaces(userId);
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 6d62ff0..4c3f1cc 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -51,7 +51,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
         private int m_shoutdistance = 100;
         private int m_whisperdistance = 10;
         private List<Scene> m_scenes = new List<Scene>();
-
+        private List<string> FreezeCache = new List<string>();
+        private string m_adminPrefix = "";
         internal object m_syncy = new object();
 
         internal IConfig m_config;
@@ -78,6 +79,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance);
             m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance);
             m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance);
+            m_adminPrefix = config.Configs["Chat"].GetString("admin_prefix", "");
         }
 
         public virtual void AddRegion(Scene scene)
@@ -173,7 +175,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 return;
             }
 
-            DeliverChatToAvatars(ChatSourceType.Agent, c);
+            if (FreezeCache.Contains(c.Sender.AgentId.ToString()))
+            {
+                if (c.Type != ChatTypeEnum.StartTyping || c.Type != ChatTypeEnum.StopTyping)
+                    c.Sender.SendAgentAlertMessage("You may not talk as you are frozen.", false);
+            }
+            else
+            {
+                DeliverChatToAvatars(ChatSourceType.Agent, c);
+            }
         }
 
         public virtual void OnChatFromWorld(Object sender, OSChatMessage c)
@@ -187,11 +197,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
         protected virtual void DeliverChatToAvatars(ChatSourceType sourceType, OSChatMessage c)
         {
             string fromName = c.From;
+            string fromNamePrefix = "";
             UUID fromID = UUID.Zero;
             UUID ownerID = UUID.Zero;
-            UUID targetID = c.TargetUUID;
             string message = c.Message;
             IScene scene = c.Scene;
+            UUID destination = c.Destination;
             Vector3 fromPos = c.Position;
             Vector3 regionPos = new Vector3(scene.RegionInfo.RegionLocX * Constants.RegionSize,
                                             scene.RegionInfo.RegionLocY * Constants.RegionSize, 0);
@@ -211,6 +222,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 fromPos = avatar.AbsolutePosition;
                 fromName = avatar.Name;
                 fromID = c.Sender.AgentId;
+                if (avatar.GodLevel >= 200)
+                {
+                    fromNamePrefix = m_adminPrefix;
+                }
+                destination = UUID.Zero; // Avatars cant "SayTo"
                 ownerID = c.Sender.AgentId;
 
                 break;
@@ -229,40 +245,47 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 message = message.Substring(0, 1000);
 
 //            m_log.DebugFormat(
-//                "[CHAT]: DCTA: fromID {0} fromName {1}, region{2}, cType {3}, sType {4}, targetID {5}",
-//                fromID, fromName, scene.RegionInfo.RegionName, c.Type, sourceType, targetID);
+//                "[CHAT]: DCTA: fromID {0} fromName {1}, region{2}, cType {3}, sType {4}", 
+//                fromID, fromName, scene.RegionInfo.RegionName, c.Type, sourceType);
 
             HashSet<UUID> receiverIDs = new HashSet<UUID>();
-
+            
             foreach (Scene s in m_scenes)
             {
-                if (targetID == UUID.Zero)
-                {
-                    // This should use ForEachClient, but clients don't have a position.
-                    // If camera is moved into client, then camera position can be used
-                    s.ForEachRootScenePresence(
-                        delegate(ScenePresence presence)
+                // This should use ForEachClient, but clients don't have a position.
+                // If camera is moved into client, then camera position can be used
+                // MT: No, it can't, as chat is heard from the avatar position, not
+                // the camera position.
+                s.ForEachRootScenePresence(
+                    delegate(ScenePresence presence)
+                    {
+                        if (destination != UUID.Zero && presence.UUID != destination)
+                            return;
+                        ILandObject Presencecheck = s.LandChannel.GetLandObject(presence.AbsolutePosition.X, presence.AbsolutePosition.Y);
+                        if (Presencecheck != null)
                         {
-                            if (TrySendChatMessage(
-                                presence, fromPos, regionPos, fromID, ownerID, fromName, c.Type, message, sourceType, false))
-                                receiverIDs.Add(presence.UUID);
+                            // This will pass all chat from objects. Not
+                            // perfect, but it will do. For now. Better
+                            // than the prior behavior of muting all
+                            // objects on a parcel with access restrictions
+                            if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true)
+                            {
+                                if (destination != UUID.Zero)
+                                {
+                                    if (TrySendChatMessage(presence, fromPos, regionPos, fromID, ownerID, fromNamePrefix + fromName, c.Type, message, sourceType, true))
+                                        receiverIDs.Add(presence.UUID);
+                                }
+                                else
+                                {
+                                    if (TrySendChatMessage(presence, fromPos, regionPos, fromID, ownerID, fromNamePrefix + fromName, c.Type, message, sourceType, false))
+                                        receiverIDs.Add(presence.UUID);
+                                }
+                            }
                         }
-                    );
-                }
-                else
-                {
-                    // This is a send to a specific client eg from llRegionSayTo
-                    // no need to check distance etc, jand send is as say
-                    ScenePresence presence = s.GetScenePresence(targetID);
-                    if (presence != null && !presence.IsChildAgent)
-                    {
-                        if (TrySendChatMessage(
-                            presence, fromPos, regionPos, fromID, ownerID, fromName, ChatTypeEnum.Say, message, sourceType, true))
-                            receiverIDs.Add(presence.UUID);
                     }
-                }
+                );
             }
-
+            
             (scene as Scene).EventManager.TriggerOnChatToClients(
                 fromID, receiverIDs, message, c.Type, fromPos, fromName, sourceType, ChatAudibleLevel.Fully);
         }
@@ -302,28 +325,29 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             }
             
             // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType);
-
             HashSet<UUID> receiverIDs = new HashSet<UUID>();
             
-            ((Scene)c.Scene).ForEachRootClient(
-                delegate(IClientAPI client)
-                {   
-                    // don't forward SayOwner chat from objects to
-                    // non-owner agents
-                    if ((c.Type == ChatTypeEnum.Owner) &&
-                        (null != c.SenderObject) &&
-                        (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId))
-                        return;
-
-                    client.SendChatMessage(
-                        c.Message, (byte)cType, CenterOfRegion, fromName, fromID, fromID,
-                        (byte)sourceType, (byte)ChatAudibleLevel.Fully);
-
-                    receiverIDs.Add(client.AgentId);
-                });
-            
-            (c.Scene as Scene).EventManager.TriggerOnChatToClients(
-                fromID, receiverIDs, c.Message, cType, CenterOfRegion, fromName, sourceType, ChatAudibleLevel.Fully);
+            if (c.Scene != null)
+            {
+                ((Scene)c.Scene).ForEachRootClient
+                (
+                    delegate(IClientAPI client)
+                    {
+                        // don't forward SayOwner chat from objects to
+                        // non-owner agents
+                        if ((c.Type == ChatTypeEnum.Owner) &&
+                            (null != c.SenderObject) &&
+                            (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId))
+                            return;
+                        
+                        client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, fromID,
+                                               (byte)sourceType, (byte)ChatAudibleLevel.Fully);
+                        receiverIDs.Add(client.AgentId);
+                    }
+                );
+                (c.Scene as Scene).EventManager.TriggerOnChatToClients(
+                    fromID, receiverIDs, c.Message, cType, CenterOfRegion, fromName, sourceType, ChatAudibleLevel.Fully);
+             }
         }
 
         /// <summary>
@@ -348,7 +372,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             UUID fromAgentID, UUID ownerID, string fromName, ChatTypeEnum type,
             string message, ChatSourceType src, bool ignoreDistance)
         {
-            // don't send stuff to child agents
+            // don't send chat to child agents
             if (presence.IsChildAgent) return false;
 
             Vector3 fromRegionPos = fromPos + regionPos;
@@ -357,15 +381,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                             presence.Scene.RegionInfo.RegionLocY * Constants.RegionSize, 0);
 
             int dis = (int)Util.GetDistanceTo(toRegionPos, fromRegionPos);
-
-            if (!ignoreDistance)
+            
+            if (type == ChatTypeEnum.Whisper && dis > m_whisperdistance ||
+                type == ChatTypeEnum.Say && dis > m_saydistance ||
+                type == ChatTypeEnum.Shout && dis > m_shoutdistance)
             {
-                if (type == ChatTypeEnum.Whisper && dis > m_whisperdistance ||
-                    type == ChatTypeEnum.Say && dis > m_saydistance ||
-                    type == ChatTypeEnum.Shout && dis > m_shoutdistance)
-                {
-                    return false;
-                }
+                return false;
             }
 
             // TODO: should change so the message is sent through the avatar rather than direct to the ClientView
@@ -375,5 +396,35 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             
             return true;
         }
+
+        Dictionary<UUID, System.Threading.Timer> Timers = new Dictionary<UUID, System.Threading.Timer>();
+        public void ParcelFreezeUser(IClientAPI client, UUID parcelowner, uint flags, UUID target)
+        {
+            System.Threading.Timer Timer;
+            if (flags == 0)
+            {
+                FreezeCache.Add(target.ToString());
+                System.Threading.TimerCallback timeCB = new System.Threading.TimerCallback(OnEndParcelFrozen);
+                Timer = new System.Threading.Timer(timeCB, target, 30000, 0);
+                Timers.Add(target, Timer);
+            }
+            else
+            {
+                FreezeCache.Remove(target.ToString());
+                Timers.TryGetValue(target, out Timer);
+                Timers.Remove(target);
+                Timer.Dispose();
+            }
+        }
+
+        private void OnEndParcelFrozen(object avatar)
+        {
+            UUID target = (UUID)avatar;
+            FreezeCache.Remove(target.ToString());
+            System.Threading.Timer Timer;
+            Timers.TryGetValue(target, out Timer);
+            Timers.Remove(target);
+            Timer.Dispose();
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index d26907b..0e7ab7e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -260,4 +260,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
             return result;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index 5a7446f..9fa9be1 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -32,6 +32,24 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
+using System;
+using System.Reflection;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Reflection;
+using System.IO;
+using System.Web;
+using System.Xml;
+using log4net;
+using Mono.Addins;
+using OpenMetaverse.Messages.Linden;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework.Capabilities;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+using OSDArray = OpenMetaverse.StructuredData.OSDArray;
+using OSDMap = OpenMetaverse.StructuredData.OSDMap;
 
 using Mono.Addins;
 
@@ -40,11 +58,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GodsModule")]
     public class GodsModule : INonSharedRegionModule, IGodsModule
     {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         /// <summary>Special UUID for actions that apply to all agents</summary>
         private static readonly UUID ALL_AGENTS = new UUID("44e87126-e794-4ded-05b3-7c42da3d5cdb");
 
         protected Scene m_scene;
         protected IDialogModule m_dialogModule;
+
+        protected Dictionary<UUID, string> m_capsDict =
+                new Dictionary<UUID, string>();
+        
         protected IDialogModule DialogModule
         {
             get
@@ -65,6 +90,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
             m_scene = scene;
             m_scene.RegisterModuleInterface<IGodsModule>(this);
             m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
+            m_scene.EventManager.OnRegisterCaps += OnRegisterCaps;
+            m_scene.EventManager.OnClientClosed += OnClientClosed;
+            scene.EventManager.OnIncomingInstantMessage +=
+                    OnIncomingInstantMessage;
         }
 
         public void RemoveRegion(Scene scene)
@@ -98,6 +127,54 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
             client.OnRequestGodlikePowers -= RequestGodlikePowers;
         }
         
+        private void OnClientClosed(UUID agentID, Scene scene)
+        {
+            m_capsDict.Remove(agentID);
+        }
+
+        private void OnRegisterCaps(UUID agentID, Caps caps)
+        {
+            string uri = "/CAPS/" + UUID.Random();
+            m_capsDict[agentID] = uri;
+
+            caps.RegisterHandler("UntrustedSimulatorMessage",
+                    new RestStreamHandler("POST", uri,
+                    HandleUntrustedSimulatorMessage));
+        }
+
+        private string HandleUntrustedSimulatorMessage(string request,
+                string path, string param, IOSHttpRequest httpRequest,
+                IOSHttpResponse httpResponse)
+        {
+            OSDMap osd = (OSDMap)OSDParser.DeserializeLLSDXml(request);
+
+            string message = osd["message"].AsString();
+
+            if (message == "GodKickUser")
+            {
+                OSDMap body = (OSDMap)osd["body"];
+                OSDArray userInfo = (OSDArray)body["UserInfo"];
+                OSDMap userData = (OSDMap)userInfo[0];
+
+                UUID agentID = userData["AgentID"].AsUUID();
+                UUID godID = userData["GodID"].AsUUID();
+                UUID godSessionID = userData["GodSessionID"].AsUUID();
+                uint kickFlags = userData["KickFlags"].AsUInteger();
+                string reason = userData["Reason"].AsString();
+
+                ScenePresence god = m_scene.GetScenePresence(godID);
+                if (god == null || god.ControllingClient.SessionId != godSessionID)
+                    return String.Empty;
+
+                KickUser(godID, godSessionID, agentID, kickFlags, Util.StringToBytes1024(reason));
+            }
+            else
+            {
+                m_log.ErrorFormat("[GOD]: Unhandled UntrustedSimulatorMessage: {0}", message);
+            }
+            return String.Empty;
+        }
+
         public void RequestGodlikePowers(
             UUID agentID, UUID sessionID, UUID token, bool godLike, IClientAPI controllingClient)
         {
@@ -146,76 +223,86 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
         /// <param name="reason">The message to send to the user after it's been turned into a field</param>
         public void KickUser(UUID godID, UUID sessionID, UUID agentID, uint kickflags, byte[] reason)
         {
-            UUID kickUserID = ALL_AGENTS;
-            
+            if (!m_scene.Permissions.IsGod(godID))
+                return;
+
             ScenePresence sp = m_scene.GetScenePresence(agentID);
 
-            if (sp != null || agentID == kickUserID)
+            if (sp == null && agentID != ALL_AGENTS)
             {
-                if (m_scene.Permissions.IsGod(godID))
+                IMessageTransferModule transferModule =
+                        m_scene.RequestModuleInterface<IMessageTransferModule>();
+                if (transferModule != null)
                 {
-                    if (kickflags == 0)
-                    {
-                        if (agentID == kickUserID)
-                        {
-                            string reasonStr = Utils.BytesToString(reason);
-
-                            m_scene.ForEachClient(
-                                delegate(IClientAPI controller)
-                                {
-                                    if (controller.AgentId != godID)
-                                        controller.Kick(reasonStr);
-                                }
-                            );
-
-                            // This is a bit crude. It seems the client will be null before it actually stops the thread
-                            // The thread will kill itself eventually :/
-                            // Is there another way to make sure *all* clients get this 'inter region' message?
-                            m_scene.ForEachRootClient(
-                                delegate(IClientAPI client)
-                                {
-                                    if (client.AgentId != godID)
-                                    {
-                                        client.Close();
-                                    }
-                                }
-                            );
-                        }
-                        else
-                        {
-                            m_scene.SceneGraph.removeUserCount(!sp.IsChildAgent);
+                    m_log.DebugFormat("[GODS]: Sending nonlocal kill for agent {0}", agentID);
+                    transferModule.SendInstantMessage(new GridInstantMessage(
+                            m_scene, godID, "God", agentID, (byte)250, false,
+                            Utils.BytesToString(reason), UUID.Zero, true,
+                            new Vector3(), new byte[] {(byte)kickflags}, true),
+                            delegate(bool success) {} );
+                }
+                return;
+            }
 
-                            sp.ControllingClient.Kick(Utils.BytesToString(reason));
-                            sp.ControllingClient.Close();
-                        }
-                    }
-                    
-                    if (kickflags == 1)
-                    {
-                        sp.AllowMovement = false;
-                        if (DialogModule != null)
-                        {
-                            DialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
-                            DialogModule.SendAlertToUser(godID, "User Frozen");
-                        }
-                    }
-                    
-                    if (kickflags == 2)
-                    {
-                        sp.AllowMovement = true;
-                        if (DialogModule != null)
-                        {
-                            DialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
-                            DialogModule.SendAlertToUser(godID, "User Unfrozen");
-                        }
-                    }
+            switch (kickflags)
+            {
+            case 0:
+                if (sp != null)
+                {
+                    KickPresence(sp, Utils.BytesToString(reason));
                 }
-                else
+                else if (agentID == ALL_AGENTS)
                 {
-                    if (DialogModule != null)
-                        DialogModule.SendAlertToUser(godID, "Kick request denied");
+                    m_scene.ForEachRootScenePresence(
+                            delegate(ScenePresence p)
+                            {
+                                if (p.UUID != godID && (!m_scene.Permissions.IsGod(p.UUID)))
+                                    KickPresence(p, Utils.BytesToString(reason));
+                            }
+                    );
+                }
+                break;
+            case 1:
+                if (sp != null)
+                {
+                    sp.AllowMovement = false;
+                    m_dialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
+                    m_dialogModule.SendAlertToUser(godID, "User Frozen");
                 }
+                break;
+            case 2:
+                if (sp != null)
+                {
+                    sp.AllowMovement = true;
+                    m_dialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
+                    m_dialogModule.SendAlertToUser(godID, "User Unfrozen");
+                }
+                break;
+            default:
+                break;
+            }
+        }
+
+        private void KickPresence(ScenePresence sp, string reason)
+        {
+            if (sp.IsChildAgent)
+                return;
+            sp.ControllingClient.Kick(reason);
+            sp.MakeChildAgent();
+            sp.ControllingClient.Close();
+        }
+
+        private void OnIncomingInstantMessage(GridInstantMessage msg)
+        {
+            if (msg.dialog == (uint)250) // Nonlocal kick
+            {
+                UUID agentID = new UUID(msg.toAgentID);
+                string reason = msg.message;
+                UUID godID = new UUID(msg.fromAgentID);
+                uint kickMode = (uint)msg.binaryBucket[0];
+
+                KickUser(godID, UUID.Zero, agentID, kickMode, Util.StringToBytes1024(reason));
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
deleted file mode 100644
index b735c61..0000000
--- a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using log4net;
-using Nini.Config;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
-using Mono.Addins;
-
-namespace OpenSim.Region.CoreModules.Avatar.Groups
-{
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GroupsModule")]
-    public class GroupsModule : ISharedRegionModule
-    {
-        private static readonly ILog m_log =
-            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private Dictionary<UUID, GroupMembershipData> m_GroupMap =
-                new Dictionary<UUID, GroupMembershipData>();
-
-        private Dictionary<UUID, IClientAPI> m_ClientMap =
-                new Dictionary<UUID, IClientAPI>();
-
-        private UUID opensimulatorGroupID =
-                new UUID("00000000-68f9-1111-024e-222222111123");
-
-        private List<Scene> m_SceneList = new List<Scene>();
-
-        private static GroupMembershipData osGroup =
-                new GroupMembershipData();
-
-        private bool m_Enabled = false;
-
-        #region ISharedRegionModule Members
-
-        public void Initialise(IConfigSource config)
-        {
-            IConfig groupsConfig = config.Configs["Groups"];
-
-            if (groupsConfig == null)
-            {
-                m_log.Info("[GROUPS]: No configuration found. Using defaults");
-            }
-            else
-            {
-                m_Enabled = groupsConfig.GetBoolean("Enabled", false);
-                if (!m_Enabled)
-                {
-                    m_log.Info("[GROUPS]: Groups disabled in configuration");
-                    return;
-                }
-
-                if (groupsConfig.GetString("Module", "Default") != "Default")
-                {
-                    m_Enabled = false;
-                    return;
-                }
-            }
-
-        }
-
-        public void AddRegion(Scene scene)
-        {
-            if (!m_Enabled)
-                return;
-
-            lock (m_SceneList)
-            {
-                if (!m_SceneList.Contains(scene))
-                {
-                    if (m_SceneList.Count == 0)
-                    {
-                        osGroup.GroupID = opensimulatorGroupID;
-                        osGroup.GroupName = "OpenSimulator Testing";
-                        osGroup.GroupPowers =
-                                (uint)(GroupPowers.AllowLandmark |
-                                       GroupPowers.AllowSetHome);
-                        m_GroupMap[opensimulatorGroupID] = osGroup;
-                    }
-                    m_SceneList.Add(scene);
-                }
-            }
-
-            scene.EventManager.OnNewClient += OnNewClient;
-            scene.EventManager.OnClientClosed += OnClientClosed;
-            //            scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
-        }
-
-        public void RemoveRegion(Scene scene)
-        {
-            if (!m_Enabled)
-                return;
-
-            lock (m_SceneList)
-            {
-                if (m_SceneList.Contains(scene))
-                    m_SceneList.Remove(scene);
-            }
-
-            scene.EventManager.OnNewClient -= OnNewClient;
-            scene.EventManager.OnClientClosed -= OnClientClosed;
-        }
-
-        public void RegionLoaded(Scene scene)
-        {
-        }
-
-        public void PostInitialise()
-        {
-        }
-
-        public void Close()
-        {
-            if (!m_Enabled)
-                return;
-
-//            m_log.Debug("[GROUPS]: Shutting down group module.");
-            
-            lock (m_ClientMap)
-            {
-                m_ClientMap.Clear();
-            }
-
-            lock (m_GroupMap)
-            {
-                m_GroupMap.Clear();
-            }
-        }
-
-        public string Name
-        {
-            get { return "GroupsModule"; }
-        }
-
-        public Type ReplaceableInterface
-        {
-            get { return null; }
-        }
-
-        #endregion
-
-        private void OnNewClient(IClientAPI client)
-        {
-            // Subscribe to instant messages
-//            client.OnInstantMessage += OnInstantMessage;
-            client.OnAgentDataUpdateRequest += OnAgentDataUpdateRequest;
-            client.OnUUIDGroupNameRequest += HandleUUIDGroupNameRequest;
-            lock (m_ClientMap)
-            {
-                if (!m_ClientMap.ContainsKey(client.AgentId))
-                {
-                    m_ClientMap.Add(client.AgentId, client);
-                }
-            }
-
-            GroupMembershipData[] updateGroups = new GroupMembershipData[1];
-            updateGroups[0] = osGroup;
-
-            client.SendGroupMembership(updateGroups);
-        }
-
-        private void OnAgentDataUpdateRequest(IClientAPI remoteClient,
-                                              UUID AgentID, UUID SessionID)
-        {
-            UUID ActiveGroupID;
-            string ActiveGroupName;
-            ulong ActiveGroupPowers;
-
-            string firstname = remoteClient.FirstName;
-            string lastname = remoteClient.LastName;
-
-            string ActiveGroupTitle = "I IZ N0T";
-
-            ActiveGroupID = osGroup.GroupID;
-            ActiveGroupName = osGroup.GroupName;
-            ActiveGroupPowers = osGroup.GroupPowers;
-
-            remoteClient.SendAgentDataUpdate(AgentID, ActiveGroupID, firstname,
-                                             lastname, ActiveGroupPowers, ActiveGroupName,
-                                             ActiveGroupTitle);
-        }
-
-//        private void OnInstantMessage(IClientAPI client, GridInstantMessage im)
-//        {
-//        }
-
-//        private void OnGridInstantMessage(GridInstantMessage msg)
-//        {
-//            // Trigger the above event handler
-//            OnInstantMessage(null, msg);
-//        }
-
-        private void HandleUUIDGroupNameRequest(UUID id,IClientAPI remote_client)
-        {
-            string groupnamereply = "Unknown";
-            UUID groupUUID = UUID.Zero;
-
-            lock (m_GroupMap)
-            {
-                if (m_GroupMap.ContainsKey(id))
-                {
-                    GroupMembershipData grp = m_GroupMap[id];
-                    groupnamereply = grp.GroupName;
-                    groupUUID = grp.GroupID;
-                }
-            }
-            remote_client.SendGroupNameReply(groupUUID, groupnamereply);
-        }
-
-        private void OnClientClosed(UUID agentID, Scene scene)
-        {
-            lock (m_ClientMap)
-            {
-                if (m_ClientMap.ContainsKey(agentID))
-                {
-//                    IClientAPI cli = m_ClientMap[agentID];
-//                    if (cli != null)
-//                    {
-//                        //m_log.Info("[GROUPS]: Removing all reference to groups for " + cli.Name);
-//                    }
-//                    else
-//                    {
-//                        //m_log.Info("[GROUPS]: Removing all reference to groups for " + agentID.ToString());
-//                    }
-                    m_ClientMap.Remove(agentID);
-                }
-            }
-        }
-    }
-}
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index c33a296..55e30a0 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -27,6 +27,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Timers;
 using log4net;
 using Mono.Addins;
 using Nini.Config;
@@ -44,6 +45,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         private static readonly ILog m_log = LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
+        private Timer m_logTimer = new Timer(10000);
+        private List<GridInstantMessage> m_logData = new List<GridInstantMessage>();
+        private string m_restUrl;
+
         /// <value>
         /// Is this module enabled?
         /// </value>
@@ -63,9 +68,12 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                         "InstantMessageModule", "InstantMessageModule") !=
                         "InstantMessageModule")
                     return;
+                m_restUrl = config.Configs["Messaging"].GetString("LogURL", String.Empty);
             }
             
             m_enabled = true;
+            m_logTimer.AutoReset = false;
+            m_logTimer.Elapsed += LogTimerElapsed;
         }
 
         public void AddRegion(Scene scene)
@@ -150,6 +158,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         {
             byte dialog = im.dialog;
 
+            if (client != null && dialog == (byte)InstantMessageDialog.MessageFromAgent)
+                LogInstantMesssage(im);
+
             if (dialog != (byte)InstantMessageDialog.MessageFromAgent
                 && dialog != (byte)InstantMessageDialog.StartTyping
                 && dialog != (byte)InstantMessageDialog.StopTyping
@@ -159,6 +170,32 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 return;
             }
 
+            //DateTime dt = DateTime.UtcNow;
+
+            // Ticks from UtcNow, but make it look like local. Evil, huh?
+            //dt = DateTime.SpecifyKind(dt, DateTimeKind.Local);
+
+            //try
+            //{
+            //    // Convert that to the PST timezone
+            //    TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles");
+            //    dt = TimeZoneInfo.ConvertTime(dt, timeZoneInfo);
+            //}
+            //catch
+            //{
+            //    //m_log.Info("[OFFLINE MESSAGING]: No PST timezone found on this machine. Saving with local timestamp.");
+            //}
+
+            //// And make it look local again to fool the unix time util
+            //dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc);
+
+            // If client is null, this message comes from storage and IS offline
+            if (client != null)
+                im.offline = 0;
+
+            if (im.offline == 0)
+                im.timestamp = (uint)Util.UnixTimeSinceEpoch();
+
             if (m_TransferModule != null)
             {
                 if (client != null)
@@ -202,5 +239,35 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             //
             OnInstantMessage(null, msg);
         }
+
+        private void LogInstantMesssage(GridInstantMessage im)
+        {
+            if (m_logData.Count < 20)
+            {
+                // Restart the log write timer
+                m_logTimer.Stop();
+            }
+            if (!m_logTimer.Enabled)
+                m_logTimer.Start();
+
+            lock (m_logData)
+            {
+                m_logData.Add(im);
+            }
+        }
+
+        private void LogTimerElapsed(object source, ElapsedEventArgs e)
+        {
+            lock (m_logData)
+            {
+                if (m_restUrl != String.Empty && m_logData.Count > 0)
+                {
+                    bool success = SynchronousRestObjectRequester.MakeRequest<List<GridInstantMessage>, bool>("POST", m_restUrl + "/LogMessages/", m_logData);
+                    if (!success)
+                        m_log.ErrorFormat("[INSTANT MESSAGE]: Failed to save log data");
+                }
+                m_logData.Clear();
+            }
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index fa935cd..1627f6c 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -50,6 +50,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private bool m_Enabled = false;
+        protected string m_MessageKey = String.Empty;
         protected List<Scene> m_Scenes = new List<Scene>();
         protected Dictionary<UUID, UUID> m_UserRegionMap = new Dictionary<UUID, UUID>();
 
@@ -69,14 +70,17 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         public virtual void Initialise(IConfigSource config)
         {
             IConfig cnf = config.Configs["Messaging"];
-            if (cnf != null && cnf.GetString(
-                    "MessageTransferModule", "MessageTransferModule") !=
-                    "MessageTransferModule")
+            if (cnf != null)
             {
-                m_log.Debug("[MESSAGE TRANSFER]: Disabled by configuration");
-                return;
-            }
+                if (cnf.GetString("MessageTransferModule",
+                        "MessageTransferModule") != "MessageTransferModule")
+                {
+                    return;
+                }
 
+                m_MessageKey = cnf.GetString("MessageKey", String.Empty);
+            }
+            m_log.Debug("[MESSAGE TRANSFER]: Module enabled");
             m_Enabled = true;
         }
 
@@ -135,6 +139,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         {
             UUID toAgentID = new UUID(im.toAgentID);
 
+            if (toAgentID == UUID.Zero)
+                return;
+
             // Try root avatar only first
             foreach (Scene scene in m_Scenes)
             {
@@ -249,6 +256,19 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                         && requestData.ContainsKey("position_z") && requestData.ContainsKey("region_id")
                         && requestData.ContainsKey("binary_bucket"))
                 {
+                    if (m_MessageKey != String.Empty)
+                    {
+                        XmlRpcResponse error_resp = new XmlRpcResponse();
+                        Hashtable error_respdata = new Hashtable();
+                        error_respdata["success"] = "FALSE";
+                        error_resp.Value = error_respdata;
+
+                        if (!requestData.Contains("message_key"))
+                            return error_resp;
+                        if (m_MessageKey != (string)requestData["message_key"])
+                            return error_resp;
+                    }
+
                     // Do the easy way of validating the UUIDs
                     UUID.TryParse((string)requestData["from_agent_id"], out fromAgentID);
                     UUID.TryParse((string)requestData["to_agent_id"], out toAgentID);
@@ -425,24 +445,37 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             return resp;
         }
 
-        /// <summary>
-        /// delegate for sending a grid instant message asynchronously
-        /// </summary>
-        public delegate void GridInstantMessageDelegate(GridInstantMessage im, MessageResultNotification result, UUID prevRegionID);
+        private delegate void GridInstantMessageDelegate(GridInstantMessage im, MessageResultNotification result);
 
-        protected virtual void GridInstantMessageCompleted(IAsyncResult iar)
-        {
-            GridInstantMessageDelegate icon =
-                    (GridInstantMessageDelegate)iar.AsyncState;
-            icon.EndInvoke(iar);
-        }
+        private class GIM {
+            public GridInstantMessage im;
+            public MessageResultNotification result;
+        };
 
+        private Queue<GIM> pendingInstantMessages = new Queue<GIM>();
+        private int numInstantMessageThreads = 0;
 
-        protected virtual void SendGridInstantMessageViaXMLRPC(GridInstantMessage im, MessageResultNotification result)
+        private void SendGridInstantMessageViaXMLRPC(GridInstantMessage im, MessageResultNotification result)
         {
-            GridInstantMessageDelegate d = SendGridInstantMessageViaXMLRPCAsync;
+            lock (pendingInstantMessages) {
+                if (numInstantMessageThreads >= 4) {
+                    GIM gim = new GIM();
+                    gim.im = im;
+                    gim.result = result;
+                    pendingInstantMessages.Enqueue(gim);
+                } else {
+                    ++ numInstantMessageThreads;
+                    //m_log.DebugFormat("[SendGridInstantMessageViaXMLRPC]: ++numInstantMessageThreads={0}", numInstantMessageThreads);
+                    GridInstantMessageDelegate d = SendGridInstantMessageViaXMLRPCAsyncMain;
+                    d.BeginInvoke(im, result, GridInstantMessageCompleted, d);
+                }
+            }
+        }
 
-            d.BeginInvoke(im, result, UUID.Zero, GridInstantMessageCompleted, d);
+        private void GridInstantMessageCompleted(IAsyncResult iar)
+        {
+            GridInstantMessageDelegate d = (GridInstantMessageDelegate)iar.AsyncState;
+            d.EndInvoke(iar);
         }
 
         /// <summary>
@@ -457,8 +490,31 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         /// Pass in 0 the first time this method is called.  It will be called recursively with the last 
         /// regionhandle tried
         /// </param>
-        protected virtual void SendGridInstantMessageViaXMLRPCAsync(GridInstantMessage im, MessageResultNotification result, UUID prevRegionID)
+        private void SendGridInstantMessageViaXMLRPCAsyncMain(GridInstantMessage im, MessageResultNotification result)
         {
+            GIM gim;
+            do {
+                try {
+                    SendGridInstantMessageViaXMLRPCAsync(im, result, UUID.Zero);
+                } catch (Exception e) {
+                    m_log.Error("[SendGridInstantMessageViaXMLRPC]: exception " + e.Message);
+                }
+                lock (pendingInstantMessages) {
+                    if (pendingInstantMessages.Count > 0) {
+                        gim = pendingInstantMessages.Dequeue();
+                        im = gim.im;
+                        result = gim.result;
+                    } else {
+                        gim = null;
+                        -- numInstantMessageThreads;
+                        //m_log.DebugFormat("[SendGridInstantMessageViaXMLRPC]: --numInstantMessageThreads={0}", numInstantMessageThreads);
+                    }
+                }
+            } while (gim != null);
+        }
+        private void SendGridInstantMessageViaXMLRPCAsync(GridInstantMessage im, MessageResultNotification result, UUID prevRegionID)
+        {
+
             UUID toAgentID = new UUID(im.toAgentID);
 
             PresenceInfo upd = null;
@@ -525,7 +581,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
             if (upd != null)
             {
-                GridRegion reginfo = m_Scenes[0].GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID,
+                GridRegion reginfo = m_Scenes[0].GridService.GetRegionByUUID(UUID.Zero,
                     upd.RegionID);
                 if (reginfo != null)
                 {
@@ -674,6 +730,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             gim["position_z"] = msg.Position.Z.ToString();
             gim["region_id"] = msg.RegionID.ToString();
             gim["binary_bucket"] = Convert.ToBase64String(msg.binaryBucket,Base64FormattingOptions.None);
+            if (m_MessageKey != String.Empty)
+                gim["message_key"] = m_MessageKey;
             return gim;
         }
 
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index 7d763fa..2d46276 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -173,7 +173,11 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
         private void RetrieveInstantMessages(IClientAPI client)
         {
-            if (m_RestURL != "")
+            if (m_RestURL == String.Empty)
+            {
+                return;
+            }
+            else
             {
                 m_log.DebugFormat("[OFFLINE MESSAGING]: Retrieving stored messages for {0}", client.AgentId);
 
@@ -181,25 +185,28 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                     = SynchronousRestObjectRequester.MakeRequest<UUID, List<GridInstantMessage>>(
                         "POST", m_RestURL + "/RetrieveMessages/", client.AgentId);
 
-                if (msglist == null)
-                    m_log.WarnFormat("[OFFLINE MESSAGING]: WARNING null message list.");
-
-                foreach (GridInstantMessage im in msglist)
+                if (msglist != null)
                 {
-                    if (im.dialog == (byte)InstantMessageDialog.InventoryOffered)
-                        // send it directly or else the item will be given twice
-                        client.SendInstantMessage(im);
-                    else
+                    foreach (GridInstantMessage im in msglist)
                     {
-                        // Send through scene event manager so all modules get a chance
-                        // to look at this message before it gets delivered.
-                        //
-                        // Needed for proper state management for stored group
-                        // invitations
-                        //
-                        Scene s = FindScene(client.AgentId);
-                        if (s != null)
-                            s.EventManager.TriggerIncomingInstantMessage(im);
+                        if (im.dialog == (byte)InstantMessageDialog.InventoryOffered)
+                            // send it directly or else the item will be given twice
+                            client.SendInstantMessage(im);
+                        else
+                        {
+                            // Send through scene event manager so all modules get a chance
+                            // to look at this message before it gets delivered.
+                            //
+                            // Needed for proper state management for stored group
+                            // invitations
+                            //
+
+                            im.offline = 1;
+
+                            Scene s = FindScene(client.AgentId);
+                            if (s != null)
+                                s.EventManager.TriggerIncomingInstantMessage(im);
+                        }
                     }
                 }
             }
@@ -211,24 +218,19 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 im.dialog != (byte)InstantMessageDialog.MessageFromAgent &&
                 im.dialog != (byte)InstantMessageDialog.GroupNotice &&
                 im.dialog != (byte)InstantMessageDialog.GroupInvitation &&
-                im.dialog != (byte)InstantMessageDialog.InventoryOffered)
+                im.dialog != (byte)InstantMessageDialog.InventoryOffered &&
+                im.dialog != (byte)InstantMessageDialog.TaskInventoryOffered)
             {
                 return;
             }
 
-            if (!m_ForwardOfflineGroupMessages)
-            {
-                if (im.dialog == (byte)InstantMessageDialog.GroupNotice ||
-                    im.dialog == (byte)InstantMessageDialog.GroupInvitation)
-                    return;
-            }
-
             Scene scene = FindScene(new UUID(im.fromAgentID));
             if (scene == null)
                 scene = m_SceneList[0];
 
             bool success = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, bool>(
-                    "POST", m_RestURL+"/SaveMessage/", im);
+                    "POST", m_RestURL+"/SaveMessage/?scope=" +
+                    scene.RegionInfo.ScopeID.ToString(), im);
 
             if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent)
             {
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 98285e9..659b178 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -652,4 +652,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             m_assetsLoaded = true;            
         }                 
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index 849449b..f4f9e2d 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -519,6 +519,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 return null;
             }
 
+            return account;
+            /*
             try
             {
                 string encpass = Util.Md5Hash(pass);
@@ -539,6 +541,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 m_log.ErrorFormat("[INVENTORY ARCHIVER]: Could not authenticate password, {0}", e.Message);
                 return null;
             }
+            */
         }
 
         /// <summary>
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index bcb7f42..ae58dfd 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -177,8 +177,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 if (im.binaryBucket.Length < 17) // Invalid
                     return;
             
-                UUID receipientID = new UUID(im.toAgentID);
-                ScenePresence user = scene.GetScenePresence(receipientID);
+                UUID recipientID = new UUID(im.toAgentID);
+                ScenePresence user = scene.GetScenePresence(recipientID);
                 UUID copyID;
 
                 // First byte is the asset type
@@ -193,7 +193,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                             folderID, new UUID(im.toAgentID));
                     
                     InventoryFolderBase folderCopy 
-                        = scene.GiveInventoryFolder(receipientID, client.AgentId, folderID, UUID.Zero);
+                        = scene.GiveInventoryFolder(recipientID, client.AgentId, folderID, UUID.Zero);
                     
                     if (folderCopy == null)
                     {
@@ -246,6 +246,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                     im.imSessionID = itemID.Guid;
                 }
 
+                im.offline = 0;
+
                 // Send the IM to the recipient. The item is already
                 // in their inventory, so it will not be lost if
                 // they are offline.
@@ -265,8 +267,42 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                         });
                 }
             }
-            else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted)
+            else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted ||
+                     im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted)
             {
+                UUID inventoryID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip
+                IInventoryService invService = scene.InventoryService;
+
+                // Special case: folder redirect.
+                // RLV uses this
+                if (im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted)
+                {
+                    InventoryFolderBase folder = new InventoryFolderBase(inventoryID, client.AgentId);
+                    folder = invService.GetFolder(folder);
+
+                    if (folder != null)
+                    {
+                        if (im.binaryBucket.Length >= 16)
+                        {
+                            UUID destFolderID = new UUID(im.binaryBucket, 0);
+                            if (destFolderID != UUID.Zero)
+                            {
+                                InventoryFolderBase destFolder = new InventoryFolderBase(destFolderID, client.AgentId);
+                                destFolder = invService.GetFolder(destFolder);
+                                if (destFolder != null)
+                                {
+                                    if (folder.ParentID != destFolder.ID)
+                                    {
+                                        folder.ParentID = destFolder.ID;
+                                        invService.MoveFolder(folder);
+                                        client.SendBulkUpdateInventory(folder);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
                 ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID));
 
                 if (user != null) // Local
@@ -276,27 +312,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 else
                 {
                     if (m_TransferModule != null)
-                        m_TransferModule.SendInstantMessage(im, delegate(bool success) {
-
-                            // justincc - FIXME: Comment out for now.  This code was added in commit db91044 Mon Aug 22 2011
-                            // and is apparently supposed to fix bulk inventory updates after accepting items.  But
-                            // instead it appears to cause two copies of an accepted folder for the receiving user in
-                            // at least some cases.  Folder/item update is already done when the offer is made (see code above)
-
-//                            // Send BulkUpdateInventory
-//                            IInventoryService invService = scene.InventoryService;
-//                            UUID inventoryEntityID = new UUID(im.imSessionID); // The inventory item /folder, back from it's trip
-//
-//                            InventoryFolderBase folder = new InventoryFolderBase(inventoryEntityID, client.AgentId);
-//                            folder = invService.GetFolder(folder);
-//
-//                            ScenePresence fromUser = scene.GetScenePresence(new UUID(im.fromAgentID));
-//
-//                            // If the user has left the scene by the time the message comes back then we can't send
-//                            // them the update.
-//                            if (fromUser != null)
-//                                fromUser.ControllingClient.SendBulkUpdateInventory(folder);
-                        });
+                        m_TransferModule.SendInstantMessage(im, delegate(bool success) {});
                 }
             }
 
@@ -409,6 +425,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                         previousParentFolderID = folder.ParentID;
                         folder.ParentID = trashFolder.ID;
                         invService.MoveFolder(folder);
+                        client.SendBulkUpdateInventory(folder);
                     }
                 }
                 
@@ -522,22 +539,113 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
         ///
         /// </summary>
         /// <param name="msg"></param>
-        private void OnGridInstantMessage(GridInstantMessage msg)
+        private void OnGridInstantMessage(GridInstantMessage im)
         {
             // Check if this is ours to handle
             //
-            Scene scene = FindClientScene(new UUID(msg.toAgentID));
+            Scene scene = FindClientScene(new UUID(im.toAgentID));
 
             if (scene == null)
                 return;
 
             // Find agent to deliver to
             //
-            ScenePresence user = scene.GetScenePresence(new UUID(msg.toAgentID));
+            ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID));
+            if (user == null)
+                return;
+
+            // This requires a little bit of processing because we have to make the
+            // new item visible in the recipient's inventory here
+            //
+            if (im.dialog == (byte) InstantMessageDialog.InventoryOffered)
+            {
+                if (im.binaryBucket.Length < 17) // Invalid
+                    return;
+            
+                UUID recipientID = new UUID(im.toAgentID);
+
+                // First byte is the asset type
+                AssetType assetType = (AssetType)im.binaryBucket[0];
+                
+                if (AssetType.Folder == assetType)
+                {
+                    UUID folderID = new UUID(im.binaryBucket, 1);
 
-            // Just forward to local handling
-            OnInstantMessage(user.ControllingClient, msg);
+                    InventoryFolderBase given =
+                            new InventoryFolderBase(folderID, recipientID);
+                    InventoryFolderBase folder =
+                            scene.InventoryService.GetFolder(given);
 
+                    if (folder != null)
+                        user.ControllingClient.SendBulkUpdateInventory(folder);
+                }
+                else
+                {
+                    UUID itemID = new UUID(im.binaryBucket, 1);
+
+                    InventoryItemBase given =
+                            new InventoryItemBase(itemID, recipientID);
+                    InventoryItemBase item =
+                            scene.InventoryService.GetItem(given);
+
+                    if (item != null)
+                    {
+                        user.ControllingClient.SendBulkUpdateInventory(item);
+                    }
+                }
+                user.ControllingClient.SendInstantMessage(im);
+            }
+            if (im.dialog == (byte) InstantMessageDialog.TaskInventoryOffered)
+            {
+                if (im.binaryBucket.Length < 1) // Invalid
+                    return;
+            
+                UUID recipientID = new UUID(im.toAgentID);
+
+                // Bucket is the asset type
+                AssetType assetType = (AssetType)im.binaryBucket[0];
+                
+                if (AssetType.Folder == assetType)
+                {
+                    UUID folderID = new UUID(im.imSessionID);
+
+                    InventoryFolderBase given =
+                            new InventoryFolderBase(folderID, recipientID);
+                    InventoryFolderBase folder =
+                            scene.InventoryService.GetFolder(given);
+
+                    if (folder != null)
+                        user.ControllingClient.SendBulkUpdateInventory(folder);
+                }
+                else
+                {
+                    UUID itemID = new UUID(im.imSessionID);
+
+                    InventoryItemBase given =
+                            new InventoryItemBase(itemID, recipientID);
+                    InventoryItemBase item =
+                            scene.InventoryService.GetItem(given);
+
+                    if (item != null)
+                    {
+                        user.ControllingClient.SendBulkUpdateInventory(item);
+                    }
+                }
+
+                // Fix up binary bucket since this may be 17 chars long here
+                Byte[] bucket = new Byte[1];
+                bucket[0] = im.binaryBucket[0];
+                im.binaryBucket = bucket;
+
+                user.ControllingClient.SendInstantMessage(im);
+            }
+            else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted ||
+                     im.dialog == (byte) InstantMessageDialog.InventoryDeclined ||
+                     im.dialog == (byte) InstantMessageDialog.TaskInventoryDeclined ||
+                     im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted)
+            {
+                user.ControllingClient.SendInstantMessage(im);
+            }
         }
     }
 }
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
index e4b0cfa..f3adb95 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
@@ -163,16 +163,29 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
                     scene.RegionInfo.RegionHandle,
                     (uint)presence.AbsolutePosition.X,
                     (uint)presence.AbsolutePosition.Y,
-                    (uint)Math.Ceiling(presence.AbsolutePosition.Z));
+                    (uint)presence.AbsolutePosition.Z + 2);
 
-            m_log.DebugFormat("TP invite with message {0}", message);
+            m_log.DebugFormat("[LURE]: TP invite with message {0}", message);
+
+            GridInstantMessage m;
+
+            if (scene.Permissions.IsAdministrator(client.AgentId) && presence.GodLevel >= 200 && (!scene.Permissions.IsAdministrator(targetid)))
+            {
+                m = new GridInstantMessage(scene, client.AgentId,
+                        client.FirstName+" "+client.LastName, targetid,
+                        (byte)InstantMessageDialog.GodLikeRequestTeleport, false,
+                        message, dest, false, presence.AbsolutePosition,
+                        new Byte[0], true);
+            }
+            else
+            {
+                m = new GridInstantMessage(scene, client.AgentId,
+                        client.FirstName+" "+client.LastName, targetid,
+                        (byte)InstantMessageDialog.RequestTeleport, false,
+                        message, dest, false, presence.AbsolutePosition,
+                        new Byte[0], true);
+            }
 
-            GridInstantMessage m = new GridInstantMessage(scene, client.AgentId,
-                    client.FirstName+" "+client.LastName, targetid,
-                    (byte)InstantMessageDialog.RequestTeleport, false,
-                    message, dest, false, presence.AbsolutePosition,
-                    new Byte[0], true);
-                    
             if (m_TransferModule != null)
             {
                 m_TransferModule.SendInstantMessage(m,
@@ -207,7 +220,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
         {
             // Forward remote teleport requests
             //
-            if (msg.dialog != 22)
+            if (msg.dialog != (byte)InstantMessageDialog.RequestTeleport &&
+                msg.dialog != (byte)InstantMessageDialog.GodLikeRequestTeleport)
                 return;
 
             if (m_TransferModule != null)
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
index 8329af0..7f30e5a 100644
--- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
@@ -102,7 +102,8 @@ namespace OpenSim.Region.CoreModules.Framework
 
         public void CreateCaps(UUID agentId)
         {
-            if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId))
+            int flags = m_scene.GetUserFlags(agentId);
+            if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId, flags))
                 return;
 
             String capsObjectPath = GetCapsPath(agentId);
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 3cb1901..cb09047 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -148,8 +148,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         protected virtual void OnNewClient(IClientAPI client)
         {
-            client.OnTeleportHomeRequest += TeleportHome;
+            client.OnTeleportHomeRequest += TriggerTeleportHome;
             client.OnTeleportLandmarkRequest += RequestTeleportLandmark;
+            client.OnTeleportCancel += TeleportCancel;
         }
 
         public virtual void Close() {}
@@ -222,7 +223,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// <param name="sp"></param>
         /// <param name="position"></param>
         /// <param name="lookAt"></param>
-        /// <param name="teleportFlags"></param
+        /// <param name="teleportFlags"></param>
         private void TeleportAgentWithinRegion(ScenePresence sp, Vector3 position, Vector3 lookAt, uint teleportFlags)
         {
             m_log.DebugFormat(
@@ -266,11 +267,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 position.Z = newPosZ;
             }
 
+            if (sp.Flying)
+                teleportFlags |= (uint)TeleportFlags.IsFlying;
+
             m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.Transferring);
 
             sp.ControllingClient.SendTeleportStart(teleportFlags);
 
             sp.ControllingClient.SendLocalTeleport(position, lookAt, teleportFlags);
+            sp.TeleportFlags = (Constants.TeleportFlags)teleportFlags;
             sp.Velocity = Vector3.Zero;
             sp.Teleport(position);
 
@@ -397,14 +402,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         {
             // Record that this agent is in transit so that we can prevent simultaneous requests and do later detection
             // of whether the destination region completes the teleport.
-            if (!m_entityTransferStateMachine.SetInTransit(sp.UUID))
-            {
-                m_log.DebugFormat(
-                    "[ENTITY TRANSFER MODULE]: Ignoring teleport request of {0} {1} to {2} ({3}) {4}/{5} - agent is already in transit.",
-                    sp.Name, sp.UUID, reg.ServerURI, finalDestination.ServerURI, finalDestination.RegionName, position);
-
-                return;
-            }
+            m_entityTransferStateMachine.SetInTransit(sp.UUID);
+//            if (!m_entityTransferStateMachine.SetInTransit(sp.UUID))
+//            {
+//                m_log.DebugFormat(
+//                    "[ENTITY TRANSFER MODULE]: Ignoring teleport request of {0} {1} to {2} ({3}) {4}/{5} - agent is already in transit.",
+//                    sp.Name, sp.UUID, reg.ServerURI, finalDestination.ServerURI, finalDestination.RegionName, position);
+//
+//                return;
+//            }
 
             if (reg == null || finalDestination == null)
             {
@@ -446,8 +452,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // This may be a costly operation. The reg.ExternalEndPoint field is not a passive field,
             // it's actually doing a lot of work.
             IPEndPoint endPoint = finalDestination.ExternalEndPoint;
-
-            if (endPoint.Address == null)
+            if (endPoint == null || endPoint.Address == null)
             {
                 sp.ControllingClient.SendTeleportFailed("Remote Region appears to be down");
                 m_entityTransferStateMachine.ResetFromTransit(sp.UUID);
@@ -487,6 +492,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // both regions
             if (sp.ParentID != (uint)0)
                 sp.StandUp();
+            else if (sp.Flying)
+                teleportFlags |= (uint)TeleportFlags.IsFlying;
 
             // At least on LL 3.3.4, this is not strictly necessary - a teleport will succeed without sending this to
             // the viewer.  However, it might mean that the viewer does not see the black teleport screen (untested).
@@ -664,7 +671,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 //
                 // This sleep can be increased if necessary.  However, whilst it's active,
                 // an agent cannot teleport back to this region if it has teleported away.
-                Thread.Sleep(2000);
+                Thread.Sleep(3000);
 
                 sp.Scene.IncomingCloseAgent(sp.UUID, false);
             }
@@ -804,7 +811,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         #region Teleport Home
 
-        public virtual void TeleportHome(UUID id, IClientAPI client)
+        public virtual void TriggerTeleportHome(UUID id, IClientAPI client)
+        {
+            TeleportHome(id, client);
+        }
+
+        public virtual bool TeleportHome(UUID id, IClientAPI client)
         {
             m_log.DebugFormat(
                 "[ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.Name, client.AgentId);
@@ -814,12 +826,18 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             if (uinfo != null)
             {
+                if (uinfo.HomeRegionID == UUID.Zero)
+                {
+                    // can't find the Home region: Tell viewer and abort
+                    client.SendTeleportFailed("You don't have a home position set.");
+                    return false;
+                }
                 GridRegion regionInfo = Scene.GridService.GetRegionByUUID(UUID.Zero, uinfo.HomeRegionID);
                 if (regionInfo == null)
                 {
                     // can't find the Home region: Tell viewer and abort
                     client.SendTeleportFailed("Your home region could not be found.");
-                    return;
+                    return false;
                 }
                 
                 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Home region of {0} is {1} ({2}-{3})",
@@ -832,10 +850,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
             else
             {
-                m_log.ErrorFormat(
-                    "[ENTITY TRANSFER MODULE]: No grid user information found for {0} {1}.  Cannot send home.",
-                    client.Name, client.AgentId);
+                // can't find the Home region: Tell viewer and abort
+                client.SendTeleportFailed("Your home region could not be found.");
+                return false;
             }
+            return true;
         }
 
         #endregion
@@ -843,11 +862,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         #region Agent Crossings
 
-        public bool Cross(ScenePresence agent, bool isFlying)
+        public GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out uint xDest, out uint yDest, out string version, out Vector3 newpos)
         {
-            Scene scene = agent.Scene;
-            Vector3 pos = agent.AbsolutePosition;
-            Vector3 newpos = new Vector3(pos.X, pos.Y, pos.Z);
+            version = String.Empty;
+            newpos = new Vector3(pos.X, pos.Y, pos.Z);
             uint neighbourx = scene.RegionInfo.RegionLocX;
             uint neighboury = scene.RegionInfo.RegionLocY;
             const float boundaryDistance = 1.7f;
@@ -868,52 +886,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 }
                 else if (scene.TestBorderCross(pos + southCross, Cardinals.S))
                 {
-                    Border b = scene.GetCrossedBorder(pos + southCross, Cardinals.S);
-                    if (b.TriggerRegionX == 0 && b.TriggerRegionY == 0)
-                    {
-                        neighboury--;
-                        newpos.Y = Constants.RegionSize - enterDistance;
-                    }
-                    else
-                    {
-                        agent.IsInTransit = true;
-
-                        neighboury = b.TriggerRegionY;
-                        neighbourx = b.TriggerRegionX;
-
-                        Vector3 newposition = pos;
-                        newposition.X += (scene.RegionInfo.RegionLocX - neighbourx) * Constants.RegionSize;
-                        newposition.Y += (scene.RegionInfo.RegionLocY - neighboury) * Constants.RegionSize;
-                        agent.ControllingClient.SendAgentAlertMessage(
-                            String.Format("Moving you to region {0},{1}", neighbourx, neighboury), false);
-                        InformClientToInitateTeleportToLocation(agent, neighbourx, neighboury, newposition, scene);
-                        return true;
-                    }
-                }
-
-                Border ba = scene.GetCrossedBorder(pos + westCross, Cardinals.W);
-                if (ba.TriggerRegionX == 0 && ba.TriggerRegionY == 0)
-                {
-                    neighbourx--;
-                    newpos.X = Constants.RegionSize - enterDistance;
-                }
-                else
-                {
-                    agent.IsInTransit = true;
-
-                    neighboury = ba.TriggerRegionY;
-                    neighbourx = ba.TriggerRegionX;
-
-                    Vector3 newposition = pos;
-                    newposition.X += (scene.RegionInfo.RegionLocX - neighbourx) * Constants.RegionSize;
-                    newposition.Y += (scene.RegionInfo.RegionLocY - neighboury) * Constants.RegionSize;
-                    agent.ControllingClient.SendAgentAlertMessage(
-                            String.Format("Moving you to region {0},{1}", neighbourx, neighboury), false);
-                    InformClientToInitateTeleportToLocation(agent, neighbourx, neighboury, newposition, scene);
-
-                    return true;
+                    neighboury--;
+                    newpos.Y = Constants.RegionSize - enterDistance;
                 }
 
+                neighbourx--;
+                newpos.X = Constants.RegionSize - enterDistance;
             }
             else if (scene.TestBorderCross(pos + eastCross, Cardinals.E))
             {
@@ -923,26 +901,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                 if (scene.TestBorderCross(pos + southCross, Cardinals.S))
                 {
-                    Border ba = scene.GetCrossedBorder(pos + southCross, Cardinals.S);
-                    if (ba.TriggerRegionX == 0 && ba.TriggerRegionY == 0)
-                    {
-                        neighboury--;
-                        newpos.Y = Constants.RegionSize - enterDistance;
-                    }
-                    else
-                    {
-                        agent.IsInTransit = true;
-
-                        neighboury = ba.TriggerRegionY;
-                        neighbourx = ba.TriggerRegionX;
-                        Vector3 newposition = pos;
-                        newposition.X += (scene.RegionInfo.RegionLocX - neighbourx) * Constants.RegionSize;
-                        newposition.Y += (scene.RegionInfo.RegionLocY - neighboury) * Constants.RegionSize;
-                        agent.ControllingClient.SendAgentAlertMessage(
-                            String.Format("Moving you to region {0},{1}", neighbourx, neighboury), false);
-                        InformClientToInitateTeleportToLocation(agent, neighbourx, neighboury, newposition, scene);
-                        return true;
-                    }
+                    neighboury--;
+                    newpos.Y = Constants.RegionSize - enterDistance;
                 }
                 else if (scene.TestBorderCross(pos + northCross, Cardinals.N))
                 {
@@ -954,25 +914,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             else if (scene.TestBorderCross(pos + southCross, Cardinals.S))
             {
                 Border b = scene.GetCrossedBorder(pos + southCross, Cardinals.S);
-                if (b.TriggerRegionX == 0 && b.TriggerRegionY == 0)
-                {
-                    neighboury--;
-                    newpos.Y = Constants.RegionSize - enterDistance;
-                }
-                else
-                {
-                    agent.IsInTransit = true;
-
-                    neighboury = b.TriggerRegionY;
-                    neighbourx = b.TriggerRegionX;
-                    Vector3 newposition = pos;
-                    newposition.X += (scene.RegionInfo.RegionLocX - neighbourx) * Constants.RegionSize;
-                    newposition.Y += (scene.RegionInfo.RegionLocY - neighboury) * Constants.RegionSize;
-                    agent.ControllingClient.SendAgentAlertMessage(
-                            String.Format("Moving you to region {0},{1}", neighbourx, neighboury), false);
-                    InformClientToInitateTeleportToLocation(agent, neighbourx, neighboury, newposition, scene);
-                    return true;
-                }
+                neighboury--;
+                newpos.Y = Constants.RegionSize - enterDistance;
             }
             else if (scene.TestBorderCross(pos + northCross, Cardinals.N))
             {
@@ -1006,19 +949,22 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
             */
 
-            ulong neighbourHandle = Utils.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize));
+            xDest = neighbourx;
+            yDest = neighboury;
 
             int x = (int)(neighbourx * Constants.RegionSize), y = (int)(neighboury * Constants.RegionSize);
 
+            ulong neighbourHandle = Utils.UIntsToLong((uint)x, (uint)y);
+
             ExpiringCache<ulong, DateTime> r;
             DateTime banUntil;
 
-            if (m_bannedRegions.TryGetValue(agent.ControllingClient.AgentId, out r))
+            if (m_bannedRegions.TryGetValue(agentID, out r))
             {
                 if (r.TryGetValue(neighbourHandle, out banUntil))
                 {
                     if (DateTime.Now < banUntil)
-                        return false;
+                        return null;
                     r.Remove(neighbourHandle);
                 }
             }
@@ -1030,28 +976,48 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             GridRegion neighbourRegion = scene.GridService.GetRegionByPosition(scene.RegionInfo.ScopeID, (int)x, (int)y);
 
             string reason;
-            string version;
-            if (!scene.SimulationService.QueryAccess(neighbourRegion, agent.ControllingClient.AgentId, newpos, out version, out reason))
+            if (!scene.SimulationService.QueryAccess(neighbourRegion, agentID, newpos, out version, out reason))
             {
-                agent.ControllingClient.SendAlertMessage("Cannot region cross into banned parcel");
                 if (r == null)
                 {
                     r = new ExpiringCache<ulong, DateTime>();
                     r.Add(neighbourHandle, DateTime.Now + TimeSpan.FromSeconds(15), TimeSpan.FromSeconds(15));
 
-                    m_bannedRegions.Add(agent.ControllingClient.AgentId, r, TimeSpan.FromSeconds(45));
+                    m_bannedRegions.Add(agentID, r, TimeSpan.FromSeconds(45));
                 }
                 else
                 {
                     r.Add(neighbourHandle, DateTime.Now + TimeSpan.FromSeconds(15), TimeSpan.FromSeconds(15));
                 }
+                return null;
+            }
+
+            return neighbourRegion;
+        }
+
+        private void TeleportCancel(IClientAPI remoteClient)
+        {
+            m_entityTransferStateMachine.ResetFromTransit(remoteClient.AgentId);
+        }
+
+        public bool Cross(ScenePresence agent, bool isFlying)
+        {
+            uint x;
+            uint y;
+            Vector3 newpos;
+            string version;
+
+            GridRegion neighbourRegion = GetDestination(agent.Scene, agent.UUID, agent.AbsolutePosition, out x, out y, out version, out newpos);
+            if (neighbourRegion == null)
+            {
+                agent.ControllingClient.SendAlertMessage("Cannot region cross into banned parcel");
                 return false;
             }
 
             agent.IsInTransit = true;
 
             CrossAgentToNewRegionDelegate d = CrossAgentToNewRegionAsync;
-            d.BeginInvoke(agent, newpos, neighbourx, neighboury, neighbourRegion, isFlying, version, CrossAgentToNewRegionCompleted, d);
+            d.BeginInvoke(agent, newpos, neighbourRegion, isFlying, version, CrossAgentToNewRegionCompleted, d);
 
             return true;
         }
@@ -1120,44 +1086,43 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             icon.EndInvoke(iar);
         }
 
-        public delegate ScenePresence CrossAgentToNewRegionDelegate(ScenePresence agent, Vector3 pos, uint neighbourx, uint neighboury, GridRegion neighbourRegion, bool isFlying, string version);
+        public bool CrossAgentToNewRegionPrep(ScenePresence agent, GridRegion neighbourRegion)
+        {
+            if (neighbourRegion == null)
+                return false;
+            
+            m_entityTransferStateMachine.SetInTransit(agent.UUID);
+
+            agent.RemoveFromPhysicalScene();
+
+            return true;
+        }
 
         /// <summary>
         /// This Closes child agents on neighbouring regions
         /// Calls an asynchronous method to do so..  so it doesn't lag the sim.
         /// </summary>
-        protected ScenePresence CrossAgentToNewRegionAsync(
-            ScenePresence agent, Vector3 pos, uint neighbourx, uint neighboury, GridRegion neighbourRegion,
+        public ScenePresence CrossAgentToNewRegionAsync(
+            ScenePresence agent, Vector3 pos, GridRegion neighbourRegion,
             bool isFlying, string version)
         {
-            if (neighbourRegion == null)
+            if (!CrossAgentToNewRegionPrep(agent, neighbourRegion))
                 return agent;
 
-            try
-            {
-                m_entityTransferStateMachine.SetInTransit(agent.UUID);
-
-                ulong neighbourHandle = Utils.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize));
-    
-                m_log.DebugFormat(
-                    "[ENTITY TRANSFER MODULE]: Crossing agent {0} {1} to {2}-{3} running version {4}",
-                    agent.Firstname, agent.Lastname, neighbourx, neighboury, version);
-    
-                Scene m_scene = agent.Scene;
-
-                if (!agent.ValidateAttachments())
-                    m_log.DebugFormat(
-                        "[ENTITY TRANSFER MODULE]: Failed validation of all attachments for region crossing of {0} from {1} to {2}.  Continuing.",
-                        agent.Name, agent.Scene.RegionInfo.RegionName, neighbourRegion.RegionName);
-
-                pos = pos + agent.Velocity;
-                Vector3 vel2 = new Vector3(agent.Velocity.X, agent.Velocity.Y, 0);
+            if (!CrossAgentIntoNewRegionMain(agent, pos, neighbourRegion, isFlying))
+                return agent;
 
-                agent.RemoveFromPhysicalScene();
+            CrossAgentToNewRegionPost(agent, pos, neighbourRegion, isFlying, version);
+            return agent;
+        }
 
+        public bool CrossAgentIntoNewRegionMain(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying)
+        {
+            try
+            {
                 AgentData cAgent = new AgentData(); 
                 agent.CopyTo(cAgent);
-                cAgent.Position = pos;
+                cAgent.Position = pos + agent.Velocity;
                 if (isFlying)
                     cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY;
 
@@ -1167,7 +1132,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 // Beyond this point, extra cleanup is needed beyond removing transit state
                 m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.Transferring);
 
-                if (!m_scene.SimulationService.UpdateAgent(neighbourRegion, cAgent))
+                if (!agent.Scene.SimulationService.UpdateAgent(neighbourRegion, cAgent))
                 {
                     // region doesn't take it
                     m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.CleaningUp);
@@ -1176,93 +1141,108 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     agent.AddToPhysicalScene(isFlying);
                     m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
 
-                    return agent;
+                    return false;
                 }
 
-                //AgentCircuitData circuitdata = m_controllingClient.RequestClientInfo();
-                agent.ControllingClient.RequestClientInfo();
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat(
+                    "[ENTITY TRANSFER MODULE]: Problem crossing user {0} to new region {1} from {2}.  Exception {3}{4}",
+                    agent.Name, neighbourRegion.RegionName, agent.Scene.RegionInfo.RegionName, e.Message, e.StackTrace);
+
+                // TODO: Might be worth attempting other restoration here such as reinstantiation of scripts, etc.
+                return false;
+            }
 
-                //m_log.Debug("BEFORE CROSS");
-                //Scene.DumpChildrenSeeds(UUID);
-                //DumpKnownRegions();
-                string agentcaps;
-                if (!agent.KnownRegions.TryGetValue(neighbourRegion.RegionHandle, out agentcaps))
-                {
-                    m_log.ErrorFormat("[ENTITY TRANSFER MODULE]: No ENTITY TRANSFER MODULE information for region handle {0}, exiting CrossToNewRegion.",
-                                     neighbourRegion.RegionHandle);
-                    return agent;
-                }
-                // No turning back
-                agent.IsChildAgent = true;
+            return true;
+        }
 
-                string capsPath = neighbourRegion.ServerURI + CapsUtil.GetCapsSeedPath(agentcaps);
+        public void CrossAgentToNewRegionPost(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion,
+            bool isFlying, string version)
+        {
+            agent.ControllingClient.RequestClientInfo();
 
-                m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID);
+            string agentcaps;
+            if (!agent.KnownRegions.TryGetValue(neighbourRegion.RegionHandle, out agentcaps))
+            {
+                m_log.ErrorFormat("[ENTITY TRANSFER MODULE]: No ENTITY TRANSFER MODULE information for region handle {0}, exiting CrossToNewRegion.",
+                                 neighbourRegion.RegionHandle);
+                return;
+            }
 
-                if (m_eqModule != null)
-                {
-                    m_eqModule.CrossRegion(
-                        neighbourHandle, pos, vel2 /* agent.Velocity */, neighbourRegion.ExternalEndPoint,
-                        capsPath, agent.UUID, agent.ControllingClient.SessionId);
-                }
-                else
-                {
-                    agent.ControllingClient.CrossRegion(neighbourHandle, pos, agent.Velocity, neighbourRegion.ExternalEndPoint,
-                                                capsPath);
-                }
+            // No turning back
+            agent.IsChildAgent = true;
 
-                // SUCCESS!
-                m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.ReceivedAtDestination);
+            string capsPath = neighbourRegion.ServerURI + CapsUtil.GetCapsSeedPath(agentcaps);
 
-                // Unlike a teleport, here we do not wait for the destination region to confirm the receipt.
-                m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.CleaningUp);
+            m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID);
 
-                agent.MakeChildAgent();
+            Vector3 vel2 = new Vector3(agent.Velocity.X, agent.Velocity.Y, 0);
 
-                // FIXME: Possibly this should occur lower down after other commands to close other agents,
-                // but not sure yet what the side effects would be.
-                m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
+            if (m_eqModule != null)
+            {
+                m_eqModule.CrossRegion(
+                    neighbourRegion.RegionHandle, pos + agent.Velocity, vel2 /* agent.Velocity */, neighbourRegion.ExternalEndPoint,
+                    capsPath, agent.UUID, agent.ControllingClient.SessionId);
+            }
+            else
+            {
+                agent.ControllingClient.CrossRegion(neighbourRegion.RegionHandle, pos + agent.Velocity, agent.Velocity, neighbourRegion.ExternalEndPoint,
+                                            capsPath);
+            }
 
-                // now we have a child agent in this region. Request all interesting data about other (root) agents
-                agent.SendOtherAgentsAvatarDataToMe();
-                agent.SendOtherAgentsAppearanceToMe();
+            // SUCCESS!
+            m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.ReceivedAtDestination);
 
-                // Backwards compatibility. Best effort
-                if (version == "Unknown" || version == string.Empty)
-                {
-                    m_log.DebugFormat("[ENTITY TRANSFER MODULE]: neighbor with old version, passing attachments one by one...");
-                    Thread.Sleep(3000); // wait a little now that we're not waiting for the callback
-                    CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true);
-                }
+            // Unlike a teleport, here we do not wait for the destination region to confirm the receipt.
+            m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.CleaningUp);
 
-                // Next, let's close the child agent connections that are too far away.
-                agent.CloseChildAgents(neighbourx, neighboury);
+            agent.MakeChildAgent();
 
-                AgentHasMovedAway(agent, false);
+            // FIXME: Possibly this should occur lower down after other commands to close other agents,
+            // but not sure yet what the side effects would be.
+            m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
 
-//                // the user may change their profile information in other region,
-//                // so the userinfo in UserProfileCache is not reliable any more, delete it
-//                // REFACTORING PROBLEM. Well, not a problem, but this method is HORRIBLE!
-//                if (agent.Scene.NeedSceneCacheClear(agent.UUID))
-//                {
-//                    m_log.DebugFormat(
-//                        "[ENTITY TRANSFER MODULE]: User {0} is going to another region", agent.UUID);
-//                }
-    
-                //m_log.Debug("AFTER CROSS");
-                //Scene.DumpChildrenSeeds(UUID);
-                //DumpKnownRegions();
-            }
-            catch (Exception e)
-            {
-                m_log.ErrorFormat(
-                    "[ENTITY TRANSFER MODULE]: Problem crossing user {0} to new region {1} from {2}.  Exception {3}{4}",
-                    agent.Name, neighbourRegion.RegionName, agent.Scene.RegionInfo.RegionName, e.Message, e.StackTrace);
+            // now we have a child agent in this region. Request all interesting data about other (root) agents
+            agent.SendOtherAgentsAvatarDataToMe();
+            agent.SendOtherAgentsAppearanceToMe();
 
-                // TODO: Might be worth attempting other restoration here such as reinstantiation of scripts, etc.
+            // Backwards compatibility. Best effort
+            if (version == "Unknown" || version == string.Empty)
+            {
+                m_log.DebugFormat("[ENTITY TRANSFER MODULE]: neighbor with old version, passing attachments one by one...");
+                Thread.Sleep(3000); // wait a little now that we're not waiting for the callback
+                CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true);
             }
 
-            return agent;
+            // Next, let's close the child agent connections that are too far away.
+            uint neighbourx;
+            uint neighboury;
+
+            Utils.LongToUInts(neighbourRegion.RegionHandle, out neighbourx, out neighboury);
+
+            neighbourx /= Constants.RegionSize;
+            neighboury /= Constants.RegionSize;
+
+            agent.CloseChildAgents(neighbourx, neighboury);
+
+            AgentHasMovedAway(agent, false);
+
+            // the user may change their profile information in other region,
+            // so the userinfo in UserProfileCache is not reliable any more, delete it
+            // REFACTORING PROBLEM. Well, not a problem, but this method is HORRIBLE!
+//            if (agent.Scene.NeedSceneCacheClear(agent.UUID))
+//            {
+//                m_log.DebugFormat(
+//                    "[ENTITY TRANSFER MODULE]: User {0} is going to another region", agent.UUID);
+//            }
+
+            //m_log.Debug("AFTER CROSS");
+            //Scene.DumpChildrenSeeds(UUID);
+            //DumpKnownRegions();
+
+            return;
         }
          
         private void CrossAgentToNewRegionCompleted(IAsyncResult iar)
@@ -1333,10 +1313,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 agent.Id0 = currentAgentCircuit.Id0;
             }
 
-            InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
-            d.BeginInvoke(sp, agent, region, region.ExternalEndPoint, true,
+            IPEndPoint external = region.ExternalEndPoint;
+            if (external != null)
+            {
+                InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
+                d.BeginInvoke(sp, agent, region, external, true,
                           InformClientOfNeighbourCompleted,
                           d);
+            }
         }
         #endregion
 
@@ -1917,27 +1901,31 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             Utils.LongToUInts(newRegionHandle, out x, out y);
             GridRegion destination = scene.GridService.GetRegionByPosition(scene.RegionInfo.ScopeID, (int)x, (int)y);
 
-            if (destination == null || !CrossPrimGroupIntoNewRegion(destination, pos, grp, silent))
+            if (destination != null)
             {
-                m_log.InfoFormat("[ENTITY TRANSFER MODULE] cross region transfer failed for object {0}",grp.UUID);
+                if (CrossPrimGroupIntoNewRegion(destination, pos, grp, silent))
+                    return; // we did it
+            }
 
-                // We are going to move the object back to the old position so long as the old position
-                // is in the region
-                oldGroupPosition.X = Util.Clamp<float>(oldGroupPosition.X,1.0f,(float)Constants.RegionSize-1);
-                oldGroupPosition.Y = Util.Clamp<float>(oldGroupPosition.Y,1.0f,(float)Constants.RegionSize-1);
-                oldGroupPosition.Z = Util.Clamp<float>(oldGroupPosition.Z,1.0f,4096.0f);
+            // no one or failed lets go back and tell physics to go on
+            oldGroupPosition.X = Util.Clamp<float>(oldGroupPosition.X, 0.5f, (float)Constants.RegionSize - 0.5f);
+            oldGroupPosition.Y = Util.Clamp<float>(oldGroupPosition.Y, 0.5f, (float)Constants.RegionSize - 0.5f);
+            oldGroupPosition.Z = Util.Clamp<float>(oldGroupPosition.Z, 0.5f, 4096.0f);
 
-                grp.RootPart.GroupPosition = oldGroupPosition;
+            grp.AbsolutePosition = oldGroupPosition;
+            grp.Velocity = Vector3.Zero;
 
-                // Need to turn off the physics flags, otherwise the object will continue to attempt to
-                // move out of the region creating an infinite loop of failed attempts to cross
-                grp.UpdatePrimFlags(grp.RootPart.LocalId,false,grp.IsTemporary,grp.IsPhantom,false);
+            if (grp.RootPart.PhysActor != null)
+                grp.RootPart.PhysActor.CrossingFailure();
 
-                grp.ScheduleGroupForFullUpdate();
-            }
+            if (grp.RootPart.KeyframeMotion != null)
+                grp.RootPart.KeyframeMotion.CrossingFailure();
+
+            grp.ScheduleGroupForFullUpdate();
         }
 
 
+
         /// <summary>
         /// Move the given scene object into a new region
         /// </summary>
@@ -1988,17 +1976,30 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                             grp, e);
                     }
                 }
+/*
+ * done on caller ( not in attachments crossing for now)
                 else
                 {
+
                     if (!grp.IsDeleted)
                     {
                         PhysicsActor pa = grp.RootPart.PhysActor;
                         if (pa != null)
+                        {
                             pa.CrossingFailure();
+                            if (grp.RootPart.KeyframeMotion != null)
+                            {
+                                // moved to KeyframeMotion.CrossingFailure
+//                                grp.RootPart.Velocity = Vector3.Zero;
+                                grp.RootPart.KeyframeMotion.CrossingFailure();
+//                                grp.SendGroupRootTerseUpdate();
+                            }
+                        }
                     }
 
                     m_log.ErrorFormat("[ENTITY TRANSFER MODULE]: Prim crossing failed for {0}", grp);
                 }
+ */
             }
             else
             {
@@ -2083,4 +2084,4 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         #endregion
 
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs
index d0cab49..70dd1bc 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs
@@ -218,7 +218,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                             id, m_mod.Scene.RegionInfo.RegionName, currentState));
             }
 
-            int count = 200;
+            int count = 400;
 
             // There should be no race condition here since no other code should be removing the agent transfer or
             // changing the state to another other than Transferring => ReceivedAtDestination.
@@ -266,4 +266,4 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index b188741..9b78b3b 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -184,7 +184,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         protected override void OnNewClient(IClientAPI client)
         {
-            client.OnTeleportHomeRequest += TeleportHome;
+            client.OnTeleportHomeRequest += TriggerTeleportHome;
             client.OnTeleportLandmarkRequest += RequestTeleportLandmark;
             client.OnConnectionClosed += new Action<IClientAPI>(OnConnectionClosed);
         }
@@ -291,6 +291,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             return base.CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, out reason, out logout);
         }
 
+        public void TriggerTeleportHome(UUID id, IClientAPI client)
+        {
+            TeleportHome(id, client);
+        }
+
         protected override bool ValidateGenericConditions(ScenePresence sp, GridRegion reg, GridRegion finalDestination, uint teleportFlags, out string reason)
         {
             reason = "Please wear your grid's allowed appearance before teleporting to another grid";
@@ -409,7 +414,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         //    return base.UpdateAgent(reg, finalDestination, agentData, sp);
         //}
 
-        public override void TeleportHome(UUID id, IClientAPI client)
+        public override bool TeleportHome(UUID id, IClientAPI client)
         {
             m_log.DebugFormat(
                 "[ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.Name, client.AgentId);
@@ -420,8 +425,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 // local grid user
                 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: User is local");
-                base.TeleportHome(id, client);
-                return;
+                return base.TeleportHome(id, client);
             }
 
             // Foreign user wants to go home
@@ -431,7 +435,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 client.SendTeleportFailed("Your information has been lost");
                 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Unable to locate agent's gateway information");
-                return;
+                return false;
             }
 
             IUserAgentService userAgentService = new UserAgentServiceConnector(aCircuit.ServiceURLs["HomeURI"].ToString());
@@ -441,7 +445,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 client.SendTeleportFailed("Your home region could not be found");
                 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Agent's home region not found");
-                return;
+                return false;
             }
 
             ScenePresence sp = ((Scene)(client.Scene)).GetScenePresence(client.AgentId);
@@ -449,7 +453,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             {
                 client.SendTeleportFailed("Internal error");
                 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Agent not found in the scene where it is supposed to be");
-                return;
+                return false;
             }
 
             GridRegion homeGatekeeper = MakeRegion(aCircuit);
@@ -457,9 +461,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: teleporting user {0} {1} home to {2} via {3}:{4}",
                 aCircuit.firstname, aCircuit.lastname, finalDestination.RegionName, homeGatekeeper.ServerURI, homeGatekeeper.RegionName);
 
-            DoTeleport(
-                sp, homeGatekeeper, finalDestination,
-                position, lookAt, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome));
+            DoTeleport(sp, homeGatekeeper, finalDestination, position, lookAt, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome));
+            return true;
         }
 
         /// <summary>
@@ -586,4 +589,4 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             return region;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 8b7c16e..6e5a4a5 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -182,44 +182,49 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             if (!m_Scene.Permissions.CanCreateUserInventory(invType, remoteClient.AgentId))
                 return;
 
-            if (transactionID == UUID.Zero)
+            InventoryFolderBase f = new InventoryFolderBase(folderID, remoteClient.AgentId);
+            InventoryFolderBase folder = m_Scene.InventoryService.GetFolder(f);
+
+            if (folder == null || folder.Owner != remoteClient.AgentId)
+                return;
+
+            if (transactionID != UUID.Zero)
             {
-                ScenePresence presence;
-                if (m_Scene.TryGetScenePresence(remoteClient.AgentId, out presence))
+                IAgentAssetTransactions agentTransactions = m_Scene.AgentTransactionsModule;
+                if (agentTransactions != null)
                 {
-                    byte[] data = null;
+                    if (agentTransactions.HandleItemCreationFromTransaction(
+                        remoteClient, transactionID, folderID, callbackID, description,
+                        name, invType, assetType, wearableType, nextOwnerMask))
+                        return;
+                }
+            }
 
-                    if (invType == (sbyte)InventoryType.Landmark && presence != null)
-                    {
-                        string suffix = string.Empty, prefix = string.Empty;
-                        string strdata = GenerateLandmark(presence, out prefix, out suffix);
-                        data = Encoding.ASCII.GetBytes(strdata);
-                        name = prefix + name;
-                        description += suffix;
-                    }
+            ScenePresence presence;
+            if (m_Scene.TryGetScenePresence(remoteClient.AgentId, out presence))
+            {
+                byte[] data = null;
 
-                    AssetBase asset = m_Scene.CreateAsset(name, description, assetType, data, remoteClient.AgentId);
-                    m_Scene.AssetService.Store(asset);
-                    m_Scene.CreateNewInventoryItem(
-                        remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID,
-                        name, description, 0, callbackID, asset, invType, nextOwnerMask, creationDate);
-                }
-                else
+                if (invType == (sbyte)InventoryType.Landmark && presence != null)
                 {
-                    m_log.ErrorFormat(
-                        "[INVENTORY ACCESS MODULE]: ScenePresence for agent uuid {0} unexpectedly not found in CreateNewInventoryItem",
-                        remoteClient.AgentId);
+                    string suffix = string.Empty, prefix = string.Empty;
+                    string strdata = GenerateLandmark(presence, out prefix, out suffix);
+                    data = Encoding.ASCII.GetBytes(strdata);
+                    name = prefix + name;
+                    description += suffix;
                 }
+
+                AssetBase asset = m_Scene.CreateAsset(name, description, assetType, data, remoteClient.AgentId);
+                m_Scene.AssetService.Store(asset);
+                m_Scene.CreateNewInventoryItem(
+                    remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID,
+                    name, description, 0, callbackID, asset, invType, nextOwnerMask, creationDate,transactionID);
             }
             else
             {
-                IAgentAssetTransactions agentTransactions = m_Scene.AgentTransactionsModule;
-                if (agentTransactions != null)
-                {
-                    agentTransactions.HandleItemCreationFromTransaction(
-                        remoteClient, transactionID, folderID, callbackID, description,
-                        name, invType, assetType, wearableType, nextOwnerMask);
-                }
+                m_log.ErrorFormat(
+                    "[INVENTORY ACCESS MODULE]: ScenePresence for agent uuid {0} unexpectedly not found in CreateNewInventoryItem",
+                    remoteClient.AgentId);
             }
         }
 
@@ -356,6 +361,12 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
             foreach (SceneObjectGroup objectGroup in objlist)
             {
+                if (objectGroup.RootPart.KeyframeMotion != null)
+                    objectGroup.RootPart.KeyframeMotion.Stop();
+                objectGroup.RootPart.SetForce(Vector3.Zero);
+                objectGroup.RootPart.SetAngularImpulse(Vector3.Zero, false);
+                objectGroup.RootPart.KeyframeMotion = null;
+
                 Vector3 inventoryStoredPosition = new Vector3
                             (((objectGroup.AbsolutePosition.X > (int)Constants.RegionSize)
                                   ? 250
@@ -366,9 +377,19 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                                  : objectGroup.AbsolutePosition.Y,
                              objectGroup.AbsolutePosition.Z);
 
+                Quaternion inventoryStoredRotation = objectGroup.GroupRotation;
                 originalPositions[objectGroup.UUID] = objectGroup.AbsolutePosition;
 
+                // Restore attachment data after trip through the sim
+                if (objectGroup.RootPart.AttachPoint > 0)
+                {
+                    inventoryStoredPosition = objectGroup.RootPart.AttachOffset;
+                    inventoryStoredRotation = objectGroup.RootPart.AttachRotation;
+                }
+                objectGroup.RootPart.Shape.State = objectGroup.RootPart.AttachPoint;
+
                 objectGroup.AbsolutePosition = inventoryStoredPosition;
+                objectGroup.RootPart.RotationOffset = inventoryStoredRotation;
 
                 // Make sure all bits but the ones we want are clear
                 // on take.
@@ -486,8 +507,17 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             IClientAPI remoteClient)
         {
             uint effectivePerms = (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify | PermissionMask.Move) | 7;
+            // For the porposes of inventory, an object is modify if the prims
+            // are modify. This allows renaming an object that contains no
+            // mod items.
             foreach (SceneObjectGroup grp in objsForEffectivePermissions)
-                effectivePerms &= grp.GetEffectivePermissions();
+            {
+                uint groupPerms = grp.GetEffectivePermissions(true);
+                if ((grp.RootPart.BaseMask & (uint)PermissionMask.Modify) != 0)
+                    groupPerms |= (uint)PermissionMask.Modify;
+
+                effectivePerms &= groupPerms;
+            }
             effectivePerms |= (uint)PermissionMask.Move;
 
             if (remoteClient != null && (remoteClient.AgentId != so.RootPart.OwnerID) && m_Scene.Permissions.PropagatePermissions())
@@ -666,7 +696,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     if (so.FromFolderID != UUID.Zero && userID == remoteClient.AgentId)
                     {
                         InventoryFolderBase f = new InventoryFolderBase(so.FromFolderID, userID);
-                        folder = m_Scene.InventoryService.GetFolder(f);
+                        if (f != null)
+                            folder = m_Scene.InventoryService.GetFolder(f);
                     }
                 }
 
@@ -696,16 +727,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
         {
 //            m_log.DebugFormat("[INVENTORY ACCESS MODULE]: RezObject for {0}, item {1}", remoteClient.Name, itemID);
-
             InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
             item = m_Scene.InventoryService.GetItem(item);
 
             if (item == null)
             {
-                m_log.WarnFormat(
-                    "[INVENTORY ACCESS MODULE]: Could not find item {0} for {1} in RezObject()",
-                    itemID, remoteClient.Name);
-
                 return null;
             }
 
@@ -756,6 +782,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             if (e == null || attachment) // Single
             {
                 SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
+                if (!attachment)
+                {
+                    g.RootPart.AttachPoint = g.RootPart.Shape.State;
+                    g.RootPart.AttachOffset = g.AbsolutePosition;
+                    g.RootPart.AttachRotation = g.GroupRotation;
+                    g.RootPart.Shape.State = 0;
+                }
 
                 objlist.Add(g);
                 veclist.Add(new Vector3(0, 0, 0));
@@ -785,6 +818,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 foreach (XmlNode n in groups)
                 {
                     SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(n.OuterXml);
+                    g.RootPart.AttachPoint = g.RootPart.Shape.State;
+                    g.RootPart.AttachOffset = g.AbsolutePosition;
+                    g.RootPart.AttachRotation = g.GroupRotation;
+                    g.RootPart.Shape.State = 0;
 
                     objlist.Add(g);
                     XmlElement el = (XmlElement)n;
@@ -804,12 +841,35 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 }
             }
 
+            int primcount = 0;
+            foreach (SceneObjectGroup g in objlist)
+                primcount += g.PrimCount;
+
+            if (!m_Scene.Permissions.CanRezObject(
+                primcount, remoteClient.AgentId, pos)
+                && !attachment)
+            {
+                // The client operates in no fail mode. It will
+                // have already removed the item from the folder
+                // if it's no copy.
+                // Put it back if it's not an attachment
+                //
+                if (item != null)
+                {
+                    if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!attachment))
+                        remoteClient.SendBulkUpdateInventory(item);
+                }
+
+                return null;
+            }
+
             if (item != null && !DoPreRezWhenFromItem(remoteClient, item, objlist, pos, attachment))
                 return null;
 
             for (int i = 0; i < objlist.Count; i++)
             {
                 group = objlist[i];
+                SceneObjectPart rootPart = group.RootPart;
 
 //                m_log.DebugFormat(
 //                    "[INVENTORY ACCESS MODULE]: Preparing to rez {0} {1} {2} ownermask={3:X} nextownermask={4:X} groupmask={5:X} everyonemask={6:X} for {7}",
@@ -870,8 +930,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
                 if (!attachment)
                 {
-                    SceneObjectPart rootPart = group.RootPart;
-
                     if (rootPart.Shape.PCode == (byte)PCode.Prim)
                         group.ClearPartAttachmentData();
 
@@ -889,6 +947,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 //                    remoteClient.Name);
             }
 
+            group.SetGroup(remoteClient.ActiveGroupId, remoteClient);
+
             if (item != null)
                 DoPostRezWhenFromItem(item, attachment);
 
@@ -967,8 +1027,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 {
                     rootPart.Name = item.Name;
                     rootPart.Description = item.Description;
-                    rootPart.ObjectSaleType = item.SaleType;
-                    rootPart.SalePrice = item.SalePrice;
+                    if ((item.Flags & (uint)InventoryItemFlags.ObjectSlamSale) != 0)
+                    {
+                        rootPart.ObjectSaleType = item.SaleType;
+                        rootPart.SalePrice = item.SalePrice;
+                    }
                 }
 
                 so.FromFolderID = item.Folder;
@@ -978,7 +1041,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 //                    rootPart.OwnerID, item.Owner, item.CurrentPermissions);
 
                 if ((rootPart.OwnerID != item.Owner) ||
-                    (item.CurrentPermissions & 16) != 0)
+                    (item.CurrentPermissions & 16) != 0 ||
+                    (item.Flags & (uint)InventoryItemFlags.ObjectSlamPerm) != 0)
                 {
                     //Need to kill the for sale here
                     rootPart.ObjectSaleType = 0;
@@ -988,31 +1052,43 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     {
                         foreach (SceneObjectPart part in so.Parts)
                         {
-                            if ((item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0)
-                            {
-                                part.EveryoneMask = item.EveryOnePermissions;
-                                part.NextOwnerMask = item.NextPermissions;
-                            }
                             part.GroupMask = 0; // DO NOT propagate here
+
+                            part.LastOwnerID = part.OwnerID;
+                            part.OwnerID = item.Owner;
+                            part.Inventory.ChangeInventoryOwner(item.Owner);
                         }
     
                         so.ApplyNextOwnerPermissions();
+
+                        // In case the user has changed flags on a received item
+                        // we have to apply those changes after the slam. Else we
+                        // get a net loss of permissions
+                        foreach (SceneObjectPart part in so.Parts)
+                        {
+                            if ((item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0)
+                            {
+                                if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteEveryone) != 0)
+                                    part.EveryoneMask = item.EveryOnePermissions & part.BaseMask;
+                                if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteNextOwner) != 0)
+                                    part.NextOwnerMask = item.NextPermissions & part.BaseMask;
+                            }
+                        }
                     }
                 }
-    
-                foreach (SceneObjectPart part in so.Parts)
+                else
                 {
-                    part.FromUserInventoryItemID = fromUserInventoryItemId;
-
-                    if ((part.OwnerID != item.Owner) ||
-                        (item.CurrentPermissions & 16) != 0)
+                    foreach (SceneObjectPart part in so.Parts)
                     {
-                        part.Inventory.ChangeInventoryOwner(item.Owner);
-                        part.GroupMask = 0; // DO NOT propagate here
+                        part.FromUserInventoryItemID = fromUserInventoryItemId;
+
+                        if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteEveryone) != 0)
+                            part.EveryoneMask = item.EveryOnePermissions;
+                        if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteNextOwner) != 0)
+                            part.NextOwnerMask = item.NextPermissions;
+                        if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteGroup) != 0)
+                            part.GroupMask = item.GroupPermissions;
                     }
-
-                    part.EveryoneMask = item.EveryOnePermissions;
-                    part.NextOwnerMask = item.NextPermissions;
                 }
     
                 rootPart.TrimPermissions();
@@ -1150,4 +1226,4 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index e0921ad..ec94420 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -92,9 +92,9 @@ namespace OpenSim.Region.CoreModules.Hypergrid
             }
         }
 
-        protected override List<MapBlockData> GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
+        protected override List<MapBlockData> GetAndSendBlocksInternal(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
         {
-            List<MapBlockData>  mapBlocks = base.GetAndSendBlocks(remoteClient, minX, minY, maxX, maxY, flag);
+            List<MapBlockData>  mapBlocks = base.GetAndSendBlocksInternal(remoteClient, minX, minY, maxX, maxY, flag);
             lock (m_SeenMapBlocks)
             {
                 if (!m_SeenMapBlocks.ContainsKey(remoteClient.AgentId))
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index a676971..0276267 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -42,6 +42,7 @@ using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using Mono.Addins;
+using Amib.Threading;
 
 /*****************************************************
  *
@@ -102,6 +103,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
         private Dictionary<UUID, HttpRequestClass> m_pendingRequests;
         private Scene m_scene;
         // private Queue<HttpRequestClass> rpcQueue = new Queue<HttpRequestClass>();
+        public static SmartThreadPool ThreadPool = null;
 
         public HttpRequestModule()
         {
@@ -279,7 +281,30 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
             m_proxyurl = config.Configs["Startup"].GetString("HttpProxy");
             m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions");
 
+            int maxThreads = 50;
+
+            IConfig httpConfig = config.Configs["HttpRequestModule"];
+            if (httpConfig != null)
+            {
+                maxThreads = httpConfig.GetInt("MaxPoolThreads", maxThreads);
+            }
+
             m_pendingRequests = new Dictionary<UUID, HttpRequestClass>();
+
+            // First instance sets this up for all sims
+            if (ThreadPool == null)
+            {
+                STPStartInfo startInfo = new STPStartInfo();
+                startInfo.IdleTimeout = 20000;
+                startInfo.MaxWorkerThreads = maxThreads;
+                startInfo.MinWorkerThreads = 5;
+                startInfo.ThreadPriority = ThreadPriority.BelowNormal;
+                startInfo.StartSuspended = true;
+
+                ThreadPool = new SmartThreadPool(startInfo);
+
+                ThreadPool.Start();
+            }
         }
 
         public void AddRegion(Scene scene)
@@ -340,7 +365,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
         public string HttpMIMEType = "text/plain;charset=utf-8";
         public int HttpTimeout;
         public bool HttpVerifyCert = true;
-        private Thread httpThread;
+        public IWorkItemResult WorkItem = null;
 
         // Request info
         private UUID _itemID;
@@ -374,12 +399,16 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
 
         public void Process()
         {
-            httpThread = new Thread(SendRequest);
-            httpThread.Name = "HttpRequestThread";
-            httpThread.Priority = ThreadPriority.BelowNormal;
-            httpThread.IsBackground = true;
             _finished = false;
-            httpThread.Start();
+
+            lock (HttpRequestModule.ThreadPool)
+                WorkItem = HttpRequestModule.ThreadPool.QueueWorkItem(new WorkItemCallback(StpSendWrapper), null);
+        }
+
+        private object StpSendWrapper(object o)
+        {
+            SendRequest();
+            return null;
         }
 
         /*
@@ -398,6 +427,10 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
             try
             {
                 Request = (HttpWebRequest) WebRequest.Create(Url);
+
+                //This works around some buggy HTTP Servers like Lighttpd
+                Request.ServicePoint.Expect100Continue = false;
+
                 Request.Method = HttpMethod;
                 Request.ContentType = HttpMIMEType;
 
@@ -405,13 +438,8 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                 {
                     // We could hijack Connection Group Name to identify
                     // a desired security exception.  But at the moment we'll use a dummy header instead.
-//                    Request.ConnectionGroupName = "NoVerify";
                     Request.Headers.Add("NoVerifyCert", "true");
                 }
-//                else
-//                {
-//                    Request.ConnectionGroupName="Verify";
-//                }
                 if (proxyurl != null && proxyurl.Length > 0) 
                 {
                     if (proxyexcepts != null && proxyexcepts.Length > 0) 
@@ -474,25 +502,56 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
 
                         // continue building the string
                         sb.Append(tempString);
+                        if (sb.Length > 2048)
+                            break;
                     }
                 } while (count > 0); // any more data to read?
 
-                ResponseBody = sb.ToString();
+                ResponseBody = sb.ToString().Replace("\r", "");
             }
-            catch (Exception e)
+            catch (WebException e)
             {
-                Status = (int)OSHttpStatusCode.ClientErrorJoker;
-                ResponseBody = e.Message;
+                if (e.Status == WebExceptionStatus.ProtocolError)
+                {
+                    HttpWebResponse webRsp = (HttpWebResponse)((WebException)e).Response;
+                    Status = (int)webRsp.StatusCode;
+                    try
+                    {
+                        using (Stream responseStream = webRsp.GetResponseStream())
+                        {
+                            ResponseBody = responseStream.GetStreamString();
+                        }
+                    }
+                    catch
+                    {
+                        ResponseBody = webRsp.StatusDescription;
+                    }
+                }
+                else
+                {
+                    Status = (int)OSHttpStatusCode.ClientErrorJoker;
+                    ResponseBody = e.Message;
+                }
+
+                if (ResponseBody == null)
+                    ResponseBody = String.Empty;
 
                 _finished = true;
                 return;
             }
+            catch (Exception e)
+            {
+                // Don't crash on anything else
+            }
             finally
             {
                 if (response != null)
                     response.Close();
             }
 
+            if (ResponseBody == null)
+                ResponseBody = String.Empty;
+
             _finished = true;
         }
 
@@ -500,7 +559,10 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
         {
             try
             {
-                httpThread.Abort();
+                if (!WorkItem.Cancel())
+                {
+                    WorkItem.Abort();
+                }
             }
             catch (Exception)
             {
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index be617a5..60b7190 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -42,39 +42,13 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
 {
-    /// <summary>
-    /// Data describing an external URL set up by a script.
-    /// </summary>
     public class UrlData
     {
-        /// <summary>
-        /// Scene object part hosting the script
-        /// </summary>
         public UUID hostID;
-
-        /// <summary>
-        /// The item ID of the script that requested the URL.
-        /// </summary>
         public UUID itemID;
-
-        /// <summary>
-        /// The script engine that runs the script.
-        /// </summary>
         public IScriptModule engine;
-
-        /// <summary>
-        /// The generated URL.
-        /// </summary>
         public string url;
-
-        /// <summary>
-        /// The random UUID component of the generated URL.
-        /// </summary>
         public UUID urlcode;
-
-        /// <summary>
-        /// The external requests currently being processed or awaiting retrieval for this URL.
-        /// </summary>
         public Dictionary<UUID, RequestData> requests;
     }
 
@@ -89,6 +63,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
         //public ManualResetEvent ev;
         public bool requestDone;
         public int startTime;
+        public bool responseSent;
         public string uri;
     }
 
@@ -102,25 +77,16 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
-        /// <summary>
-        /// Indexs the URL request metadata (which script requested it, outstanding requests, etc.) by the request ID
-        /// randomly generated when a request is received for this URL.
-        /// </summary>
-        /// <remarks>
-        /// Manipulation or retrieval from this dictionary must be locked on m_UrlMap to preserve consistency with
-        /// m_UrlMap
-        /// </remarks>
-        private Dictionary<UUID, UrlData> m_RequestMap = new Dictionary<UUID, UrlData>();
+        private Dictionary<UUID, UrlData> m_RequestMap =
+                new Dictionary<UUID, UrlData>();
 
-        /// <summary>
-        /// Indexs the URL request metadata (which script requested it, outstanding requests, etc.) by the full URL
-        /// </summary>
-        private Dictionary<string, UrlData> m_UrlMap = new Dictionary<string, UrlData>();
+        private Dictionary<string, UrlData> m_UrlMap =
+                new Dictionary<string, UrlData>();
 
         /// <summary>
         /// Maximum number of external urls that can be set up by this module.
         /// </summary>
-        private int m_TotalUrls = 100;
+        private int m_TotalUrls = 15000;
 
         private uint https_port = 0;
         private IHttpServer m_HttpServer = null;
@@ -146,9 +112,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
         {
             m_ExternalHostNameForLSL = config.Configs["Network"].GetString("ExternalHostNameForLSL", System.Environment.MachineName);
             bool ssl_enabled = config.Configs["Network"].GetBoolean("https_listener",false);
-
             if (ssl_enabled)
+            {
                 https_port = (uint) config.Configs["Network"].GetInt("https_port",0);
+            }
 
             IConfig llFunctionsConfig = config.Configs["LL-Functions"];
 
@@ -209,7 +176,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_DENIED", "" });
                     return urlcode;
                 }
-                string url = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + "/lslhttp/" + urlcode.ToString() + "/";
+                string url = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + "/lslhttp/" + urlcode.ToString();
 
                 UrlData urlData = new UrlData();
                 urlData.hostID = host.UUID;
@@ -218,18 +185,18 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 urlData.url = url;
                 urlData.urlcode = urlcode;
                 urlData.requests = new Dictionary<UUID, RequestData>();
-                
+
                 m_UrlMap[url] = urlData;
                 
-                string uri = "/lslhttp/" + urlcode.ToString() + "/";
+                string uri = "/lslhttp/" + urlcode.ToString();
                
-                m_HttpServer.AddPollServiceHTTPHandler(
-                    uri,
-                    new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode));
+                PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000);
+                args.Type = PollServiceEventArgs.EventType.LslHttp;
+                m_HttpServer.AddPollServiceHTTPHandler(uri, args);
 
-                m_log.DebugFormat(
-                    "[URL MODULE]: Set up incoming request url {0} for {1} in {2} {3}",
-                    uri, itemID, host.Name, host.LocalId);
+//                m_log.DebugFormat(
+//                    "[URL MODULE]: Set up incoming request url {0} for {1} in {2} {3}",
+//                    uri, itemID, host.Name, host.LocalId);
 
                 engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url });
             }
@@ -254,7 +221,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_DENIED", "" });
                     return urlcode;
                 }
-                string url = "https://" + m_ExternalHostNameForLSL + ":" + m_HttpsServer.Port.ToString() + "/lslhttps/" + urlcode.ToString() + "/";
+                string url = "https://" + m_ExternalHostNameForLSL + ":" + m_HttpsServer.Port.ToString() + "/lslhttps/" + urlcode.ToString();
 
                 UrlData urlData = new UrlData();
                 urlData.hostID = host.UUID;
@@ -264,17 +231,18 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 urlData.urlcode = urlcode;
                 urlData.requests = new Dictionary<UUID, RequestData>();
 
+                
                 m_UrlMap[url] = urlData;
                 
-                string uri = "/lslhttps/" + urlcode.ToString() + "/";
+                string uri = "/lslhttps/" + urlcode.ToString();
                
-                m_HttpsServer.AddPollServiceHTTPHandler(
-                    uri,
-                    new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode));
+                PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000);
+                args.Type = PollServiceEventArgs.EventType.LslHttp;
+                m_HttpsServer.AddPollServiceHTTPHandler(uri, args);
 
-                m_log.DebugFormat(
-                    "[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}",
-                    uri, itemID, host.Name, host.LocalId);
+//                m_log.DebugFormat(
+//                    "[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}",
+//                    uri, itemID, host.Name, host.LocalId);
 
                 engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url });
             }
@@ -293,12 +261,15 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     return;
                 }
 
-                foreach (UUID req in data.requests.Keys)
-                    m_RequestMap.Remove(req);
-
-                m_log.DebugFormat(
-                    "[URL MODULE]: Releasing url {0} for {1} in {2}",
-                    url, data.itemID, data.hostID);
+                lock (m_RequestMap)
+                {
+                    foreach (UUID req in data.requests.Keys)
+                        m_RequestMap.Remove(req);
+                }
+                        
+//                m_log.DebugFormat(
+//                    "[URL MODULE]: Releasing url {0} for {1} in {2}",
+//                    url, data.itemID, data.hostID);
 
                 RemoveUrl(data);
                 m_UrlMap.Remove(url);
@@ -323,29 +294,34 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
         
         public void HttpResponse(UUID request, int status, string body)
         {
-            lock (m_UrlMap)
+            lock (m_RequestMap)
             {
                 if (m_RequestMap.ContainsKey(request))
                 {
                     UrlData urlData = m_RequestMap[request];
-                    string responseBody = body;
-                    if (urlData.requests[request].responseType.Equals("text/plain"))
+                    if (!urlData.requests[request].responseSent)
                     {
-                        string value;
-                        if (urlData.requests[request].headers.TryGetValue("user-agent", out value))
+                        string responseBody = body;
+                        if (urlData.requests[request].responseType.Equals("text/plain"))
                         {
-                            if (value != null && value.IndexOf("MSIE") >= 0)
+                            string value;
+                            if (urlData.requests[request].headers.TryGetValue("user-agent", out value))
                             {
-                                // wrap the html escaped response if the target client is IE
-                                // It ignores "text/plain" if the body is html
-                                responseBody = "<html>" + System.Web.HttpUtility.HtmlEncode(body) + "</html>";
+                                if (value != null && value.IndexOf("MSIE") >= 0)
+                                {
+                                    // wrap the html escaped response if the target client is IE
+                                    // It ignores "text/plain" if the body is html
+                                    responseBody = "<html>" + System.Web.HttpUtility.HtmlEncode(body) + "</html>";
+                                }
                             }
                         }
+
+                        urlData.requests[request].responseCode = status;
+                        urlData.requests[request].responseBody = body;
+                        //urlData.requests[request].ev.Set();
+                        urlData.requests[request].requestDone = true;
+                        urlData.requests[request].responseSent = true;
                     }
-                    urlData.requests[request].responseCode = status;
-                    urlData.requests[request].responseBody = responseBody;
-                    //urlData.requests[request].ev.Set();
-                    urlData.requests[request].requestDone =true;
                 }
                 else
                 {
@@ -356,7 +332,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
 
         public string GetHttpHeader(UUID requestId, string header)
         {
-            lock (m_UrlMap)
+            lock (m_RequestMap)
             {
                 if (m_RequestMap.ContainsKey(requestId))
                 {
@@ -370,14 +346,12 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     m_log.Warn("[HttpRequestHandler] There was no http-in request with id " + requestId);
                 }
             }
-
             return String.Empty;
         }
 
         public int GetFreeUrls()
         {
-            lock (m_UrlMap)
-                return m_TotalUrls - m_UrlMap.Count;
+            return m_TotalUrls - m_UrlMap.Count;
         }
 
         public void ScriptRemoved(UUID itemID)
@@ -394,8 +368,11 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     {
                         RemoveUrl(url.Value);
                         removeURLs.Add(url.Key);
-                        foreach (UUID req in url.Value.requests.Keys)
-                            m_RequestMap.Remove(req);
+                        lock (m_RequestMap)
+                        {
+                            foreach (UUID req in url.Value.requests.Keys)
+                                m_RequestMap.Remove(req);
+                        }
                     }
                 }
 
@@ -416,9 +393,11 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     {
                         RemoveUrl(url.Value);
                         removeURLs.Add(url.Key);
-
-                        foreach (UUID req in url.Value.requests.Keys)
-                            m_RequestMap.Remove(req);
+                        lock (m_RequestMap)
+                        {
+                            foreach (UUID req in url.Value.requests.Keys)
+                                m_RequestMap.Remove(req);
+                        }
                     }
                 }
 
@@ -427,123 +406,125 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
             }
         }
 
+
         private void RemoveUrl(UrlData data)
         {
-            m_HttpServer.RemoveHTTPHandler("", "/lslhttp/" + data.urlcode.ToString() + "/");
+            m_HttpServer.RemoveHTTPHandler("", "/lslhttp/"+data.urlcode.ToString()+"/");
         }
 
         private Hashtable NoEvents(UUID requestID, UUID sessionID)
         {
             Hashtable response = new Hashtable();
-            UrlData urlData;
-
-            lock (m_UrlMap)
+            UrlData url;
+            int startTime = 0;
+            lock (m_RequestMap)
             {
-                // We need to return a 404 here in case the request URL was removed at exactly the same time that a
-                // request was made.  In this case, the request thread can outrace llRemoveURL() and still be polling
-                // for the request ID.
                 if (!m_RequestMap.ContainsKey(requestID))
-                {
-                    response["int_response_code"] = 404;
-                    response["str_response_string"] = "";
-                    response["keepalive"] = false;
-                    response["reusecontext"] = false;
-
                     return response;
-                }
+                url = m_RequestMap[requestID];
+                startTime = url.requests[requestID].startTime;
+            }
 
-                urlData = m_RequestMap[requestID];
+            if (System.Environment.TickCount - startTime > 25000)
+            {
+                response["int_response_code"] = 500;
+                response["str_response_string"] = "Script timeout";
+                response["content_type"] = "text/plain";
+                response["keepalive"] = false;
+                response["reusecontext"] = false;
 
-                if (System.Environment.TickCount - urlData.requests[requestID].startTime > 25000)
+                //remove from map
+                lock (url.requests)
+                {
+                    url.requests.Remove(requestID);
+                }
+                lock (m_RequestMap)
                 {
-                    response["int_response_code"] = 500;
-                    response["str_response_string"] = "Script timeout";
-                    response["content_type"] = "text/plain";
-                    response["keepalive"] = false;
-                    response["reusecontext"] = false;
-    
-                    //remove from map
-                    urlData.requests.Remove(requestID);
                     m_RequestMap.Remove(requestID);
-
-                    return response;
                 }
+
+                return response;
             }
 
+            
             return response;
         }
 
         private bool HasEvents(UUID requestID, UUID sessionID)
         {
-            lock (m_UrlMap)
+            UrlData url=null;
+            
+            lock (m_RequestMap)
             {
-                // We return true here because an external URL request that happened at the same time as an llRemoveURL()
-                // can still make it through to HttpRequestHandler().  That will return without setting up a request
-                // when it detects that the URL has been removed.  The poller, however, will continue to ask for
-                // events for that request, so here we will signal that there are events and in GetEvents we will
-                // return a 404.
                 if (!m_RequestMap.ContainsKey(requestID))
                 {
-                    return true;
+                    return false;
                 }
-
-                UrlData urlData = m_RequestMap[requestID];
-
-                if (!urlData.requests.ContainsKey(requestID))
+                url = m_RequestMap[requestID];
+            }
+            lock (url.requests)
+            {
+                if (!url.requests.ContainsKey(requestID))
                 {
-                    return true;
+                    return false;
                 }
-
-                // Trigger return of timeout response.
-                if (System.Environment.TickCount - urlData.requests[requestID].startTime > 25000)
+                else
                 {
-                    return true;
+                    if (System.Environment.TickCount - url.requests[requestID].startTime > 25000)
+                    {
+                        return true;
+                    }
+                    if (url.requests[requestID].requestDone)
+                        return true;
+                    else
+                        return false;
                 }
-
-                return urlData.requests[requestID].requestDone;
             }
         }
-
-        private Hashtable GetEvents(UUID requestID, UUID sessionID, string request)
+        private Hashtable GetEvents(UUID requestID, UUID sessionID)
         {
-            Hashtable response;
+            UrlData url = null;
+            RequestData requestData = null;
 
-            lock (m_UrlMap)
+            lock (m_RequestMap)
             {
-                UrlData url = null;
-                RequestData requestData = null;
-
                 if (!m_RequestMap.ContainsKey(requestID))
-                    return NoEvents(requestID, sessionID);
-
+                    return NoEvents(requestID,sessionID);
                 url = m_RequestMap[requestID];
+            }
+            lock (url.requests)
+            {
                 requestData = url.requests[requestID];
+            }
+            
+            if (!requestData.requestDone)
+                return NoEvents(requestID,sessionID);
+            
+            Hashtable response = new Hashtable();
 
-                if (!requestData.requestDone)
-                    return NoEvents(requestID, sessionID);
-
-                response = new Hashtable();
-
-                if (System.Environment.TickCount - requestData.startTime > 25000)
-                {
-                    response["int_response_code"] = 500;
-                    response["str_response_string"] = "Script timeout";
-                    response["content_type"] = "text/plain";
-                    response["keepalive"] = false;
-                    response["reusecontext"] = false;
-                    return response;
-                }
-
-                //put response
-                response["int_response_code"] = requestData.responseCode;
-                response["str_response_string"] = requestData.responseBody;
-                response["content_type"] = requestData.responseType;
-                // response["content_type"] = "text/plain";
+            if (System.Environment.TickCount - requestData.startTime > 25000)
+            {
+                response["int_response_code"] = 500;
+                response["str_response_string"] = "Script timeout";
+                response["content_type"] = "text/plain";
                 response["keepalive"] = false;
                 response["reusecontext"] = false;
-
-                //remove from map
+                return response;
+            }
+            //put response
+            response["int_response_code"] = requestData.responseCode;
+            response["str_response_string"] = requestData.responseBody;
+            response["content_type"] = "text/plain";
+            response["keepalive"] = false;
+            response["reusecontext"] = false;
+            
+            //remove from map
+            lock (url.requests)
+            {
                 url.requests.Remove(requestID);
+            }
+            lock (m_RequestMap)
+            {
                 m_RequestMap.Remove(requestID);
             }
 
@@ -552,41 +533,45 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
 
         public void HttpRequestHandler(UUID requestID, Hashtable request)
         {
-            string uri = request["uri"].ToString();
-            bool is_ssl = uri.Contains("lslhttps");
-
-            try
+            lock (request)
             {
-                Hashtable headers = (Hashtable)request["headers"];
-
-//                    string uri_full = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + uri;// "/lslhttp/" + urlcode.ToString() + "/";
+                string uri = request["uri"].ToString();
+                bool is_ssl = uri.Contains("lslhttps");
 
-                int pos1 = uri.IndexOf("/");// /lslhttp
-                int pos2 = uri.IndexOf("/", pos1 + 1);// /lslhttp/
-                int pos3 = uri.IndexOf("/", pos2 + 1);// /lslhttp/<UUID>/
-                string uri_tmp = uri.Substring(0, pos3 + 1);
-                //HTTP server code doesn't provide us with QueryStrings
-                string pathInfo;
-                string queryString;
-                queryString = "";
-
-                pathInfo = uri.Substring(pos3);
-
-                UrlData urlData = null;
-
-                lock (m_UrlMap)
+                try
                 {
-                    string url;
+                    Hashtable headers = (Hashtable)request["headers"];
+
+//                    string uri_full = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + uri;// "/lslhttp/" + urlcode.ToString() + "/";
 
-                    if (is_ssl)
-                        url = "https://" + m_ExternalHostNameForLSL + ":" + m_HttpsServer.Port.ToString() + uri_tmp;
+                    int pos1 = uri.IndexOf("/");// /lslhttp
+                    int pos2 = uri.IndexOf("/", pos1 + 1);// /lslhttp/
+                    int pos3 = pos2 + 37; // /lslhttp/urlcode
+                    string uri_tmp = uri.Substring(0, pos3);
+                    //HTTP server code doesn't provide us with QueryStrings
+                    string pathInfo;
+                    string queryString;
+                    queryString = "";
+
+                    pathInfo = uri.Substring(pos3);
+
+                    UrlData url = null;
+                    string urlkey;
+                    if (!is_ssl)
+                        urlkey = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + uri_tmp;
+                    //m_UrlMap[];
                     else
-                        url = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + uri_tmp;
+                        urlkey = "https://" + m_ExternalHostNameForLSL + ":" + m_HttpsServer.Port.ToString() + uri_tmp;
 
-                    // Avoid a race - the request URL may have been released via llRequestUrl() whilst this
-                    // request was being processed.
-                    if (!m_UrlMap.TryGetValue(url, out urlData))
+                    if (m_UrlMap.ContainsKey(urlkey))
+                    {
+                        url = m_UrlMap[urlkey];
+                    }
+                    else
+                    {
+                        //m_log.Warn("[HttpRequestHandler]: http-in request failed; no such url: "+urlkey.ToString());
                         return;
+                    }
 
                     //for llGetHttpHeader support we need to store original URI here
                     //to make x-path-info / x-query-string / x-script-url / x-remote-ip headers 
@@ -606,7 +591,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                         string value = (string)header.Value;
                         requestData.headers.Add(key, value);
                     }
-
                     foreach (DictionaryEntry de in request)
                     {
                         if (de.Key.ToString() == "querystringkeys")
@@ -617,13 +601,21 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                                 if (request.ContainsKey(key))
                                 {
                                     string val = (String)request[key];
-                                    queryString = queryString + key + "=" + val + "&";
+                                    if (key != "")
+                                    {
+                                        queryString = queryString + key + "=" + val + "&";
+                                    }
+                                    else
+                                    {
+                                        queryString = queryString + val + "&";
+                                    }                                    
                                 }
                             }
-
                             if (queryString.Length > 1)
                                 queryString = queryString.Substring(0, queryString.Length - 1);
+
                         }
+
                     }
 
                     //if this machine is behind DNAT/port forwarding, currently this is being
@@ -631,23 +623,34 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     requestData.headers["x-remote-ip"] = requestData.headers["remote_addr"];
                     requestData.headers["x-path-info"] = pathInfo;
                     requestData.headers["x-query-string"] = queryString;
-                    requestData.headers["x-script-url"] = urlData.url;
+                    requestData.headers["x-script-url"] = url.url;
 
-                    urlData.requests.Add(requestID, requestData);
-                    m_RequestMap.Add(requestID, urlData);
-                }
+                    //requestData.ev = new ManualResetEvent(false);
+                    lock (url.requests)
+                    {
+                        url.requests.Add(requestID, requestData);
+                    }
+                    lock (m_RequestMap)
+                    {
+                        //add to request map
+                        m_RequestMap.Add(requestID, url);
+                    }
 
-                urlData.engine.PostScriptEvent(
-                    urlData.itemID,
-                    "http_request",
-                    new Object[] { requestID.ToString(), request["http-method"].ToString(), request["body"].ToString() });
-            }
-            catch (Exception we)
-            {
-                //Hashtable response = new Hashtable();
-                m_log.Warn("[HttpRequestHandler]: http-in request failed");
-                m_log.Warn(we.Message);
-                m_log.Warn(we.StackTrace);
+                    url.engine.PostScriptEvent(url.itemID, "http_request", new Object[] { requestID.ToString(), request["http-method"].ToString(), request["body"].ToString() });
+
+                    //send initial response?
+//                    Hashtable response = new Hashtable();
+
+                    return;
+
+                }
+                catch (Exception we)
+                {
+                    //Hashtable response = new Hashtable();
+                    m_log.Warn("[HttpRequestHandler]: http-in request failed");
+                    m_log.Warn(we.Message);
+                    m_log.Warn(we.StackTrace);
+                }
             }
         }
 
@@ -656,4 +659,4 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
             ScriptRemoved(itemID);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index 689e8a7..f395441 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -852,4 +852,4 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
             return null;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index 2c2c99c..87a0537 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -96,6 +96,8 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
         // private static readonly ILog m_log =
         //     LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        private const int DEBUG_CHANNEL = 2147483647;
+
         private ListenerManager m_listenerManager;
         private Queue m_pending;
         private Queue m_pendingQ;
@@ -366,67 +368,60 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
         /// <param name='msg'>
         /// Message.
         /// </param>
-        public void DeliverMessageTo(UUID target, int channel, Vector3 pos,
-                string name, UUID id, string msg)
+        public bool DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg, out string error)
         {
+            error = null;
+
+            if (channel == DEBUG_CHANNEL)
+                return true;
+
             // Is id an avatar?
             ScenePresence sp = m_scene.GetScenePresence(target);
 
             if (sp != null)
             {
-                // ignore if a child agent this is restricted to inside one
-                // region
-                if (sp.IsChildAgent)
-                    return;
-
-                // Send message to the avatar.
-                // Channel zero only goes to the avatar
-                // non zero channel messages only go to the attachments
+                // Send message to avatar
                 if (channel == 0)
                 {
-                    m_scene.SimChatToAgent(target, Utils.StringToBytes(msg),
-                            pos, name, id, false);
+                    // Channel 0 goes to viewer ONLY
+                    m_scene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Broadcast, 0, pos, name, id, target, false, false);
+                    return true;
                 }
-                else
-                {
-                    List<SceneObjectGroup> attachments = sp.GetAttachments();
-                    if (attachments.Count == 0)
-                        return;
 
-                    // Get uuid of attachments
-                    List<UUID> targets = new List<UUID>();
-                    foreach (SceneObjectGroup sog in attachments)
-                    {
-                        if (!sog.IsDeleted)
-                            targets.Add(sog.UUID);
-                    }
+                List<SceneObjectGroup> attachments = sp.GetAttachments();
 
-                    // Need to check each attachment
-                    foreach (ListenerInfo li
-                            in m_listenerManager.GetListeners(UUID.Zero,
-                            channel, name, id, msg))
-                    {
-                        if (li.GetHostID().Equals(id))
-                            continue;
+                if (attachments.Count == 0)
+                    return true;
 
-                        if (m_scene.GetSceneObjectPart(
-                                li.GetHostID()) == null)
-                        {
-                            continue;
-                        }
+                // Get uuid of attachments
+                List<UUID> targets = new List<UUID>();
+                foreach (SceneObjectGroup sog in attachments)
+                {
+                    if (!sog.IsDeleted)
+                        targets.Add(sog.UUID);
+                }
 
-                        if (targets.Contains(li.GetHostID()))
-                            QueueMessage(new ListenerInfo(li, name, id, msg));
-                    }
+                // Need to check each attachment
+                foreach (ListenerInfo li in m_listenerManager.GetListeners(UUID.Zero, channel, name, id, msg))
+                {
+                    if (li.GetHostID().Equals(id))
+                        continue;
+
+                    if (m_scene.GetSceneObjectPart(li.GetHostID()) == null)
+                        continue;
+
+                    if (targets.Contains(li.GetHostID()))
+                        QueueMessage(new ListenerInfo(li, name, id, msg));
                 }
 
-                return;
+                return true;
             }
 
-            // No avatar found so look for an object
-            foreach (ListenerInfo li
-                    in m_listenerManager.GetListeners(UUID.Zero, channel,
-                    name, id, msg))
+            SceneObjectPart part = m_scene.GetSceneObjectPart(target);
+            if (part == null) // Not even an object
+                return true; // No error
+
+            foreach (ListenerInfo li in m_listenerManager.GetListeners(UUID.Zero, channel, name, id, msg))
             {
                 // Dont process if this message is from yourself!
                 if (li.GetHostID().Equals(id))
@@ -444,7 +439,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
                 }
             }
 
-            return;
+            return true;
         }
 
         protected void QueueMessage(ListenerInfo li)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs
index 16f42a7..f027810 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs
@@ -139,6 +139,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication
 
         #region IAuthenticationService
 
+        public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID)
+        {
+            // Not implemented at the regions
+            realID = UUID.Zero;
+            return string.Empty; 
+        }
+
         public string Authenticate(UUID principalID, string password, int lifetime)
         {
             // Not implemented at the regions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
index 26d22b8..b61062f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
@@ -92,8 +92,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
             if (config == null)
                 return;
 
-            int refreshminutes = Convert.ToInt32(config.GetString("RefreshTime"));
-            if (refreshminutes <= 0)
+            int refreshminutes = Convert.ToInt32(config.GetString("RefreshTime", "-1"));
+            if (refreshminutes < 0)
             {
                 m_log.WarnFormat("[MAP IMAGE SERVICE MODULE]: No refresh time given in config. Module disabled.");
                 return;
@@ -116,12 +116,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
                 return;
             }
 
-            m_refreshTimer.Enabled = true;
-            m_refreshTimer.AutoReset = true;
-            m_refreshTimer.Interval = m_refreshtime;
-            m_refreshTimer.Elapsed += new ElapsedEventHandler(HandleMaptileRefresh);
+            if (m_refreshtime > 0)
+            {
+                m_refreshTimer.Enabled = true;
+                m_refreshTimer.AutoReset = true;
+                m_refreshTimer.Interval = m_refreshtime;
+                m_refreshTimer.Elapsed += new ElapsedEventHandler(HandleMaptileRefresh);
+            }
 
-            m_log.InfoFormat("[MAP IMAGE SERVICE MODULE]: enabled with refresh time {0}min and service object {1}",
+            m_log.InfoFormat("[MAP IMAGE SERVICE MODULE]: enabled with refresh time {0} min and service object {1}",
                              refreshminutes, service);
 
             m_enabled = true;
@@ -231,4 +234,4 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index 3c18074..b485194 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -303,6 +303,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return false;
         }
 
+        public bool CloseChildAgent(GridRegion destination, UUID id)
+        {
+            return CloseAgent(destination, id);
+        }
+
         public bool CloseAgent(GridRegion destination, UUID id)
         {
             if (destination == null)
@@ -317,7 +322,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
                 Util.FireAndForget(delegate { m_scenes[destination.RegionID].IncomingCloseAgent(id, false); });
                 return true;
             }
-
             //m_log.Debug("[LOCAL COMMS]: region not found in SendCloseAgent");
             return false;
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index b2a1b23..c8698ca 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -262,6 +262,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return false;
         }
 
+        public bool CloseChildAgent(GridRegion destination, UUID id)
+        {
+            if (destination == null)
+                return false;
+
+            // Try local first
+            if (m_localBackend.CloseChildAgent(destination, id))
+                return true;
+
+            // else do the remote thing
+            if (!m_localBackend.IsLocalRegion(destination.RegionHandle))
+                return m_remoteConnector.CloseChildAgent(destination, id);
+
+            return false;
+        }
 
         public bool CloseAgent(GridRegion destination, UUID id)
         {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
index 529bfd7..ea4ade5 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
@@ -129,6 +129,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
             // FIXME: Why do we bother setting this module and caching up if we just end up registering the inner
             // user account service?!
             scene.RegisterModuleInterface<IUserAccountService>(UserAccountService);
+            scene.RegisterModuleInterface<IUserAccountCacheModule>(m_Cache);
         }
 
         public void RemoveRegion(Scene scene)
@@ -181,6 +182,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
             return UserAccountService.GetUserAccount(scopeID, Email);
         }
 
+        public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string query)
+        {
+            return null;
+        }
+
         public List<UserAccount> GetUserAccounts(UUID scopeID, string query)
         {
             return UserAccountService.GetUserAccounts(scopeID, query);
@@ -195,4 +201,4 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
index 5aa87d3..afbba30 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
@@ -34,6 +34,7 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 using OpenSim.Services.Connectors;
+using OpenSim.Framework;
 
 using OpenMetaverse;
 
@@ -103,6 +104,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
                 return;
 
             scene.RegisterModuleInterface<IUserAccountService>(this);
+            scene.RegisterModuleInterface<IUserAccountCacheModule>(m_Cache);
+
+            scene.EventManager.OnNewClient += OnNewClient;
         }
 
         public void RemoveRegion(Scene scene)
@@ -117,6 +121,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
                 return;
         }
 
+        // When a user actually enters the sim, clear them from
+        // cache so the sim will have the current values for
+        // flags, title, etc. And country, don't forget country!
+        private void OnNewClient(IClientAPI client)
+        {
+            m_Cache.Remove(client.Name);
+        }
+
         #region Overwritten methods from IUserAccountService
 
         public override UserAccount GetUserAccount(UUID scopeID, UUID userID)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
index ddef75f..cbe2eaa 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
@@ -34,7 +34,7 @@ using log4net;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 {
-    public class UserAccountCache
+    public class UserAccountCache : IUserAccountCacheModule
     {
         private const double CACHE_EXPIRATION_SECONDS = 120000.0; // 33 hours!
 
@@ -92,5 +92,18 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 
             return null;
         }
+
+        public void Remove(string name)
+        {
+            if (!m_NameCache.Contains(name))
+                return;
+
+            UUID uuid = UUID.Zero;
+            if (m_NameCache.TryGetValue(name, out uuid))
+            {
+                m_NameCache.Remove(name);
+                m_UUIDCache.Remove(uuid);
+            }
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 32d245f..fcfdf7c 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -490,6 +490,23 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     // being no copy/no mod for everyone
                     lock (part.TaskInventory)
                     {
+                        if (!ResolveUserUuid(scene, part.CreatorID))
+                            part.CreatorID = scene.RegionInfo.EstateSettings.EstateOwner;
+    
+                        if (!ResolveUserUuid(scene, part.OwnerID))
+                            part.OwnerID = scene.RegionInfo.EstateSettings.EstateOwner;
+    
+                        if (!ResolveUserUuid(scene, part.LastOwnerID))
+                            part.LastOwnerID = scene.RegionInfo.EstateSettings.EstateOwner;
+    
+                        // And zap any troublesome sit target information
+                        part.SitTargetOrientation = new Quaternion(0, 0, 0, 1);
+                        part.SitTargetPosition    = new Vector3(0, 0, 0);
+    
+                        // Fix ownership/creator of inventory items
+                        // Not doing so results in inventory items
+                        // being no copy/no mod for everyone
+                        part.TaskInventory.LockItemsForRead(true);
                         TaskInventoryDictionary inv = part.TaskInventory;
                         foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv)
                         {
@@ -510,6 +527,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                             if (!ResolveGroupUuid(kvp.Value.GroupID))
                                 kvp.Value.GroupID = UUID.Zero;
                         }
+                        part.TaskInventory.LockItemsForRead(false);
                     }
                 }
 
@@ -899,4 +917,4 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             return dearchivedScenes;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index 9600023..ada7ecc 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -271,18 +271,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                                                            
                     if (asset != null)
                     {
-                        if (m_options.ContainsKey("verbose"))
-                            m_log.InfoFormat("[ARCHIVER]: Writing asset {0}", id);
-
+//                        m_log.DebugFormat("[ARCHIVER]: Writing asset {0}", id);
                         m_foundAssetUuids.Add(asset.FullID);
 
                         m_assetsArchiver.WriteAsset(PostProcess(asset));
                     }
                     else
                     {
-                        if (m_options.ContainsKey("verbose"))
-                            m_log.InfoFormat("[ARCHIVER]: Recording asset {0} as not found", id);
-
+//                        m_log.DebugFormat("[ARCHIVER]: Recording asset {0} as not found", id);
                         m_notFoundAssetUuids.Add(new UUID(id));
                     }
         
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 60f6739..a5f5749 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -32,6 +32,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Security;
+using System.Timers;
 using log4net;
 using Mono.Addins;
 using Nini.Config;
@@ -48,6 +49,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        private Timer m_regionChangeTimer = new Timer();
         public Scene Scene { get; private set; }
         public IUserManagement UserManager { get; private set; }
         
@@ -65,6 +67,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
         public event ChangeDelegate OnEstateInfoChange;
         public event MessageDelegate OnEstateMessage;
 
+        private int m_delayCount = 0;
+
         #region Region Module interface
         
         public string Name { get { return "EstateManagementModule"; } }
@@ -114,6 +118,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         #region Packet Data Responders
 
+        private void clientSendDetailedEstateData(IClientAPI remote_client, UUID invoice)
+        {
+            sendDetailedEstateData(remote_client, invoice);
+            sendEstateLists(remote_client, invoice);
+        }
+
         private void sendDetailedEstateData(IClientAPI remote_client, UUID invoice)
         {
             uint sun = 0;
@@ -136,7 +146,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     (uint) Scene.RegionInfo.RegionSettings.CovenantChangedDateTime,
                     Scene.RegionInfo.EstateSettings.AbuseEmail,
                     estateOwner);
+        }
 
+        private void sendEstateLists(IClientAPI remote_client, UUID invoice)
+        {
             remote_client.SendEstateList(invoice,
                     (int)Constants.EstateAccessCodex.EstateManagers,
                     Scene.RegionInfo.EstateSettings.EstateManagers,
@@ -318,6 +331,16 @@ namespace OpenSim.Region.CoreModules.World.Estate
             IRestartModule restartModule = Scene.RequestModuleInterface<IRestartModule>();
             if (restartModule != null)
             {
+                if (timeInSeconds == -1)
+                {
+                    m_delayCount++;
+                    if (m_delayCount > 3)
+                        return;
+
+                    restartModule.DelayRestart(3600, "Restart delayed by region manager");
+                    return;
+                }
+
                 List<int> times = new List<int>();
                 while (timeInSeconds > 0)
                 {
@@ -330,7 +353,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                         timeInSeconds -= 15;
                 }
 
-                restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), true);
+                restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), false);
 
                 m_log.InfoFormat(
                     "User {0} requested restart of region {1} in {2} seconds", 
@@ -546,7 +569,11 @@ namespace OpenSim.Region.CoreModules.World.Estate
                         {
                             if (!s.IsChildAgent)
                             {
-                                Scene.TeleportClientHome(user, s.ControllingClient);
+                                if (!Scene.TeleportClientHome(user, s.ControllingClient))
+                                {
+                                    s.ControllingClient.Kick("Your access to the region was revoked and TP home failed - you have been logged out.");
+                                    s.ControllingClient.Close();
+                                }
                             }
                         }
 
@@ -555,7 +582,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     {
                         remote_client.SendAlertMessage("User is already on the region ban list");
                     }
-                    //m_scene.RegionInfo.regionBanlist.Add(Manager(user);
+                    //Scene.RegionInfo.regionBanlist.Add(Manager(user);
                     remote_client.SendBannedUserList(invoice, Scene.RegionInfo.EstateSettings.EstateBans, Scene.RegionInfo.EstateSettings.EstateID);
                 }
                 else
@@ -611,7 +638,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                         remote_client.SendAlertMessage("User is not on the region ban list");
                     }
                     
-                    //m_scene.RegionInfo.regionBanlist.Add(Manager(user);
+                    //Scene.RegionInfo.regionBanlist.Add(Manager(user);
                     remote_client.SendBannedUserList(invoice, Scene.RegionInfo.EstateSettings.EstateBans, Scene.RegionInfo.EstateSettings.EstateID);
                 }
                 else
@@ -777,7 +804,11 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 ScenePresence s = Scene.GetScenePresence(prey);
                 if (s != null)
                 {
-                    Scene.TeleportClientHome(prey, s.ControllingClient);
+                    if (!Scene.TeleportClientHome(prey, s.ControllingClient))
+                    {
+                        s.ControllingClient.Kick("You were teleported home by the region owner, but the TP failed - you have been logged out.");
+                        s.ControllingClient.Close();
+                    }
                 }
             }
         }
@@ -795,7 +826,13 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     // Also make sure they are actually in the region
                     ScenePresence p;
                     if(Scene.TryGetScenePresence(client.AgentId, out p))
-                        Scene.TeleportClientHome(p.UUID, p.ControllingClient);
+                    {
+                        if (!Scene.TeleportClientHome(p.UUID, p.ControllingClient))
+                        {
+                            p.ControllingClient.Kick("You were teleported home by the region owner, but the TP failed - you have been logged out.");
+                            p.ControllingClient.Close();
+                        }
+                    }
                 }
             });
         }
@@ -1170,7 +1207,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         private void EventManager_OnNewClient(IClientAPI client)
         {
-            client.OnDetailedEstateDataRequest += sendDetailedEstateData;
+            client.OnDetailedEstateDataRequest += clientSendDetailedEstateData;
             client.OnSetEstateFlagsRequest += estateSetRegionInfoHandler;
 //            client.OnSetEstateTerrainBaseTexture += setEstateTerrainBaseTexture;
             client.OnSetEstateTerrainDetailTexture += setEstateTerrainBaseTexture;
@@ -1222,6 +1259,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 flags |= RegionFlags.AllowParcelChanges;
             if (Scene.RegionInfo.RegionSettings.BlockShowInSearch)
                 flags |= RegionFlags.BlockParcelSearch;
+            if (Scene.RegionInfo.RegionSettings.GodBlockSearch)
+                flags |= (RegionFlags)(1 << 11);
+            if (Scene.RegionInfo.RegionSettings.Casino)
+                flags |= (RegionFlags)(1 << 10);
 
             if (Scene.RegionInfo.RegionSettings.FixedSun)
                 flags |= RegionFlags.SunFixed;
@@ -1229,11 +1270,15 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 flags |= RegionFlags.Sandbox;
             if (Scene.RegionInfo.EstateSettings.AllowVoice)
                 flags |= RegionFlags.AllowVoice;
+            if (Scene.RegionInfo.EstateSettings.AllowLandmark)
+                flags |= RegionFlags.AllowLandmark;
+            if (Scene.RegionInfo.EstateSettings.AllowSetHome)
+                flags |= RegionFlags.AllowSetHome;
+            if (Scene.RegionInfo.EstateSettings.BlockDwell)
+                flags |= RegionFlags.BlockDwell;
+            if (Scene.RegionInfo.EstateSettings.ResetHomeOnTeleport)
+                flags |= RegionFlags.ResetHomeOnTeleport;
 
-            // Fudge these to always on, so the menu options activate
-            //
-            flags |= RegionFlags.AllowLandmark;
-            flags |= RegionFlags.AllowSetHome;
 
             // TODO: SkipUpdateInterestList
 
@@ -1274,6 +1319,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 flags |= RegionFlags.ResetHomeOnTeleport;
             if (Scene.RegionInfo.EstateSettings.TaxFree)
                 flags |= RegionFlags.TaxFree;
+            if (Scene.RegionInfo.EstateSettings.AllowLandmark)
+                flags |= RegionFlags.AllowLandmark;
+            if (Scene.RegionInfo.EstateSettings.AllowParcelChanges)
+                flags |= RegionFlags.AllowParcelChanges;
+            if (Scene.RegionInfo.EstateSettings.AllowSetHome)
+                flags |= RegionFlags.AllowSetHome;
             if (Scene.RegionInfo.EstateSettings.DenyMinors)
                 flags |= (RegionFlags)(1 << 30);
 
@@ -1294,6 +1345,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         public void TriggerRegionInfoChange()
         {
+            m_regionChangeTimer.Stop();
+            m_regionChangeTimer.Start();
+        }
+
+        protected void RaiseRegionInfoChange(object sender, ElapsedEventArgs e)
+        {
             ChangeDelegate change = OnRegionInfoChange;
 
             if (change != null)
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index dbf5138..b4f7d51 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -88,19 +88,21 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// <value>
         /// Land objects keyed by local id
         /// </value>
-        private readonly Dictionary<int, ILandObject> m_landList = new Dictionary<int, ILandObject>();
+//        private readonly Dictionary<int, ILandObject> m_landList = new Dictionary<int, ILandObject>();
+
+        //ubit: removed the readonly so i can move it around
+        private Dictionary<int, ILandObject> m_landList = new Dictionary<int, ILandObject>();
 
         private int m_lastLandLocalID = LandChannel.START_LAND_LOCAL_ID - 1;
 
         private bool m_allowedForcefulBans = true;
+        private UUID DefaultGodParcelGroup;
+        private string DefaultGodParcelName;
 
         // caches ExtendedLandData
         private Cache parcelInfoCache;
-
-        /// <summary>
-        /// Record positions that avatar's are currently being forced to move to due to parcel entry restrictions.
-        /// </summary>
-        private Dictionary<UUID, Vector3> forcedPosition = new Dictionary<UUID, Vector3>();
+        private Dictionary<UUID, Vector3> forcedPosition =
+                new Dictionary<UUID, Vector3>();
 
         #region INonSharedRegionModule Members
 
@@ -111,6 +113,12 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void Initialise(IConfigSource source)
         {
+            IConfig cnf = source.Configs["LandManagement"];
+            if (cnf != null)
+            {
+                DefaultGodParcelGroup = new UUID(cnf.GetString("DefaultAdministratorGroupUUID", UUID.Zero.ToString()));
+                DefaultGodParcelName = cnf.GetString("DefaultAdministratorParcelName", "Default Parcel");
+            }
         }
 
         public void AddRegion(Scene scene)
@@ -163,13 +171,6 @@ namespace OpenSim.Region.CoreModules.World.Land
             m_scene.UnregisterModuleCommander(m_commander.Name);            
         }
 
-//        private bool OnVerifyUserConnection(ScenePresence scenePresence, out string reason)
-//        {
-//            ILandObject nearestParcel = m_scene.GetNearestAllowedParcel(scenePresence.UUID, scenePresence.AbsolutePosition.X, scenePresence.AbsolutePosition.Y);
-//            reason = "You are not allowed to enter this sim.";
-//            return nearestParcel != null;
-//        }
-        
         /// <summary>
         /// Processes commandline input. Do not call directly.
         /// </summary>
@@ -210,6 +211,8 @@ namespace OpenSim.Region.CoreModules.World.Land
             client.OnParcelInfoRequest += ClientOnParcelInfoRequest;
             client.OnParcelDeedToGroup += ClientOnParcelDeedToGroup;
             client.OnPreAgentUpdate += ClientOnPreAgentUpdate;
+            client.OnParcelEjectUser += ClientOnParcelEjectUser;
+            client.OnParcelFreezeUser += ClientOnParcelFreezeUser;
 
             EntityBase presenceEntity;
             if (m_scene.Entities.TryGetValue(client.AgentId, out presenceEntity) && presenceEntity is ScenePresence)
@@ -226,48 +229,6 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         void ClientOnPreAgentUpdate(IClientAPI remoteClient, AgentUpdateArgs agentData)
         {
-            //If we are forcing a position for them to go
-            if (forcedPosition.ContainsKey(remoteClient.AgentId))
-            {
-                ScenePresence clientAvatar = m_scene.GetScenePresence(remoteClient.AgentId);
-
-                //Putting the user into flying, both keeps the avatar in fligth when it bumps into something and stopped from going another direction AND
-                //When the avatar walks into a ban line on the ground, it prevents getting stuck
-                agentData.ControlFlags = (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY;
-
-                //Make sure we stop if they get about to the right place to prevent yoyo and prevents getting stuck on banlines
-                if (Vector3.Distance(clientAvatar.AbsolutePosition, forcedPosition[remoteClient.AgentId]) < .2)
-                {
-//                    m_log.DebugFormat(
-//                        "[LAND MANAGEMENT MODULE]: Stopping force position of {0} because {1} is close enough to {2}",
-//                        clientAvatar.Name, clientAvatar.AbsolutePosition, forcedPosition[remoteClient.AgentId]);
-
-                    forcedPosition.Remove(remoteClient.AgentId);
-                }
-                //if we are far away, teleport
-                else if (Vector3.Distance(clientAvatar.AbsolutePosition, forcedPosition[remoteClient.AgentId]) > 3)
-                {
-                    Vector3 forcePosition = forcedPosition[remoteClient.AgentId];
-//                    m_log.DebugFormat(
-//                        "[LAND MANAGEMENT MODULE]: Teleporting out {0} because {1} is too far from avatar position {2}",
-//                        clientAvatar.Name, clientAvatar.AbsolutePosition, forcePosition);
-
-                    m_scene.RequestTeleportLocation(remoteClient, m_scene.RegionInfo.RegionHandle,
-                        forcePosition, clientAvatar.Lookat, (uint)Constants.TeleportFlags.ForceRedirect);
-
-                    forcedPosition.Remove(remoteClient.AgentId);
-                }
-                else
-                {
-//                    m_log.DebugFormat(
-//                        "[LAND MANAGEMENT MODULE]: Forcing {0} from {1} to {2}",
-//                        clientAvatar.Name, clientAvatar.AbsolutePosition, forcedPosition[remoteClient.AgentId]);
-
-                    //Forces them toward the forced position we want if they aren't there yet
-                    agentData.UseClientAgentPosition = true;
-                    agentData.ClientAgentPosition = forcedPosition[remoteClient.AgentId];
-                }
-            }
         }
 
         public void Close()
@@ -292,6 +253,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         {
             LandData newData = data.Copy();
             newData.LocalID = local_id;
+            ILandObject landobj = null;        
 
             ILandObject land;
             lock (m_landList)
@@ -331,14 +293,14 @@ namespace OpenSim.Region.CoreModules.World.Land
         protected ILandObject CreateDefaultParcel()
         {
             m_log.DebugFormat(
-                "[LAND MANAGEMENT MODULE]: Creating default parcel for region {0}", m_scene.RegionInfo.RegionName);
-            
-            ILandObject fullSimParcel = new LandObject(UUID.Zero, false, m_scene);                                                
+                    "[LAND MANAGEMENT MODULE]: Creating default parcel for region {0}", m_scene.RegionInfo.RegionName);
+
+            ILandObject fullSimParcel = new LandObject(UUID.Zero, false, m_scene);
             fullSimParcel.SetLandBitmap(fullSimParcel.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
             fullSimParcel.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
             fullSimParcel.LandData.ClaimDate = Util.UnixTimeSinceEpoch();
-            
-            return AddLandObject(fullSimParcel);            
+
+            return AddLandObject(fullSimParcel);
         }
 
         public List<ILandObject> AllParcels()
@@ -387,10 +349,16 @@ namespace OpenSim.Region.CoreModules.World.Land
         private void ForceAvatarToPosition(ScenePresence avatar, Vector3? position)
         {
             if (m_scene.Permissions.IsGod(avatar.UUID)) return;
-            if (position.HasValue)
-            {
-                forcedPosition[avatar.ControllingClient.AgentId] = (Vector3)position;
-            }
+
+            if (!position.HasValue)
+                return;
+
+            bool isFlying = avatar.PhysicsActor.Flying;
+            avatar.RemoveFromPhysicalScene();
+
+            avatar.AbsolutePosition = (Vector3)position;
+
+            avatar.AddToPhysicalScene(isFlying);
         }
 
         public void SendYouAreRestrictedNotice(ScenePresence avatar)
@@ -410,29 +378,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 }
 
                 if (parcelAvatarIsEntering != null)
-                {
-                    if (avatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT)
-                    {
-                        if (parcelAvatarIsEntering.IsBannedFromLand(avatar.UUID))
-                        {
-                            SendYouAreBannedNotice(avatar);
-                            ForceAvatarToPosition(avatar, m_scene.GetNearestAllowedPosition(avatar));
-                        }
-                        else if (parcelAvatarIsEntering.IsRestrictedFromLand(avatar.UUID))
-                        {
-                            SendYouAreRestrictedNotice(avatar);
-                            ForceAvatarToPosition(avatar, m_scene.GetNearestAllowedPosition(avatar));
-                        }
-                        else
-                        {
-                            avatar.sentMessageAboutRestrictedParcelFlyingDown = true;
-                        }
-                    }
-                    else
-                    {
-                        avatar.sentMessageAboutRestrictedParcelFlyingDown = true;
-                    }
-                }
+                    EnforceBans(parcelAvatarIsEntering, avatar);
             }
         }
 
@@ -461,30 +407,51 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void SendLandUpdate(ScenePresence avatar, bool force)
         {
+
+            /* stop sendind same data twice
+                        ILandObject over = GetLandObject((int)Math.Min(((int)Constants.RegionSize - 1), Math.Max(0, Math.Round(avatar.AbsolutePosition.X))),
+                                                         (int)Math.Min(((int)Constants.RegionSize - 1), Math.Max(0, Math.Round(avatar.AbsolutePosition.Y))));
+
+                        if (over != null)
+                        {
+
+                            if (force)
+                            {
+                                if (!avatar.IsChildAgent)
+                                {
+                                    over.SendLandUpdateToClient(avatar.ControllingClient);
+                                    m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.LandData.LocalID,
+                                                                                        m_scene.RegionInfo.RegionID);
+                                }
+                            }
+
+                            if (avatar.currentParcelUUID != over.LandData.GlobalID)
+                            {
+                                if (!avatar.IsChildAgent)
+                                {
+                                    over.SendLandUpdateToClient(avatar.ControllingClient);
+                                    avatar.currentParcelUUID = over.LandData.GlobalID;
+                                    m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.LandData.LocalID,
+                                                                                        m_scene.RegionInfo.RegionID);
+                                }
+                            }
+             */
+            if (avatar.IsChildAgent)
+                return;
+
             ILandObject over = GetLandObject((int)Math.Min(((int)Constants.RegionSize - 1), Math.Max(0, Math.Round(avatar.AbsolutePosition.X))),
-                                             (int)Math.Min(((int)Constants.RegionSize - 1), Math.Max(0, Math.Round(avatar.AbsolutePosition.Y))));
+                                                         (int)Math.Min(((int)Constants.RegionSize - 1), Math.Max(0, Math.Round(avatar.AbsolutePosition.Y))));
 
             if (over != null)
             {
-                if (force)
+                bool NotsameID = (avatar.currentParcelUUID != over.LandData.GlobalID);
+                if (force || NotsameID)
                 {
-                    if (!avatar.IsChildAgent)
-                    {
-                        over.SendLandUpdateToClient(avatar.ControllingClient);
-                        m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.LandData.LocalID,
-                                                                            m_scene.RegionInfo.RegionID);
-                    }
-                }
-
-                if (avatar.currentParcelUUID != over.LandData.GlobalID)
-                {
-                    if (!avatar.IsChildAgent)
-                    {
-                        over.SendLandUpdateToClient(avatar.ControllingClient);
+                    over.SendLandUpdateToClient(avatar.ControllingClient);
+                    if (NotsameID)
                         avatar.currentParcelUUID = over.LandData.GlobalID;
-                        m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.LandData.LocalID,
-                                                                            m_scene.RegionInfo.RegionID);
-                    }
+                    m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.LandData.LocalID,
+                                                                        m_scene.RegionInfo.RegionID);
                 }
             }
         }
@@ -536,6 +503,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     //when we are finally in a safe place, lets release the forced position lock
                     forcedPosition.Remove(clientAvatar.ControllingClient.AgentId);
                 }
+                                EnforceBans(parcel, clientAvatar);
             }
         }
 
@@ -686,27 +654,28 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// </summary>        
         public void Clear(bool setupDefaultParcel)
         {
-            List<ILandObject> parcels;
+            Dictionary<int, ILandObject> landworkList;
+            // move to work pointer since we are deleting it all
             lock (m_landList)
             {
-                parcels = new List<ILandObject>(m_landList.Values);
+                landworkList = m_landList;
+                m_landList = new Dictionary<int, ILandObject>();
             }
 
-            foreach (ILandObject lo in parcels)
+            // this 2 methods have locks (now)
+            ResetSimLandObjects();
+
+            if (setupDefaultParcel)
+                CreateDefaultParcel();
+
+            // fire outside events unlocked
+            foreach (ILandObject lo in landworkList.Values)
             {
                 //m_scene.SimulationDataService.RemoveLandObject(lo.LandData.GlobalID);
                 m_scene.EventManager.TriggerLandObjectRemoved(lo.LandData.GlobalID);
             }
+            landworkList.Clear();
 
-            lock (m_landList)
-            {
-                m_landList.Clear();
-
-                ResetSimLandObjects();
-            }
-            
-            if (setupDefaultParcel)
-                CreateDefaultParcel();
         }
 
         private void performFinalLandJoin(ILandObject master, ILandObject slave)
@@ -753,7 +722,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             int x;
             int y;
 
-            if (x_float >= Constants.RegionSize || x_float < 0 || y_float >= Constants.RegionSize || y_float < 0)
+            if (x_float > Constants.RegionSize || x_float < 0 || y_float > Constants.RegionSize || y_float < 0)
                 return null;
 
             try
@@ -803,14 +772,13 @@ namespace OpenSim.Region.CoreModules.World.Land
             {
                 try
                 {
-                    return m_landList[m_landIDList[x / 4, y / 4]];
+                    //if (m_landList.ContainsKey(m_landIDList[x / 4, y / 4]))
+                        return m_landList[m_landIDList[x / 4, y / 4]];
+                    //else
+                    //    return null;
                 }
                 catch (IndexOutOfRangeException)
                 {
-//                    m_log.WarnFormat(
-//                        "[LAND MANAGEMENT MODULE]: Tried to retrieve land object from out of bounds co-ordinate ({0},{1}) in {2}", 
-//                        x, y, m_scene.RegionInfo.RegionName);
-                    
                     return null;
                 }
             }
@@ -1094,6 +1062,10 @@ namespace OpenSim.Region.CoreModules.World.Land
                             //Owner Flag
                             tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_REQUESTER);
                         }
+                        else if (currentParcelBlock.LandData.IsGroupOwned && remote_client.IsGroupMember(currentParcelBlock.LandData.GroupID))
+                        {
+                            tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_GROUP);
+                        }
                         else if (currentParcelBlock.LandData.SalePrice > 0 &&
                                  (currentParcelBlock.LandData.AuthBuyerID == UUID.Zero ||
                                   currentParcelBlock.LandData.AuthBuyerID == remote_client.AgentId))
@@ -1174,8 +1146,11 @@ namespace OpenSim.Region.CoreModules.World.Land
                     {
                         if (!temp.Contains(currentParcel))
                         {
-                            currentParcel.ForceUpdateLandInfo();
-                            temp.Add(currentParcel);
+                            if (!currentParcel.IsEitherBannedOrRestricted(remote_client.AgentId))
+                            {
+                                currentParcel.ForceUpdateLandInfo();
+                                temp.Add(currentParcel);
+                            }
                         }
                     }
                 }
@@ -1394,8 +1369,26 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void EventManagerOnIncomingLandDataFromStorage(List<LandData> data)
         {
-//            m_log.DebugFormat(
-//                "[LAND MANAGMENT MODULE]: Processing {0} incoming parcels on {1}", data.Count, m_scene.Name);
+            Dictionary<int, ILandObject> landworkList;
+            // move to work pointer since we are deleting it all
+            lock (m_landList)
+            {
+                landworkList = m_landList;
+                m_landList = new Dictionary<int, ILandObject>();
+            }
+
+            //Remove all the land objects in the sim and then process our new data
+            foreach (int n in landworkList.Keys)
+            {
+                m_scene.EventManager.TriggerLandObjectRemoved(landworkList[n].LandData.GlobalID);
+            }
+            landworkList.Clear();
+
+            lock (m_landList)
+            {
+                m_landIDList.Initialize();
+                m_landList.Clear();
+            }
 
             for (int i = 0; i < data.Count; i++)
                 IncomingLandObjectFromStorage(data[i]);
@@ -1403,10 +1396,12 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void IncomingLandObjectFromStorage(LandData data)
         {
+
             ILandObject new_land = new LandObject(data.OwnerID, data.IsGroupOwned, m_scene);
             new_land.LandData = data.Copy();
             new_land.SetLandBitmapFromByteArray();            
             AddLandObject(new_land);
+            new_land.SendLandUpdateToAvatarsOverMe();
         }
 
         public void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient)
@@ -1737,6 +1732,168 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             UpdateLandObject(localID, land.LandData);
         }
+
+        public void ClientOnParcelGodMark(IClientAPI client, UUID god, int landID)
+        {
+            ILandObject land = null;
+            List<ILandObject> Land = ((Scene)client.Scene).LandChannel.AllParcels();
+            foreach (ILandObject landObject in Land)
+            {
+                if (landObject.LandData.LocalID == landID)
+                {
+                    land = landObject;
+                }
+            }
+            land.DeedToGroup(DefaultGodParcelGroup);
+            land.LandData.Name = DefaultGodParcelName;
+            land.SendLandUpdateToAvatarsOverMe();
+        }
+
+        private void ClientOnSimWideDeletes(IClientAPI client, UUID agentID, int flags, UUID targetID)
+        {
+            ScenePresence SP;
+            ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out SP);
+            List<SceneObjectGroup> returns = new List<SceneObjectGroup>();
+            if (SP.UserLevel != 0)
+            {
+                if (flags == 0) //All parcels, scripted or not
+                {
+                    ((Scene)client.Scene).ForEachSOG(delegate(SceneObjectGroup e)
+                    {
+                        if (e.OwnerID == targetID)
+                        {
+                            returns.Add(e);
+                        }
+                    }
+                                                    );
+                }
+                if (flags == 4) //All parcels, scripted object
+                {
+                    ((Scene)client.Scene).ForEachSOG(delegate(SceneObjectGroup e)
+                    {
+                        if (e.OwnerID == targetID)
+                        {
+                            if (e.ContainsScripts())
+                            {
+                                returns.Add(e);
+                            }
+                        }
+                    }
+                                                    );
+                }
+                if (flags == 4) //not target parcel, scripted object
+                {
+                    ((Scene)client.Scene).ForEachSOG(delegate(SceneObjectGroup e)
+                    {
+                        if (e.OwnerID == targetID)
+                        {
+                            ILandObject landobject = ((Scene)client.Scene).LandChannel.GetLandObject(e.AbsolutePosition.X, e.AbsolutePosition.Y);
+                            if (landobject.LandData.OwnerID != e.OwnerID)
+                            {
+                                if (e.ContainsScripts())
+                                {
+                                    returns.Add(e);
+                                }
+                            }
+                        }
+                    }
+                                                    );
+                }
+                foreach (SceneObjectGroup ol in returns)
+                {
+                    ReturnObject(ol, client);
+                }
+            }
+        }
+        public void ReturnObject(SceneObjectGroup obj, IClientAPI client)
+        {
+            SceneObjectGroup[] objs = new SceneObjectGroup[1];
+            objs[0] = obj;
+            ((Scene)client.Scene).returnObjects(objs, client.AgentId);
+        }
+
+        Dictionary<UUID, System.Threading.Timer> Timers = new Dictionary<UUID, System.Threading.Timer>();
+
+        public void ClientOnParcelFreezeUser(IClientAPI client, UUID parcelowner, uint flags, UUID target)
+        {
+            ScenePresence targetAvatar = null;
+            ((Scene)client.Scene).TryGetScenePresence(target, out targetAvatar);
+            ScenePresence parcelManager = null;
+            ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out parcelManager);
+            System.Threading.Timer Timer;
+
+            if (targetAvatar.UserLevel == 0)
+            {
+                ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
+                if (!((Scene)client.Scene).Permissions.CanEditParcelProperties(client.AgentId, land, GroupPowers.LandEjectAndFreeze))
+                    return;
+                if (flags == 0)
+                {
+                    targetAvatar.AllowMovement = false;
+                    targetAvatar.ControllingClient.SendAlertMessage(parcelManager.Firstname + " " + parcelManager.Lastname + " has frozen you for 30 seconds.  You cannot move or interact with the world.");
+                    parcelManager.ControllingClient.SendAlertMessage("Avatar Frozen.");
+                    System.Threading.TimerCallback timeCB = new System.Threading.TimerCallback(OnEndParcelFrozen);
+                    Timer = new System.Threading.Timer(timeCB, targetAvatar, 30000, 0);
+                    Timers.Add(targetAvatar.UUID, Timer);
+                }
+                else
+                {
+                    targetAvatar.AllowMovement = true;
+                    targetAvatar.ControllingClient.SendAlertMessage(parcelManager.Firstname + " " + parcelManager.Lastname + " has unfrozen you.");
+                    parcelManager.ControllingClient.SendAlertMessage("Avatar Unfrozen.");
+                    Timers.TryGetValue(targetAvatar.UUID, out Timer);
+                    Timers.Remove(targetAvatar.UUID);
+                    Timer.Dispose();
+                }
+            }
+        }
+        private void OnEndParcelFrozen(object avatar)
+        {
+            ScenePresence targetAvatar = (ScenePresence)avatar;
+            targetAvatar.AllowMovement = true;
+            System.Threading.Timer Timer;
+            Timers.TryGetValue(targetAvatar.UUID, out Timer);
+            Timers.Remove(targetAvatar.UUID);
+            targetAvatar.ControllingClient.SendAgentAlertMessage("The freeze has worn off; you may go about your business.", false);
+        }
+
+
+        public void ClientOnParcelEjectUser(IClientAPI client, UUID parcelowner, uint flags, UUID target)
+        {
+            ScenePresence targetAvatar = null;
+            ScenePresence parcelManager = null;
+
+            // Must have presences
+            if (!m_scene.TryGetScenePresence(target, out targetAvatar) ||
+                !m_scene.TryGetScenePresence(client.AgentId, out parcelManager))
+                return;
+
+            // Cannot eject estate managers or gods
+            if (m_scene.Permissions.IsAdministrator(target))
+                return;
+
+            // Check if you even have permission to do this
+            ILandObject land = m_scene.LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
+            if (!m_scene.Permissions.CanEditParcelProperties(client.AgentId, land, GroupPowers.LandEjectAndFreeze) &&
+                !m_scene.Permissions.IsAdministrator(client.AgentId))
+                return;
+
+            Vector3 pos = m_scene.GetNearestAllowedPosition(targetAvatar, land);
+
+            targetAvatar.TeleportWithMomentum(pos, null);
+            targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
+            parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
+            
+            if ((flags & 1) != 0) // Ban TODO: Remove magic number
+            {
+                LandAccessEntry entry = new LandAccessEntry();
+                entry.AgentID = targetAvatar.UUID;
+                entry.Flags = AccessList.Ban;
+                entry.Expires = 0; // Perm
+
+                land.LandData.ParcelAccessList.Add(entry);
+            }
+        }
         
         protected void InstallInterfaces()
         {
@@ -1799,5 +1956,27 @@ namespace OpenSim.Region.CoreModules.World.Land
             
             MainConsole.Instance.Output(report.ToString());
         }         
+
+        public void EnforceBans(ILandObject land, ScenePresence avatar)
+        {
+            if (avatar.AbsolutePosition.Z > LandChannel.BAN_LINE_SAFETY_HIEGHT)
+                return;
+
+            if (land.IsEitherBannedOrRestricted(avatar.UUID))
+            {
+                if (land.ContainsPoint(Convert.ToInt32(avatar.lastKnownAllowedPosition.X), Convert.ToInt32(avatar.lastKnownAllowedPosition.Y)))
+                {
+                    Vector3? pos = m_scene.GetNearestAllowedPosition(avatar);
+                    if (pos == null)
+                        m_scene.TeleportClientHome(avatar.UUID, avatar.ControllingClient);
+                    else
+                        ForceAvatarToPosition(avatar, (Vector3)pos);
+                }
+                else
+                {
+                    ForceAvatarToPosition(avatar, avatar.lastKnownAllowedPosition);
+                }
+            }
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 5969d45..07d00c0 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -51,6 +51,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         private bool[,] m_landBitmap = new bool[landArrayMax,landArrayMax];
 
         private int m_lastSeqId = 0;
+        private int m_expiryCounter = 0;
 
         protected LandData m_landData = new LandData();        
         protected Scene m_scene;
@@ -136,6 +137,8 @@ namespace OpenSim.Region.CoreModules.World.Land
             else
                 LandData.GroupID = UUID.Zero;
             LandData.IsGroupOwned = is_group_owned;
+            
+            m_scene.EventManager.OnFrame += OnFrame;
         }
 
         #endregion
@@ -194,10 +197,27 @@ namespace OpenSim.Region.CoreModules.World.Land
             else
             {
                 // Normal Calculations
-                int parcelMax = (int)(((float)LandData.Area / 65536.0f)
-                              * (float)m_scene.RegionInfo.ObjectCapacity
-                              * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus);
-                // TODO: The calculation of ObjectBonus should be refactored. It does still not work in the same manner as SL!
+                int parcelMax = (int)((long)LandData.Area
+                              * (long)m_scene.RegionInfo.ObjectCapacity
+                              * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus
+                              / 65536L);
+                //m_log.DebugFormat("Area: {0}, Capacity {1}, Bonus {2}, Parcel {3}", LandData.Area, m_scene.RegionInfo.ObjectCapacity, m_scene.RegionInfo.RegionSettings.ObjectBonus, parcelMax);
+                return parcelMax;
+            }
+        }
+
+        private int GetParcelBasePrimCount()
+        {
+            if (overrideParcelMaxPrimCount != null)
+            {
+                return overrideParcelMaxPrimCount(this);
+            }
+            else
+            {
+                // Normal Calculations
+                int parcelMax = (int)((long)LandData.Area
+                              * (long)m_scene.RegionInfo.ObjectCapacity
+                              / 65536L);
                 return parcelMax;
             }
         }
@@ -211,8 +231,9 @@ namespace OpenSim.Region.CoreModules.World.Land
             else
             {
                 //Normal Calculations
-                int simMax = (int)(((float)LandData.SimwideArea / 65536.0f)
-                           * (float)m_scene.RegionInfo.ObjectCapacity);
+                int simMax = (int)((long)LandData.SimwideArea
+                           * (long)m_scene.RegionInfo.ObjectCapacity / 65536L);
+                // m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}", LandData.SimwideArea, m_scene.RegionInfo.ObjectCapacity, simMax);
                 return simMax;
             }
         }
@@ -249,7 +270,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             remote_client.SendLandProperties(seq_id,
                     snap_selection, request_result, this,
                     (float)m_scene.RegionInfo.RegionSettings.ObjectBonus,
-                    GetParcelMaxPrimCount(),
+                    GetParcelBasePrimCount(),
                     GetSimulatorMaxPrimCount(), regionFlags);
         }
 
@@ -309,7 +330,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
                 allowedDelta |= (uint)(ParcelFlags.ShowDirectory |
                         ParcelFlags.AllowPublish |
-                        ParcelFlags.MaturePublish);
+                        ParcelFlags.MaturePublish) | (uint)(1 << 23);
             }
 
             if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId,this, GroupPowers.LandChangeIdentity))
@@ -421,6 +442,19 @@ namespace OpenSim.Region.CoreModules.World.Land
             return false;
         }
 
+        public bool CanBeOnThisLand(UUID avatar, float posHeight)
+        {
+            if (posHeight < LandChannel.BAN_LINE_SAFETY_HIEGHT && IsBannedFromLand(avatar))
+            {
+                return false;
+            }
+            else if (IsRestrictedFromLand(avatar))
+            {
+                return false;
+            }
+            return true;
+        }
+
         public bool HasGroupAccess(UUID avatar)
         {
             if (LandData.GroupID != UUID.Zero && (LandData.Flags & (uint)ParcelFlags.UseAccessGroup) == (uint)ParcelFlags.UseAccessGroup)
@@ -1185,6 +1219,17 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         #endregion
 
+        private void OnFrame()
+        {
+            m_expiryCounter++;
+
+            if (m_expiryCounter >= 50)
+            {
+                ExpireAccessList();
+                m_expiryCounter = 0;
+            }
+        }
+
         private void ExpireAccessList()
         {
             List<LandAccessEntry> delete = new List<LandAccessEntry>();
@@ -1195,7 +1240,22 @@ namespace OpenSim.Region.CoreModules.World.Land
                     delete.Add(entry);
             }
             foreach (LandAccessEntry entry in delete)
+            {
                 LandData.ParcelAccessList.Remove(entry);
+                ScenePresence presence;
+                
+                if (m_scene.TryGetScenePresence(entry.AgentID, out presence) && (!presence.IsChildAgent))
+                {
+                    ILandObject land = m_scene.LandChannel.GetLandObject(presence.AbsolutePosition.X, presence.AbsolutePosition.Y);
+                    if (land.LandData.LocalID == LandData.LocalID)
+                    {
+                        Vector3 pos = m_scene.GetNearestAllowedPosition(presence, land);
+                        presence.TeleportWithMomentum(pos, null);
+                        presence.ControllingClient.SendAlertMessage("You have been ejected from this land");
+                    }
+                }
+                m_log.DebugFormat("[LAND]: Removing entry {0} because it has expired", entry.AgentID);
+            }
 
             if (delete.Count > 0)
                 m_scene.EventManager.TriggerLandObjectUpdated((uint)LandData.LocalID, this);
diff --git a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
index 9b51cc8..771fdd2 100644
--- a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
@@ -207,7 +207,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             if (m_ParcelCounts.TryGetValue(landData.GlobalID, out parcelCounts))
             {
                 UUID landOwner = landData.OwnerID;
-                int partCount = obj.Parts.Length;
+                int partCount = obj.GetPartCount();
 
                 m_SimwideCounts[landOwner] += partCount;
                 if (parcelCounts.Users.ContainsKey(obj.OwnerID))
@@ -597,4 +597,4 @@ namespace OpenSim.Region.CoreModules.World.Land
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs b/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
index 4e20196..6f92ef6 100644
--- a/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
+++ b/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
@@ -190,6 +190,9 @@ namespace OpenSim.Region.CoreModules.World.LightShare
 
         public void SendProfileToClient(IClientAPI client, RegionLightShareData wl)
         {
+            if (client == null)
+                return;
+
             if (m_enableWindlight)
             {
                 if (m_scene.RegionInfo.WindlightSettings.valid)
@@ -207,7 +210,8 @@ namespace OpenSim.Region.CoreModules.World.LightShare
 
         private void EventManager_OnMakeRootAgent(ScenePresence presence)
         {
-            m_log.Debug("[WINDLIGHT]: Sending windlight scene to new client");
+            if (m_enableWindlight && m_scene.RegionInfo.WindlightSettings.valid)
+                m_log.Debug("[WINDLIGHT]: Sending windlight scene to new client");
             SendProfileToClient(presence.ControllingClient);
         }
 
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
index 1e4f0a4..eb4731c 100644
--- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
@@ -176,6 +176,13 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
                     return false;
                 }
 
+                if ((perms & (uint)PermissionMask.Copy) == 0)
+                {
+                    if (m_dialogModule != null)
+                        m_dialogModule.SendAlertToUser(remoteClient, "This sale has been blocked by the permissions system");
+                    return false;
+                }
+
                 AssetBase asset = m_scene.CreateAsset(
                     group.GetPartName(localID),
                     group.GetPartDescription(localID),
diff --git a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
index 249a40d..9c441ed 100644
--- a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
+++ b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
@@ -29,6 +29,8 @@ using System;
 using System.Linq;
 using System.Reflection;
 using System.Timers;
+using System.IO;
+using System.Diagnostics;
 using System.Threading;
 using System.Collections.Generic;
 using log4net;
@@ -57,13 +59,24 @@ namespace OpenSim.Region.CoreModules.World.Region
         protected UUID m_Initiator;
         protected bool m_Notice = false;
         protected IDialogModule m_DialogModule = null;
+        protected string m_MarkerPath = String.Empty;
+        private int[] m_CurrentAlerts = null;
 
         public void Initialise(IConfigSource config)
         {
+            IConfig restartConfig = config.Configs["RestartModule"];
+            if (restartConfig != null)
+            {
+                m_MarkerPath = restartConfig.GetString("MarkerPath", String.Empty);
+            }
         }
 
         public void AddRegion(Scene scene)
         {
+            if (m_MarkerPath != String.Empty)
+                File.Delete(Path.Combine(m_MarkerPath,
+                        scene.RegionInfo.RegionID.ToString()));
+
             m_Scene = scene;
             
             scene.RegisterModuleInterface<IRestartModule>(this);
@@ -122,6 +135,7 @@ namespace OpenSim.Region.CoreModules.World.Region
 
             if (alerts == null)
             {
+                CreateMarkerFile();
                 m_Scene.RestartNow();
                 return;
             }
@@ -129,25 +143,28 @@ namespace OpenSim.Region.CoreModules.World.Region
             m_Message = message;
             m_Initiator = initiator;
             m_Notice = notice;
+            m_CurrentAlerts = alerts;
             m_Alerts = new List<int>(alerts);
             m_Alerts.Sort();
             m_Alerts.Reverse();
 
             if (m_Alerts[0] == 0)
             {
+                CreateMarkerFile();
                 m_Scene.RestartNow();
                 return;
             }
 
-            int nextInterval = DoOneNotice();
+            int nextInterval = DoOneNotice(true);
 
             SetTimer(nextInterval);
         }
 
-        public int DoOneNotice()
+        public int DoOneNotice(bool sendOut)
         {
             if (m_Alerts.Count == 0 || m_Alerts[0] == 0)
             {
+                CreateMarkerFile();
                 m_Scene.RestartNow();
                 return 0;
             }
@@ -168,34 +185,37 @@ namespace OpenSim.Region.CoreModules.World.Region
 
             m_Alerts.RemoveAt(0);
 
-            int minutes = currentAlert / 60;
-            string currentAlertString = String.Empty;
-            if (minutes > 0)
+            if (sendOut)
             {
-                if (minutes == 1)
-                    currentAlertString += "1 minute";
-                else
-                    currentAlertString += String.Format("{0} minutes", minutes);
+                int minutes = currentAlert / 60;
+                string currentAlertString = String.Empty;
+                if (minutes > 0)
+                {
+                    if (minutes == 1)
+                        currentAlertString += "1 minute";
+                    else
+                        currentAlertString += String.Format("{0} minutes", minutes);
+                    if ((currentAlert % 60) != 0)
+                        currentAlertString += " and ";
+                }
                 if ((currentAlert % 60) != 0)
-                    currentAlertString += " and ";
-            }
-            if ((currentAlert % 60) != 0)
-            {
-                int seconds = currentAlert % 60;
-                if (seconds == 1)
-                    currentAlertString += "1 second";
-                else
-                    currentAlertString += String.Format("{0} seconds", seconds);
-            }
+                {
+                    int seconds = currentAlert % 60;
+                    if (seconds == 1)
+                        currentAlertString += "1 second";
+                    else
+                        currentAlertString += String.Format("{0} seconds", seconds);
+                }
 
-            string msg = String.Format(m_Message, currentAlertString);
+                string msg = String.Format(m_Message, currentAlertString);
 
-            if (m_DialogModule != null && msg != String.Empty)
-            {
-                if (m_Notice)
-                    m_DialogModule.SendGeneralAlert(msg);
-                else
-                    m_DialogModule.SendNotificationToUsersInRegion(m_Initiator, "System", msg);
+                if (m_DialogModule != null && msg != String.Empty)
+                {
+                    if (m_Notice)
+                        m_DialogModule.SendGeneralAlert(msg);
+                    else
+                        m_DialogModule.SendNotificationToUsersInRegion(m_Initiator, "System", msg);
+                }
             }
 
             return currentAlert - nextAlert;
@@ -212,7 +232,25 @@ namespace OpenSim.Region.CoreModules.World.Region
 
         private void OnTimer(object source, ElapsedEventArgs e)
         {
-            int nextInterval = DoOneNotice();
+            int nextInterval = DoOneNotice(true);
+
+            SetTimer(nextInterval);
+        }
+
+        public void DelayRestart(int seconds, string message)
+        {
+            if (m_CountdownTimer == null)
+                return;
+
+            m_CountdownTimer.Stop();
+            m_CountdownTimer = null;
+
+            m_Alerts = new List<int>(m_CurrentAlerts);
+            m_Alerts.Add(seconds);
+            m_Alerts.Sort();
+            m_Alerts.Reverse();
+
+            int nextInterval = DoOneNotice(false);
 
             SetTimer(nextInterval);
         }
@@ -226,6 +264,9 @@ namespace OpenSim.Region.CoreModules.World.Region
                 if (m_DialogModule != null && message != String.Empty)
                     m_DialogModule.SendGeneralAlert(message);
             }
+            if (m_MarkerPath != String.Empty)
+                File.Delete(Path.Combine(m_MarkerPath,
+                        m_Scene.RegionInfo.RegionID.ToString()));
         }
         
         private void HandleRegionRestart(string module, string[] args)
@@ -270,5 +311,25 @@ namespace OpenSim.Region.CoreModules.World.Region
 
             ScheduleRestart(UUID.Zero, args[3], times.ToArray(), notice);
         }
+
+        protected void CreateMarkerFile()
+        {
+            if (m_MarkerPath == String.Empty)
+                return;
+
+            string path = Path.Combine(m_MarkerPath, m_Scene.RegionInfo.RegionID.ToString());
+            try
+            {
+                string pidstring = System.Diagnostics.Process.GetCurrentProcess().Id.ToString();
+                FileStream fs = File.Create(path);
+                System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding();
+                Byte[] buf = enc.GetBytes(pidstring);
+                fs.Write(buf, 0, buf.Length);
+                fs.Close();
+            }
+            catch (Exception)
+            {
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index fd30c46..4d738a5 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -644,6 +644,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 m_scene.PhysicsScene.SetTerrain(m_channel.GetFloatsSerialised());
                 m_scene.SaveTerrain();
 
+                m_scene.EventManager.TriggerTerrainUpdate();
+
                 // Clients who look at the map will never see changes after they looked at the map, so i've commented this out.
                 //m_scene.CreateTerrainTexture(true);
             }
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
index 5e0dfa7..7ef44db 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
@@ -65,6 +65,9 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
         private bool m_useAntiAliasing = false; // TODO: Make this a config option
         private bool m_Enabled = false;
 
+        private Bitmap lastImage = null;
+        private DateTime lastImageTime = DateTime.MinValue;
+
         #region Region Module interface
 
         public void Initialise(IConfigSource source)
@@ -87,14 +90,9 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
 
             List<string> renderers = RenderingLoader.ListRenderers(Util.ExecutingDirectory());
             if (renderers.Count > 0)
-            {
-                m_primMesher = RenderingLoader.LoadRenderer(renderers[0]);
-                m_log.DebugFormat("[WARP 3D IMAGE MODULE]: Loaded prim mesher {0}", m_primMesher);
-            }
+                m_log.Info("[MAPTILE]: Loaded prim mesher " + renderers[0]);
             else
-            {
-                m_log.Debug("[WARP 3D IMAGE MODULE]: No prim mesher loaded, prim rendering will be disabled");
-            }
+                m_log.Info("[MAPTILE]: No prim mesher loaded, prim rendering will be disabled");
 
             m_scene.RegisterModuleInterface<IMapImageGenerator>(this);
         }
@@ -127,9 +125,25 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
 
         public Bitmap CreateMapTile()
         {
+            if ((DateTime.Now - lastImageTime).TotalSeconds < 3600)
+            {
+                return lastImage.Clone(new Rectangle(0, 0, 256, 256), lastImage.PixelFormat);
+            }
+
+            List<string> renderers = RenderingLoader.ListRenderers(Util.ExecutingDirectory());
+            if (renderers.Count > 0)
+            {
+                m_primMesher = RenderingLoader.LoadRenderer(renderers[0]);
+            }
+
             Vector3 camPos = new Vector3(127.5f, 127.5f, 221.7025033688163f);
             Viewport viewport = new Viewport(camPos, -Vector3.UnitZ, 1024f, 0.1f, (int)Constants.RegionSize, (int)Constants.RegionSize, (float)Constants.RegionSize, (float)Constants.RegionSize);
-            return CreateMapTile(viewport, false);
+            Bitmap tile = CreateMapTile(viewport, false);
+            m_primMesher = null;
+
+            lastImage = tile;
+            lastImageTime = DateTime.Now;
+            return lastImage.Clone(new Rectangle(0, 0, 256, 256), lastImage.PixelFormat);
         }
 
         public Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height, bool useTextures)
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index 708a9a2..4c96a50 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -128,85 +128,93 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
         private void OnMapNameRequest(IClientAPI remoteClient, string mapName, uint flags)
         {
-            List<MapBlockData> blocks = new List<MapBlockData>();
-            MapBlockData data;
-            if (mapName.Length < 3 || (mapName.EndsWith("#") && mapName.Length < 4))
+            Util.FireAndForget(x =>
             {
+                if (mapName.Length < 2)
+                {
+                    remoteClient.SendAlertMessage("Use a search string with at least 2 characters");
+                    return;
+                }
+
+                //m_log.DebugFormat("MAP NAME=({0})", mapName);
+
+                // Hack to get around the fact that ll V3 now drops the port from the
+                // map name. See https://jira.secondlife.com/browse/VWR-28570
+                //
+                // Caller, use this magic form instead:
+                // secondlife://http|!!mygrid.com|8002|Region+Name/128/128
+                // or url encode if possible.
+                // the hacks we do with this viewer...
+                //
+                string mapNameOrig = mapName;
+                if (mapName.Contains("|"))
+                    mapName = mapName.Replace('|', ':');
+                if (mapName.Contains("+"))
+                    mapName = mapName.Replace('+', ' ');
+                if (mapName.Contains("!"))
+                    mapName = mapName.Replace('!', '/');
+                
+                // try to fetch from GridServer
+                List<GridRegion> regionInfos = m_scene.GridService.GetRegionsByName(m_scene.RegionInfo.ScopeID, mapName, 20);
+    //            if (regionInfos.Count == 0)
+    //                remoteClient.SendAlertMessage("Hyperlink could not be established.");
+
+                //m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions", mapName, regionInfos.Count);
+                List<MapBlockData> blocks = new List<MapBlockData>();
+
+                MapBlockData data;
+                if (regionInfos.Count > 0)
+                {
+                    foreach (GridRegion info in regionInfos)
+                    {
+                        data = new MapBlockData();
+                        data.Agents = 0;
+                        data.Access = info.Access;
+                        if (flags == 2) // V2 sends this
+                            data.MapImageId = UUID.Zero; 
+                        else
+                            data.MapImageId = info.TerrainImage;
+                        // ugh! V2-3 is very sensitive about the result being
+                        // exactly the same as the requested name
+                        if (regionInfos.Count == 1 && mapNameOrig.Contains("|") || mapNameOrig.Contains("+"))
+                            data.Name = mapNameOrig;
+                        else
+                            data.Name = info.RegionName;
+                        data.RegionFlags = 0; // TODO not used?
+                        data.WaterHeight = 0; // not used
+                        data.X = (ushort)(info.RegionLocX / Constants.RegionSize);
+                        data.Y = (ushort)(info.RegionLocY / Constants.RegionSize);
+                        blocks.Add(data);
+                    }
+                }
+
                 // final block, closing the search result
-                AddFinalBlock(blocks);
+                data = new MapBlockData();
+                data.Agents = 0;
+                data.Access = 255;
+                data.MapImageId = UUID.Zero;
+                data.Name = mapName;
+                data.RegionFlags = 0;
+                data.WaterHeight = 0; // not used
+                data.X = 0;
+                data.Y = 0;
+                blocks.Add(data);
 
                 // flags are agent flags sent from the viewer.
                 // they have different values depending on different viewers, apparently
                 remoteClient.SendMapBlock(blocks, flags);
-                remoteClient.SendAlertMessage("Use a search string with at least 3 characters");
-                return;
-            }
-
 
-            //m_log.DebugFormat("MAP NAME=({0})", mapName);
-
-            // Hack to get around the fact that ll V3 now drops the port from the
-            // map name. See https://jira.secondlife.com/browse/VWR-28570
-            //
-            // Caller, use this magic form instead:
-            // secondlife://http|!!mygrid.com|8002|Region+Name/128/128
-            // or url encode if possible.
-            // the hacks we do with this viewer...
-            //
-            string mapNameOrig = mapName;
-            if (mapName.Contains("|"))
-                mapName = mapName.Replace('|', ':');
-            if (mapName.Contains("+"))
-                mapName = mapName.Replace('+', ' ');
-            if (mapName.Contains("!"))
-                mapName = mapName.Replace('!', '/');
-            
-            // try to fetch from GridServer
-            List<GridRegion> regionInfos = m_scene.GridService.GetRegionsByName(m_scene.RegionInfo.ScopeID, mapName, 20);
-
-            m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions. Flags={2}", mapName, regionInfos.Count, flags);
-            if (regionInfos.Count > 0)
-            {
-                foreach (GridRegion info in regionInfos)
+                // send extra user messages for V3
+                // because the UI is very confusing
+                // while we don't fix the hard-coded urls
+                if (flags == 2) 
                 {
-                    data = new MapBlockData();
-                    data.Agents = 0;
-                    data.Access = info.Access;
-                    if (flags == 2) // V2 sends this
-                        data.MapImageId = UUID.Zero; 
-                    else
-                        data.MapImageId = info.TerrainImage;
-                    // ugh! V2-3 is very sensitive about the result being
-                    // exactly the same as the requested name
-                    if (regionInfos.Count == 1 && mapNameOrig.Contains("|") || mapNameOrig.Contains("+"))
-                        data.Name = mapNameOrig;
-                    else
-                        data.Name = info.RegionName;
-                    data.RegionFlags = 0; // TODO not used?
-                    data.WaterHeight = 0; // not used
-                    data.X = (ushort)(info.RegionLocX / Constants.RegionSize);
-                    data.Y = (ushort)(info.RegionLocY / Constants.RegionSize);
-                    blocks.Add(data);
+                    if (regionInfos.Count == 0)
+                        remoteClient.SendAgentAlertMessage("No regions found with that name.", true);
+                    else if (regionInfos.Count == 1)
+                        remoteClient.SendAgentAlertMessage("Region found!", false);
                 }
-            }
-
-            // final block, closing the search result
-            AddFinalBlock(blocks);
-
-            // flags are agent flags sent from the viewer.
-            // they have different values depending on different viewers, apparently
-            remoteClient.SendMapBlock(blocks, flags);
-
-            // send extra user messages for V3
-            // because the UI is very confusing
-            // while we don't fix the hard-coded urls
-            if (flags == 2) 
-            {
-                if (regionInfos.Count == 0)
-                    remoteClient.SendAlertMessage("No regions found with that name.");
-                else if (regionInfos.Count == 1)
-                    remoteClient.SendAlertMessage("Region found!");
-            }
+            });
         }
 
         private void AddFinalBlock(List<MapBlockData> blocks)
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index e2f525c..2184a59 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -66,7 +66,11 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         private static readonly UUID STOP_UUID = UUID.Random();
         private static readonly string m_mapLayerPath = "0001/";
 
-        private OpenSim.Framework.BlockingQueue<MapRequestState> requests = new OpenSim.Framework.BlockingQueue<MapRequestState>();
+        private ManualResetEvent queueEvent = new ManualResetEvent(false);
+        private Queue<MapRequestState> requests = new Queue<MapRequestState>();
+
+        private ManualResetEvent m_mapBlockRequestEvent = new ManualResetEvent(false);
+        private Dictionary<UUID, Queue<MapBlockRequestData>> m_mapBlockRequests = new Dictionary<UUID, Queue<MapBlockRequestData>>();
 
         protected Scene m_scene;
         private List<MapBlockData> cachedMapBlocks = new List<MapBlockData>();
@@ -74,7 +78,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         private int blacklistTimeout = 10*60*1000; // 10 minutes
         private byte[] myMapImageJPEG;
         protected volatile bool m_Enabled = false;
-        private Dictionary<UUID, MapRequestState> m_openRequests = new Dictionary<UUID, MapRequestState>();
         private Dictionary<string, int> m_blacklistedurls = new Dictionary<string, int>();
         private Dictionary<ulong, int> m_blacklistedregions = new Dictionary<ulong, int>();
         private Dictionary<ulong, string> m_cachedRegionMapItemsAddress = new Dictionary<ulong, string>();
@@ -231,54 +234,54 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             // 6/8/2011 -- I'm adding an explicit 2048 check, so that we never forget that there is
             // a hack here, and so that regions below 4096 don't get spammed with unnecessary map blocks.
 
-            if (m_scene.RegionInfo.RegionLocX >= 2048 || m_scene.RegionInfo.RegionLocY >= 2048)
-            {
-                ScenePresence avatarPresence = null;
-
-                m_scene.TryGetScenePresence(agentID, out avatarPresence);
-
-                if (avatarPresence != null)
-                {
-                    bool lookup = false;
-
-                    lock (cachedMapBlocks)
-                    {
-                        if (cachedMapBlocks.Count > 0 && ((cachedTime + 1800) > Util.UnixTimeSinceEpoch()))
-                        {
-                            List<MapBlockData> mapBlocks;
-
-                            mapBlocks = cachedMapBlocks;
-                            avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0);
-                        }
-                        else
-                        {
-                            lookup = true;
-                        }
-                    }
-                    if (lookup)
-                    {
-                        List<MapBlockData> mapBlocks = new List<MapBlockData>(); ;
-
-                        List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
-                            (int)(m_scene.RegionInfo.RegionLocX - 8) * (int)Constants.RegionSize,
-                            (int)(m_scene.RegionInfo.RegionLocX + 8) * (int)Constants.RegionSize,
-                            (int)(m_scene.RegionInfo.RegionLocY - 8) * (int)Constants.RegionSize,
-                            (int)(m_scene.RegionInfo.RegionLocY + 8) * (int)Constants.RegionSize);
-                        foreach (GridRegion r in regions)
-                        {
-                            MapBlockData block = new MapBlockData();
-                            MapBlockFromGridRegion(block, r, 0);
-                            mapBlocks.Add(block);
-                        }
-                        avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0);
-
-                        lock (cachedMapBlocks)
-                            cachedMapBlocks = mapBlocks;
-
-                        cachedTime = Util.UnixTimeSinceEpoch();
-                    }
-                }
-            }
+            //if (m_scene.RegionInfo.RegionLocX >= 2048 || m_scene.RegionInfo.RegionLocY >= 2048)
+            //{
+            //    ScenePresence avatarPresence = null;
+
+            //    m_scene.TryGetScenePresence(agentID, out avatarPresence);
+
+            //    if (avatarPresence != null)
+            //    {
+            //        bool lookup = false;
+
+            //        lock (cachedMapBlocks)
+            //        {
+            //            if (cachedMapBlocks.Count > 0 && ((cachedTime + 1800) > Util.UnixTimeSinceEpoch()))
+            //            {
+            //                List<MapBlockData> mapBlocks;
+
+            //                mapBlocks = cachedMapBlocks;
+            //                avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0);
+            //            }
+            //            else
+            //            {
+            //                lookup = true;
+            //            }
+            //        }
+            //        if (lookup)
+            //        {
+            //            List<MapBlockData> mapBlocks = new List<MapBlockData>(); ;
+
+            //            List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
+            //                (int)(m_scene.RegionInfo.RegionLocX - 8) * (int)Constants.RegionSize,
+            //                (int)(m_scene.RegionInfo.RegionLocX + 8) * (int)Constants.RegionSize,
+            //                (int)(m_scene.RegionInfo.RegionLocY - 8) * (int)Constants.RegionSize,
+            //                (int)(m_scene.RegionInfo.RegionLocY + 8) * (int)Constants.RegionSize);
+            //            foreach (GridRegion r in regions)
+            //            {
+            //                MapBlockData block = new MapBlockData();
+            //                MapBlockFromGridRegion(block, r, 0);
+            //                mapBlocks.Add(block);
+            //            }
+            //            avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0);
+
+            //            lock (cachedMapBlocks)
+            //                cachedMapBlocks = mapBlocks;
+
+            //            cachedTime = Util.UnixTimeSinceEpoch();
+            //        }
+            //    }
+            //}
 
             LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse();
             mapResponse.LayerData.Array.Add(GetOSDMapLayerResponse());
@@ -305,8 +308,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         protected static OSDMapLayer GetOSDMapLayerResponse()
         {
             OSDMapLayer mapLayer = new OSDMapLayer();
-            mapLayer.Right = 5000;
-            mapLayer.Top = 5000;
+            mapLayer.Right = 2048;
+            mapLayer.Top = 2048;
             mapLayer.ImageID = new UUID("00000000-0000-1111-9999-000000000006");
 
             return mapLayer;
@@ -335,6 +338,11 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             {
                 m_rootAgents.Remove(AgentId);
             }
+            lock (m_mapBlockRequestEvent)
+            {
+                if (m_mapBlockRequests.ContainsKey(AgentId))
+                    m_mapBlockRequests.Remove(AgentId);
+            }
         }
         #endregion
 
@@ -357,6 +365,12 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 ThreadPriority.BelowNormal,
                 true,
                 true);
+            Watchdog.StartThread(
+                MapBlockSendThread,
+                string.Format("MapBlockSendThread ({0})", m_scene.RegionInfo.RegionName),
+                ThreadPriority.BelowNormal,
+                true,
+                true);
         }
 
         /// <summary>
@@ -372,7 +386,27 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             st.itemtype=0;
             st.regionhandle=0;
 
-            requests.Enqueue(st);
+            lock (requests)
+            {
+                queueEvent.Set();
+                requests.Enqueue(st);
+            }
+
+            MapBlockRequestData req = new MapBlockRequestData();
+
+            req.client = null;
+            req.minX = 0;
+            req.maxX = 0;
+            req.minY = 0;
+            req.maxY = 0;
+            req.flags = 0;
+
+            lock (m_mapBlockRequestEvent)
+            {
+                m_mapBlockRequests[UUID.Zero] = new Queue<MapBlockRequestData>();
+                m_mapBlockRequests[UUID.Zero].Enqueue(req);
+                m_mapBlockRequestEvent.Set();
+            }
         }
 
         public virtual void HandleMapItemRequest(IClientAPI remoteClient, uint flags,
@@ -528,7 +562,21 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             {
                 while (true)
                 {
-                    MapRequestState st = requests.Dequeue(1000);
+                    MapRequestState st = new MapRequestState();
+                    bool valid = false;
+                    queueEvent.WaitOne();
+                    lock (requests)
+                    {
+                        if (requests.Count > 0)
+                        {
+                            st = requests.Dequeue();
+                            valid = true;
+                        }
+                        if (requests.Count == 0)
+                            queueEvent.Reset();
+                    }
+                    if (!valid)
+                        continue;
 
                     // end gracefully
                     if (st.agentID == STOP_UUID)
@@ -546,13 +594,13 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         if (dorequest &&  !m_blacklistedregions.ContainsKey(st.regionhandle))
                         {
                             while (nAsyncRequests >= MAX_ASYNC_REQUESTS) // hit the break
-                                Thread.Sleep(80);
+                                Thread.Sleep(100);
 
-                            RequestMapItemsDelegate d = RequestMapItemsAsync;
-                            d.BeginInvoke(st.agentID, st.flags, st.EstateID, st.godlike, st.itemtype, st.regionhandle, RequestMapItemsCompleted, null);
-                            //OSDMap response = RequestMapItemsAsync(st.agentID, st.flags, st.EstateID, st.godlike, st.itemtype, st.regionhandle);
-                            //RequestMapItemsCompleted(response);
                             Interlocked.Increment(ref nAsyncRequests);
+                            Util.FireAndForget(x =>
+                            {
+                                RequestMapItemsAsync(st.agentID, st.flags, st.EstateID, st.godlike, st.itemtype, st.regionhandle);
+                            });
                         }
                     }
 
@@ -574,110 +622,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         /// <param name="state"></param>
         public void EnqueueMapItemRequest(MapRequestState state)
         {
-            requests.Enqueue(state);
-        }
-
-        /// <summary>
-        /// Sends the mapitem response to the IClientAPI
-        /// </summary>
-        /// <param name="response">The OSDMap Response for the mapitem</param>
-        private void RequestMapItemsCompleted(IAsyncResult iar)
-        {
-            AsyncResult result = (AsyncResult)iar;
-            RequestMapItemsDelegate icon = (RequestMapItemsDelegate)result.AsyncDelegate;
-
-            OSDMap response = (OSDMap)icon.EndInvoke(iar);
-
-            Interlocked.Decrement(ref nAsyncRequests);
-
-            if (!response.ContainsKey("requestID"))
-                return;
-
-            UUID requestID = response["requestID"].AsUUID();
-
-            if (requestID != UUID.Zero)
+            lock (requests)
             {
-                MapRequestState mrs = new MapRequestState();
-                mrs.agentID = UUID.Zero;
-                lock (m_openRequests)
-                {
-                    if (m_openRequests.ContainsKey(requestID))
-                    {
-                        mrs = m_openRequests[requestID];
-                        m_openRequests.Remove(requestID);
-                    }
-                }
-
-                if (mrs.agentID != UUID.Zero)
-                {
-                    ScenePresence av = null;
-                    m_scene.TryGetScenePresence(mrs.agentID, out av);
-                    if (av != null)
-                    {
-                        if (response.ContainsKey(mrs.itemtype.ToString()))
-                        {
-                            List<mapItemReply> returnitems = new List<mapItemReply>();
-                            OSDArray itemarray = (OSDArray)response[mrs.itemtype.ToString()];
-                            for (int i = 0; i < itemarray.Count; i++)
-                            {
-                                OSDMap mapitem = (OSDMap)itemarray[i];
-                                mapItemReply mi = new mapItemReply();
-                                mi.x = (uint)mapitem["X"].AsInteger();
-                                mi.y = (uint)mapitem["Y"].AsInteger();
-                                mi.id = mapitem["ID"].AsUUID();
-                                mi.Extra = mapitem["Extra"].AsInteger();
-                                mi.Extra2 = mapitem["Extra2"].AsInteger();
-                                mi.name = mapitem["Name"].AsString();
-                                returnitems.Add(mi);
-                            }
-                            av.ControllingClient.SendMapItemReply(returnitems.ToArray(), mrs.itemtype, mrs.flags);
-                        }
-
-                        // Service 7 (MAP_ITEM_LAND_FOR_SALE)
-                        uint itemtype = 7;
-
-                        if (response.ContainsKey(itemtype.ToString()))
-                        {
-                            List<mapItemReply> returnitems = new List<mapItemReply>();
-                            OSDArray itemarray = (OSDArray)response[itemtype.ToString()];
-                            for (int i = 0; i < itemarray.Count; i++)
-                            {
-                                OSDMap mapitem = (OSDMap)itemarray[i];
-                                mapItemReply mi = new mapItemReply();
-                                mi.x = (uint)mapitem["X"].AsInteger();
-                                mi.y = (uint)mapitem["Y"].AsInteger();
-                                mi.id = mapitem["ID"].AsUUID();
-                                mi.Extra = mapitem["Extra"].AsInteger();
-                                mi.Extra2 = mapitem["Extra2"].AsInteger();
-                                mi.name = mapitem["Name"].AsString();
-                                returnitems.Add(mi);
-                            }
-                            av.ControllingClient.SendMapItemReply(returnitems.ToArray(), itemtype, mrs.flags);
-                        }
-
-                        // Service 1 (MAP_ITEM_TELEHUB)
-                        itemtype = 1;
-
-                        if (response.ContainsKey(itemtype.ToString()))
-                        {
-                            List<mapItemReply> returnitems = new List<mapItemReply>();
-                            OSDArray itemarray = (OSDArray)response[itemtype.ToString()];
-                            for (int i = 0; i < itemarray.Count; i++)
-                            {
-                                OSDMap mapitem = (OSDMap)itemarray[i];
-                                mapItemReply mi = new mapItemReply();
-                                mi.x = (uint)mapitem["X"].AsInteger();
-                                mi.y = (uint)mapitem["Y"].AsInteger();
-                                mi.id = mapitem["ID"].AsUUID();
-                                mi.Extra = mapitem["Extra"].AsInteger();
-                                mi.Extra2 = mapitem["Extra2"].AsInteger();
-                                mi.name = mapitem["Name"].AsString();
-                                returnitems.Add(mi);
-                            }
-                            av.ControllingClient.SendMapItemReply(returnitems.ToArray(), itemtype, mrs.flags);
-                        }
-                    }
-                }
+                queueEvent.Set();
+                requests.Enqueue(state);
             }
         }
 
@@ -704,8 +652,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             EnqueueMapItemRequest(st);
         }
 
-        private delegate OSDMap RequestMapItemsDelegate(UUID id, uint flags,
-            uint EstateID, bool godlike, uint itemtype, ulong regionhandle);
         /// <summary>
         /// Does the actual remote mapitem request
         /// This should be called from an asynchronous thread
@@ -720,7 +666,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         /// <param name="itemtype">passed in from packet</param>
         /// <param name="regionhandle">Region we're looking up</param>
         /// <returns></returns>
-        private OSDMap RequestMapItemsAsync(UUID id, uint flags,
+        private void RequestMapItemsAsync(UUID id, uint flags,
             uint EstateID, bool godlike, uint itemtype, ulong regionhandle)
         {
 //            m_log.DebugFormat("[WORLDMAP]: RequestMapItemsAsync; region handle: {0} {1}", regionhandle, itemtype);
@@ -743,7 +689,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             }
 
             if (blacklisted)
-                return new OSDMap();
+            {
+                Interlocked.Decrement(ref nAsyncRequests);
+                return;
+            }
 
             UUID requestID = UUID.Random();
             lock (m_cachedRegionMapItemsAddress)
@@ -751,6 +700,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 if (m_cachedRegionMapItemsAddress.ContainsKey(regionhandle))
                     httpserver = m_cachedRegionMapItemsAddress[regionhandle];
             }
+
             if (httpserver.Length == 0)
             {
                 uint x = 0, y = 0;
@@ -795,18 +745,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
             // Can't find the http server
             if (httpserver.Length == 0 || blacklisted)
-                return new OSDMap();
-
-            MapRequestState mrs = new MapRequestState();
-            mrs.agentID = id;
-            mrs.EstateID = EstateID;
-            mrs.flags = flags;
-            mrs.godlike = godlike;
-            mrs.itemtype=itemtype;
-            mrs.regionhandle = regionhandle;
-
-            lock (m_openRequests)
-                m_openRequests.Add(requestID, mrs);
+            {
+                Interlocked.Decrement(ref nAsyncRequests);
+                return;
+            }
 
             WebRequest mapitemsrequest = null;
             try
@@ -816,7 +758,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             catch (Exception e)
             {
                 m_log.DebugFormat("[WORLD MAP]: Access to {0} failed with {1}", httpserver, e);
-                return new OSDMap();
+                Interlocked.Decrement(ref nAsyncRequests);
+                return;
             }
 
             mapitemsrequest.Method = "POST";
@@ -841,7 +784,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             catch (WebException ex)
             {
                 m_log.WarnFormat("[WORLD MAP]: Bad send on GetMapItems {0}", ex.Message);
-                responseMap["connect"] = OSD.FromBoolean(false);
                 lock (m_blacklistedurls)
                 {
                     if (!m_blacklistedurls.ContainsKey(httpserver))
@@ -850,13 +792,14 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
                 m_log.WarnFormat("[WORLD MAP]: Blacklisted {0}", httpserver);
 
-                return responseMap;
+                Interlocked.Decrement(ref nAsyncRequests);
+                return;
             }
             catch
             {
                 m_log.DebugFormat("[WORLD MAP]: RequestMapItems failed for {0}", httpserver);
-                responseMap["connect"] = OSD.FromBoolean(false);
-                return responseMap;
+                Interlocked.Decrement(ref nAsyncRequests);
+                return;
             }
             finally
             {
@@ -877,12 +820,12 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     }
                     else
                     {
-                        return new OSDMap();
+                        Interlocked.Decrement(ref nAsyncRequests);
+                        return;
                     }
                 }
                 catch (WebException)
                 {
-                    responseMap["connect"] = OSD.FromBoolean(false);
                     lock (m_blacklistedurls)
                     {
                         if (!m_blacklistedurls.ContainsKey(httpserver))
@@ -891,19 +834,20 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
                     m_log.WarnFormat("[WORLD MAP]: Blacklisted {0}", httpserver);
 
-                    return responseMap;
+                    Interlocked.Decrement(ref nAsyncRequests);
+                    return;
                 }
                 catch
                 {
                     m_log.DebugFormat("[WORLD MAP]: RequestMapItems failed for {0}", httpserver);
-                    responseMap["connect"] = OSD.FromBoolean(false);
                     lock (m_blacklistedregions)
                     {
                         if (!m_blacklistedregions.ContainsKey(regionhandle))
                             m_blacklistedregions.Add(regionhandle, Environment.TickCount);
                     }
 
-                    return responseMap;
+                    Interlocked.Decrement(ref nAsyncRequests);
+                    return;
                 }
                 finally
                 {
@@ -922,14 +866,14 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 catch (Exception ex)
                 {
                     m_log.InfoFormat("[WORLD MAP]: exception on parse of RequestMapItems reply from {0}: {1}", httpserver, ex.Message);
-                    responseMap["connect"] = OSD.FromBoolean(false);
                     lock (m_blacklistedregions)
                     {
                         if (!m_blacklistedregions.ContainsKey(regionhandle))
                             m_blacklistedregions.Add(regionhandle, Environment.TickCount);
                     }
 
-                    return responseMap;
+                    Interlocked.Decrement(ref nAsyncRequests);
+                    return;
                 }
             }
 
@@ -943,7 +887,78 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 }
             }
 
-            return responseMap;
+            Interlocked.Decrement(ref nAsyncRequests);
+
+            if (id != UUID.Zero)
+            {
+                ScenePresence av = null;
+                m_scene.TryGetScenePresence(id, out av);
+                if (av != null)
+                {
+                    if (responseMap.ContainsKey(itemtype.ToString()))
+                    {
+                        List<mapItemReply> returnitems = new List<mapItemReply>();
+                        OSDArray itemarray = (OSDArray)responseMap[itemtype.ToString()];
+                        for (int i = 0; i < itemarray.Count; i++)
+                        {
+                            OSDMap mapitem = (OSDMap)itemarray[i];
+                            mapItemReply mi = new mapItemReply();
+                            mi.x = (uint)mapitem["X"].AsInteger();
+                            mi.y = (uint)mapitem["Y"].AsInteger();
+                            mi.id = mapitem["ID"].AsUUID();
+                            mi.Extra = mapitem["Extra"].AsInteger();
+                            mi.Extra2 = mapitem["Extra2"].AsInteger();
+                            mi.name = mapitem["Name"].AsString();
+                            returnitems.Add(mi);
+                        }
+                        av.ControllingClient.SendMapItemReply(returnitems.ToArray(), itemtype, flags);
+                    }
+
+                    // Service 7 (MAP_ITEM_LAND_FOR_SALE)
+                    itemtype = 7;
+
+                    if (responseMap.ContainsKey(itemtype.ToString()))
+                    {
+                        List<mapItemReply> returnitems = new List<mapItemReply>();
+                        OSDArray itemarray = (OSDArray)responseMap[itemtype.ToString()];
+                        for (int i = 0; i < itemarray.Count; i++)
+                        {
+                            OSDMap mapitem = (OSDMap)itemarray[i];
+                            mapItemReply mi = new mapItemReply();
+                            mi.x = (uint)mapitem["X"].AsInteger();
+                            mi.y = (uint)mapitem["Y"].AsInteger();
+                            mi.id = mapitem["ID"].AsUUID();
+                            mi.Extra = mapitem["Extra"].AsInteger();
+                            mi.Extra2 = mapitem["Extra2"].AsInteger();
+                            mi.name = mapitem["Name"].AsString();
+                            returnitems.Add(mi);
+                        }
+                        av.ControllingClient.SendMapItemReply(returnitems.ToArray(), itemtype, flags);
+                    }
+
+                    // Service 1 (MAP_ITEM_TELEHUB)
+                    itemtype = 1;
+
+                    if (responseMap.ContainsKey(itemtype.ToString()))
+                    {
+                        List<mapItemReply> returnitems = new List<mapItemReply>();
+                        OSDArray itemarray = (OSDArray)responseMap[itemtype.ToString()];
+                        for (int i = 0; i < itemarray.Count; i++)
+                        {
+                            OSDMap mapitem = (OSDMap)itemarray[i];
+                            mapItemReply mi = new mapItemReply();
+                            mi.x = (uint)mapitem["X"].AsInteger();
+                            mi.y = (uint)mapitem["Y"].AsInteger();
+                            mi.id = mapitem["ID"].AsUUID();
+                            mi.Extra = mapitem["Extra"].AsInteger();
+                            mi.Extra2 = mapitem["Extra2"].AsInteger();
+                            mi.name = mapitem["Name"].AsString();
+                            returnitems.Add(mi);
+                        }
+                        av.ControllingClient.SendMapItemReply(returnitems.ToArray(), itemtype, flags);
+                    }
+                }
+            }
         }
 
         /// <summary>
@@ -953,7 +968,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         /// <param name="minY"></param>
         /// <param name="maxX"></param>
         /// <param name="maxY"></param>
-        public virtual void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
+        public void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
         {
             //m_log.ErrorFormat("[YYY] RequestMapBlocks {0}={1}={2}={3} {4}", minX, minY, maxX, maxY, flag);
             if ((flag & 0x10000) != 0)  // user clicked on qthe map a tile that isn't visible
@@ -1006,21 +1021,91 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
         protected virtual List<MapBlockData> GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
         {
+            MapBlockRequestData req = new MapBlockRequestData();
+
+            req.client = remoteClient;
+            req.minX = minX;
+            req.maxX = maxX;
+            req.minY = minY;
+            req.maxY = maxY;
+            req.flags = flag;
+
+            lock (m_mapBlockRequestEvent)
+            {
+                if (!m_mapBlockRequests.ContainsKey(remoteClient.AgentId))
+                    m_mapBlockRequests[remoteClient.AgentId] = new Queue<MapBlockRequestData>();
+                m_mapBlockRequests[remoteClient.AgentId].Enqueue(req);
+                m_mapBlockRequestEvent.Set();
+            }
+
+            return new List<MapBlockData>();
+        }
+
+        protected void MapBlockSendThread()
+        {
+            while (true)
+            {
+                List<MapBlockRequestData> thisRunData = new List<MapBlockRequestData>();
+
+                m_mapBlockRequestEvent.WaitOne();
+                lock (m_mapBlockRequestEvent)
+                {
+                    int total = 0;
+                    foreach (Queue<MapBlockRequestData> q in m_mapBlockRequests.Values)
+                    {
+                        if (q.Count > 0)
+                            thisRunData.Add(q.Dequeue());
+
+                        total += q.Count;
+                    }
+
+                    if (total == 0)
+                        m_mapBlockRequestEvent.Reset();
+                }
+
+                foreach (MapBlockRequestData req in thisRunData)
+                {
+                    // Null client stops thread
+                    if (req.client == null)
+                        return;
+
+                    GetAndSendBlocksInternal(req.client, req.minX, req.minY, req.maxX, req.maxY, req.flags);
+                }
+
+                Thread.Sleep(50);
+            }
+        }
+
+        protected virtual List<MapBlockData> GetAndSendBlocksInternal(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
+        {
+            List<MapBlockData> allBlocks = new List<MapBlockData>();
             List<MapBlockData> mapBlocks = new List<MapBlockData>();
             List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
-                (minX - 4) * (int)Constants.RegionSize,
-                (maxX + 4) * (int)Constants.RegionSize,
-                (minY - 4) * (int)Constants.RegionSize,
-                (maxY + 4) * (int)Constants.RegionSize);
+                minX * (int)Constants.RegionSize,
+                maxX * (int)Constants.RegionSize,
+                minY * (int)Constants.RegionSize,
+                maxY * (int)Constants.RegionSize);
+//                (minX - 4) * (int)Constants.RegionSize,
+//                (maxX + 4) * (int)Constants.RegionSize,
+//                (minY - 4) * (int)Constants.RegionSize,
+//                (maxY + 4) * (int)Constants.RegionSize);
             foreach (GridRegion r in regions)
             {
                 MapBlockData block = new MapBlockData();
                 MapBlockFromGridRegion(block, r, flag);
                 mapBlocks.Add(block);
+                allBlocks.Add(block);
+                if (mapBlocks.Count >= 10)
+                {
+                    remoteClient.SendMapBlock(mapBlocks, flag & 0xffff);
+                    mapBlocks.Clear();
+                    Thread.Sleep(50);
+                }
             }
-            remoteClient.SendMapBlock(mapBlocks, flag & 0xffff);
+            if (mapBlocks.Count > 0)
+                remoteClient.SendMapBlock(mapBlocks, flag & 0xffff);
 
-            return mapBlocks;
+            return allBlocks;
         }
 
         protected void MapBlockFromGridRegion(MapBlockData block, GridRegion r, uint flag)
@@ -1244,7 +1329,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             }
             else
             {
-                OSDArray responsearr = new OSDArray(m_scene.GetRootAgentCount());
+                OSDArray responsearr = new OSDArray(); // Don't preallocate. MT (m_scene.GetRootAgentCount());
                 m_scene.ForEachRootScenePresence(delegate(ScenePresence sp)
                 {
                     OSDMap responsemapdata = new OSDMap();
@@ -1420,6 +1505,12 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             {
                 m_rootAgents.Remove(avatar.UUID);
             }
+
+            lock (m_mapBlockRequestEvent)
+            {
+                if (m_mapBlockRequests.ContainsKey(avatar.UUID))
+                    m_mapBlockRequests.Remove(avatar.UUID);
+            }
         }
 
         public void OnRegionUp(GridRegion otherRegion)
@@ -1464,9 +1555,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             Color background = Color.FromArgb(0, 0, 0, 0);
             SolidBrush transparent = new SolidBrush(background);
             Graphics g = Graphics.FromImage(overlay);
-            g.FillRectangle(transparent, 0, 0, 256, 256);
+            g.FillRectangle(transparent, 0, 0, 255, 255);
 
             SolidBrush yellow = new SolidBrush(Color.FromArgb(255, 249, 223, 9));
+            Pen grey = new Pen(Color.FromArgb(255, 92, 92, 92));
 
             foreach (ILandObject land in parcels)
             {
@@ -1474,8 +1566,42 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 if ((land.LandData.Flags & (uint)ParcelFlags.ForSale) != 0)
                 {
                     landForSale = true;
+                    
+                    bool[,] landBitmap = land.GetLandBitmap();
+
+                    for (int x = 0 ; x < 64 ; x++)
+                    {
+                        for (int y = 0 ; y < 64 ; y++)
+                        {
+                            if (landBitmap[x, y])
+                            {
+                                g.FillRectangle(yellow, x * 4, 252 - (y * 4), 4, 4);
+
+                                if (x > 0)
+                                {
+                                    if ((saleBitmap[x - 1, y] || landBitmap[x - 1, y]) == false)
+                                        g.DrawLine(grey, x * 4, 252 - (y * 4), x * 4, 255 - (y * 4));
+                                }
+                                if (y > 0)
+                                {
+                                    if ((saleBitmap[x, y-1] || landBitmap[x, y-1]) == false)
+                                        g.DrawLine(grey, x * 4, 255 - (y * 4), x * 4 + 3, 255 - (y * 4));
+                                }
+                                if (x < 63)
+                                {
+                                    if ((saleBitmap[x + 1, y] || landBitmap[x + 1, y]) == false)
+                                        g.DrawLine(grey, x * 4 + 3, 252 - (y * 4), x * 4 + 3, 255 - (y * 4));
+                                }
+                                if (y < 63)
+                                {
+                                    if ((saleBitmap[x, y + 1] || landBitmap[x, y + 1]) == false)
+                                        g.DrawLine(grey, x * 4, 252 - (y * 4), x * 4 + 3, 252 - (y * 4));
+                                }
+                            }
+                        }
+                    }
 
-                    saleBitmap = land.MergeLandBitmaps(saleBitmap, land.GetLandBitmap());
+                    saleBitmap = land.MergeLandBitmaps(saleBitmap, landBitmap);
                 }
             }
 
@@ -1487,15 +1613,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
             m_log.DebugFormat("[WORLD MAP]: Region {0} has parcels for sale, generating overlay", m_scene.RegionInfo.RegionName);
 
-            for (int x = 0 ; x < 64 ; x++)
-            {
-                for (int y = 0 ; y < 64 ; y++)
-                {
-                    if (saleBitmap[x, y])
-                        g.FillRectangle(yellow, x * 4, 252 - (y * 4), 4, 4);
-                }
-            }
-
             try
             {
                 return OpenJPEG.EncodeFromImage(overlay, true);
@@ -1517,4 +1634,14 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         public uint itemtype;
         public ulong regionhandle;
     }
+
+    public struct MapBlockRequestData
+    {
+        public IClientAPI client;
+        public int minX;
+        public int minY;
+        public int maxX;
+        public int maxY;
+        public uint flags;
+    }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
index 0cc8fb6..e0aad2b 100644
--- a/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Region.Framework.Interfaces
         void HandleItemUpdateFromTransaction(IClientAPI remoteClient, UUID transactionID,
                                              InventoryItemBase item);
 
-        void HandleItemCreationFromTransaction(IClientAPI remoteClient, UUID transactionID, UUID folderID,
+        bool HandleItemCreationFromTransaction(IClientAPI remoteClient, UUID transactionID, UUID folderID,
                                                uint callbackID, string description, string name, sbyte invType,
                                                sbyte type, byte wearableType, uint nextOwnerMask);
         
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index 620ec22..d781eae 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Xml;
 using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -83,7 +84,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="AttachmentPt"></param>
         /// <param name="silent"></param>
         /// <returns>true if the object was successfully attached, false otherwise</returns>
-        bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent, bool temp);
+        bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent, bool useAttachmentInfo, bool temp);
 
         /// <summary>
         /// Rez an attachment from user inventory and change inventory status to match.
@@ -92,7 +93,11 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="itemID"></param>
         /// <param name="AttachmentPt"></param>
         /// <returns>The scene object that was attached.  Null if the scene object could not be found</returns>
-        SceneObjectGroup RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt);
+        ISceneEntity RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt);
+
+        // Same as above, but also load script states from a separate doc
+        ISceneEntity RezSingleAttachmentFromInventory(
+            IScenePresence presence, UUID itemID, uint AttachmentPt, XmlDocument doc);
 
         /// <summary>
         /// Rez multiple attachments from a user's inventory
@@ -124,7 +129,6 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="grp">The attachment to detach.</param>
         void DetachSingleAttachmentToInv(IScenePresence sp, SceneObjectGroup grp);
         
-        /// <summary>
         /// Update the position of an attachment.
         /// </summary>
         /// <param name="sog"></param>
diff --git a/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs b/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs
index 34aca33..d25c930 100644
--- a/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs
@@ -35,8 +35,8 @@ namespace OpenSim.Region.Framework.Interfaces
 
     public interface IAvatarFactoryModule
     {
-        void SetAppearance(IScenePresence sp, AvatarAppearance appearance);
-        void SetAppearance(IScenePresence sp, Primitive.TextureEntry textureEntry, byte[] visualParams);
+        void SetAppearance(IScenePresence sp, AvatarAppearance appearance, WearableCacheItem[] cacheItems);
+        void SetAppearance(IScenePresence sp, Primitive.TextureEntry textureEntry, byte[] visualParams, WearableCacheItem[] cacheItems);
 
         /// <summary>
         /// Send the appearance of an avatar to others in the scene.
@@ -52,6 +52,8 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <returns>An empty list if this agent has no baked textures (e.g. because it's a child agent)</returns>
         Dictionary<BakeType, Primitive.TextureEntryFace> GetBakedTextureFaces(UUID agentId);
 
+
+        WearableCacheItem[] GetCachedItems(UUID agentId);
         /// <summary>
         /// Save the baked textures for the given agent permanently in the asset database.
         /// </summary>
diff --git a/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs b/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs
new file mode 100644
index 0000000..21ed44f
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs
@@ -0,0 +1,19 @@
+////////////////////////////////////////////////////////////////
+//
+// (c) 2009, 2010 Careminster Limited and Melanie Thielker
+//
+// All rights reserved
+//
+using System;
+using Nini.Config;
+using OpenSim.Framework;
+using OpenMetaverse;
+
+namespace OpenSim.Services.Interfaces
+{
+    public interface IBakedTextureModule
+    {
+        WearableCacheItem[] Get(UUID id);
+        void Store(UUID id, WearableCacheItem[] data);
+    }
+}
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index 150193d..8028d87 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -133,6 +133,8 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </returns>
         bool CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource);
 
+        ArrayList CreateScriptInstanceEr(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource);
+
         /// <summary>
         /// Stop and remove a script which is in this prim's inventory from the scene.
         /// </summary>
@@ -316,5 +318,6 @@ namespace OpenSim.Region.Framework.Interfaces
         /// A <see cref="Dictionary`2"/>
         /// </returns>
         Dictionary<UUID, string> GetScriptStates();
+        Dictionary<UUID, string> GetScriptStates(bool oldIDs);
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 69be83e..1949a90 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -35,6 +35,8 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
+    public delegate ScenePresence CrossAgentToNewRegionDelegate(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);
+
     public interface IEntityTransferModule
     {
         /// <summary>
@@ -50,29 +52,10 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name='teleportFlags'></param>
         void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position, Vector3 lookAt, uint teleportFlags);
 
-        /// <summary>
-        /// Teleport an agent directly to a given region without checking whether the region should be subsituted.
-        /// </summary>
-        /// <remarks>
-        /// Please use Teleport() instead unless you know exactly what you're doing.
-        /// Do not use for same region teleports.
-        /// </remarks>
-        /// <param name='sp'></param>
-        /// <param name='reg'></param>
-        /// <param name='finalDestination'>/param>
-        /// <param name='position'></param>
-        /// <param name='lookAt'></param>
-        /// <param name='teleportFlags'></param>
-        void DoTeleport(
-            ScenePresence sp, GridRegion reg, GridRegion finalDestination,
-            Vector3 position, Vector3 lookAt, uint teleportFlags);
+        bool TeleportHome(UUID id, IClientAPI client);
 
-        /// <summary>
-        /// Teleports the agent for the given client to their home destination.
-        /// </summary>
-        /// <param name='id'></param>
-        /// <param name='client'></param>
-        void TeleportHome(UUID id, IClientAPI client);
+        void DoTeleport(ScenePresence sp, GridRegion reg, GridRegion finalDestination,
+            Vector3 position, Vector3 lookAt, uint teleportFlags);
 
         /// <summary>
         /// Show whether the given agent is being teleported.
@@ -89,7 +72,12 @@ namespace OpenSim.Region.Framework.Interfaces
 
         void EnableChildAgent(ScenePresence agent, GridRegion region);
 
+        GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out uint xDest, out uint yDest, out string version, out Vector3 newpos);
+
         void Cross(SceneObjectGroup sog, Vector3 position, bool silent);
+
+        ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);
+
     }
 
     public interface IUserAgentVerificationModule
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
index 1983984..292efa4 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
@@ -45,6 +45,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// Tell all clients about the current state of the region (terrain textures, water height, etc.).
         /// </summary>
         void sendRegionHandshakeToAll();
+        void TriggerEstateInfoChange();
 
         /// <summary>
         /// Fires the OnRegionInfoChange event.
diff --git a/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
index 2d6287f..67a500f 100644
--- a/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
@@ -68,6 +68,14 @@ namespace OpenSim.Region.Framework.Interfaces
         bool SendReleaseAgent(ulong regionHandle, UUID id, string uri);
 
         /// <summary>
+        /// Close chid agent.
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        bool SendCloseChildAgent(ulong regionHandle, UUID id);
+
+        /// <summary>
         /// Close agent.
         /// </summary>
         /// <param name="regionHandle"></param>
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionConsole.cs b/OpenSim/Region/Framework/Interfaces/IRegionConsole.cs
index 4d261d6..5d5ce34 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionConsole.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionConsole.cs
@@ -30,8 +30,12 @@ using OpenSim.Framework;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
+    public delegate void ConsoleMessage(UUID toAgentID, string message);
+
     public interface IRegionConsole
     {
+        event ConsoleMessage OnConsoleMessage;
+
         bool RunCommand(string command, UUID invokerID);
         void SendConsoleOutput(UUID agentID, string message);
         void AddCommand(string module, bool shared, string command, string help, string longhelp, CommandDelegate fn);
diff --git a/OpenSim/Region/Framework/Interfaces/IRestartModule.cs b/OpenSim/Region/Framework/Interfaces/IRestartModule.cs
index c68550f..9b25beb 100644
--- a/OpenSim/Region/Framework/Interfaces/IRestartModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRestartModule.cs
@@ -35,5 +35,6 @@ namespace OpenSim.Region.Framework.Interfaces
         TimeSpan TimeUntilRestart { get; }
         void ScheduleRestart(UUID initiator, string message, int[] alerts, bool notice);
         void AbortRestart(string message);
+        void DelayRestart(int seconds, string message);
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/ISearchModule.cs b/OpenSim/Region/Framework/Interfaces/ISearchModule.cs
index 64bf72c..d56d188 100644
--- a/OpenSim/Region/Framework/Interfaces/ISearchModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISearchModule.cs
@@ -31,6 +31,6 @@ namespace OpenSim.Framework
 {
     public interface ISearchModule
     {
-
+        void Refresh();
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs b/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
index 085b5ca..3e97a7a 100644
--- a/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
@@ -116,6 +116,8 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="regionUUID">the region UUID</param>
         void RemoveRegionEnvironmentSettings(UUID regionUUID);
 
+        UUID[] GetObjectIDs(UUID regionID);
+
         void SaveExtra(UUID regionID, string name, string value);
 
         void RemoveExtra(UUID regionID, string name);
diff --git a/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs b/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
index 3787ca0..17bd48b 100644
--- a/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
@@ -106,6 +106,7 @@ namespace OpenSim.Region.Framework.Interfaces
         RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID);
         void StoreRegionWindlightSettings(RegionLightShareData wl);
         void RemoveRegionWindlightSettings(UUID regionID);
+        UUID[] GetObjectIDs(UUID regionID);
 
         /// <summary>
         /// Load Environment settings from region storage
diff --git a/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs b/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs
new file mode 100644
index 0000000..e01f649
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs
@@ -0,0 +1,27 @@
+///////////////////////////////////////////////////////////////////
+//
+// (c) Careminster LImited, Melanie Thielker and the Meta7 Team
+//
+// This file is not open source. All rights reserved
+// Mod 2
+
+using OpenSim.Region.Framework.Scenes;
+
+public interface ISnmpModule
+{
+    void Trap(int code, string Message, Scene scene);
+    void Critical(string Message, Scene scene);
+    void Warning(string Message, Scene scene);
+    void Major(string Message, Scene scene);
+    void ColdStart(int step , Scene scene);
+    void Shutdown(int step , Scene scene);
+        //
+        // Node Start/stop events
+        //
+    void LinkUp(Scene scene);
+    void LinkDown(Scene scene);
+    void BootInfo(string data, Scene scene);
+    void trapDebug(string Module,string data, Scene scene);
+    void trapXMRE(int data, string Message, Scene scene);
+
+}
diff --git a/OpenSim/Region/Framework/Interfaces/IUserAccountCacheModule.cs b/OpenSim/Region/Framework/Interfaces/IUserAccountCacheModule.cs
new file mode 100644
index 0000000..d1a4d8e
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/IUserAccountCacheModule.cs
@@ -0,0 +1,13 @@
+///////////////////////////////////////////////////////////////////
+//
+// (c) Careminster Limited, Melanie Thielker and the Meta7 Team
+//
+// This file is not open source. All rights reserved
+//
+
+using OpenSim.Region.Framework.Scenes;
+
+public interface IUserAccountCacheModule
+{
+    void Remove(string name);
+}
diff --git a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
index d76a0d7..20e0199 100644
--- a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
@@ -127,7 +127,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name='msg'>
         /// Message.
         /// </param>
-        void DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg);
+        bool DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg, out string error);
 
         /// <summary>
         /// Are there any listen events ready to be dispatched?
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index e92a087..65c279e 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -80,12 +80,13 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             m_scenePresence = sp;
             CurrentMovementAnimation = "CROUCH";
         }
-        
+
         public void AddAnimation(UUID animID, UUID objectID)
         {
             if (m_scenePresence.IsChildAgent)
                 return;
 
+            //            m_log.DebugFormat("[SCENE PRESENCE ANIMATOR]: Adding animation {0} for {1}", animID, m_scenePresence.Name);
             if (m_scenePresence.Scene.DebugAnimations)
                 m_log.DebugFormat(
                     "[SCENE PRESENCE ANIMATOR]: Adding animation {0} {1} for {2}", 
@@ -134,6 +135,22 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                 SendAnimPack();
         }
 
+        public void avnChangeAnim(UUID animID, bool addRemove, bool sendPack)
+        {
+            if (m_scenePresence.IsChildAgent)
+                return;
+
+            if (animID != UUID.Zero)
+            {
+                if (addRemove)
+                    m_animations.Add(animID, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, UUID.Zero);
+                else
+                    m_animations.Remove(animID, true);
+            }
+            if(sendPack)
+                SendAnimPack();
+        }
+
         // Called from scripts
         public void RemoveAnimation(string name)
         {
diff --git a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
new file mode 100644
index 0000000..075724e
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
@@ -0,0 +1,304 @@
+/*
+ * 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.
+ */
+// Ubit 2012
+
+using System;
+using System.Reflection;
+using System.Collections.Generic;
+using OpenMetaverse;
+using OpenSim.Framework;
+using log4net;
+
+namespace OpenSim.Region.Framework.Scenes
+{
+    public struct CollisionForSoundInfo
+    {
+        public uint colliderID;
+        public Vector3 position;
+        public float relativeVel;
+    }
+
+    public static class CollisionSounds
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private const int MaxMaterials = 7;
+        // part part
+
+        private static UUID snd_StoneStone = new UUID("be7295c0-a158-11e1-b3dd-0800200c9a66");
+        private static UUID snd_StoneMetal = new UUID("be7295c0-a158-11e1-b3dd-0800201c9a66");
+        private static UUID snd_StoneGlass = new UUID("be7295c0-a158-11e1-b3dd-0800202c9a66");
+        private static UUID snd_StoneWood = new UUID("be7295c0-a158-11e1-b3dd-0800203c9a66");
+        private static UUID snd_StoneFlesh = new UUID("be7295c0-a158-11e1-b3dd-0800204c9a66");
+        private static UUID snd_StonePlastic = new UUID("be7295c0-a158-11e1-b3dd-0800205c9a66");
+        private static UUID snd_StoneRubber = new UUID("be7295c0-a158-11e1-b3dd-0800206c9a66");
+
+        private static UUID snd_MetalMetal = new UUID("be7295c0-a158-11e1-b3dd-0801201c9a66");
+        private static UUID snd_MetalGlass = new UUID("be7295c0-a158-11e1-b3dd-0801202c9a66");
+        private static UUID snd_MetalWood  = new UUID("be7295c0-a158-11e1-b3dd-0801203c9a66");
+        private static UUID snd_MetalFlesh = new UUID("be7295c0-a158-11e1-b3dd-0801204c9a66");
+        private static UUID snd_MetalPlastic = new UUID("be7295c0-a158-11e1-b3dd-0801205c9a66");
+        private static UUID snd_MetalRubber = new UUID("be7295c0-a158-11e1-b3dd-0801206c9a66");
+
+        private static UUID snd_GlassGlass = new UUID("be7295c0-a158-11e1-b3dd-0802202c9a66");
+        private static UUID snd_GlassWood = new UUID("be7295c0-a158-11e1-b3dd-0802203c9a66");
+        private static UUID snd_GlassFlesh = new UUID("be7295c0-a158-11e1-b3dd-0802204c9a66");
+        private static UUID snd_GlassPlastic = new UUID("be7295c0-a158-11e1-b3dd-0802205c9a66");
+        private static UUID snd_GlassRubber = new UUID("be7295c0-a158-11e1-b3dd-0802206c9a66");
+
+        private static UUID snd_WoodWood = new UUID("be7295c0-a158-11e1-b3dd-0803203c9a66");
+        private static UUID snd_WoodFlesh = new UUID("be7295c0-a158-11e1-b3dd-0803204c9a66");
+        private static UUID snd_WoodPlastic = new UUID("be7295c0-a158-11e1-b3dd-0803205c9a66");
+        private static UUID snd_WoodRubber = new UUID("be7295c0-a158-11e1-b3dd-0803206c9a66");
+
+        private static UUID snd_FleshFlesh = new UUID("be7295c0-a158-11e1-b3dd-0804204c9a66");
+        private static UUID snd_FleshPlastic = new UUID("be7295c0-a158-11e1-b3dd-0804205c9a66");
+        private static UUID snd_FleshRubber = new UUID("be7295c0-a158-11e1-b3dd-0804206c9a66");
+
+        private static UUID snd_PlasticPlastic = new UUID("be7295c0-a158-11e1-b3dd-0805205c9a66");
+        private static UUID snd_PlasticRubber = new UUID("be7295c0-a158-11e1-b3dd-0805206c9a66");
+
+        private static UUID snd_RubberRubber = new UUID("be7295c0-a158-11e1-b3dd-0806206c9a66");
+
+        // terrain part
+        private static UUID snd_TerrainStone = new UUID("be7295c0-a158-11e1-b3dd-0807200c9a66");
+        private static UUID snd_TerrainMetal = new UUID("be7295c0-a158-11e1-b3dd-0807200c9a66");
+        private static UUID snd_TerrainGlass = new UUID("be7295c0-a158-11e1-b3dd-0807200c9a66");
+        private static UUID snd_TerrainWood = new UUID("be7295c0-a158-11e1-b3dd-0807200c9a66");
+        private static UUID snd_TerrainFlesh = new UUID("be7295c0-a158-11e1-b3dd-0807200c9a66");
+        private static UUID snd_TerrainPlastic = new UUID("be7295c0-a158-11e1-b3dd-0807200c9a66");
+        private static UUID snd_TerrainRubber = new UUID("be7295c0-a158-11e1-b3dd-0807200c9a66");
+
+        public static UUID[] m_TerrainPart = {
+            snd_TerrainStone,
+            snd_TerrainMetal,
+            snd_TerrainGlass,
+            snd_TerrainWood,
+            snd_TerrainFlesh,
+            snd_TerrainPlastic,
+            snd_TerrainRubber
+            };
+
+        // simetric sounds
+        public static UUID[] m_PartPart = {
+            snd_StoneStone, snd_StoneMetal, snd_StoneGlass, snd_StoneWood, snd_StoneFlesh, snd_StonePlastic, snd_StoneRubber,
+            snd_StoneMetal, snd_MetalMetal, snd_MetalGlass, snd_MetalWood, snd_MetalFlesh, snd_MetalPlastic, snd_MetalRubber,
+            snd_StoneGlass, snd_MetalGlass, snd_GlassGlass, snd_GlassWood, snd_GlassFlesh, snd_GlassPlastic, snd_GlassRubber,
+            snd_StoneWood, snd_MetalWood, snd_GlassWood, snd_WoodWood, snd_WoodFlesh, snd_WoodPlastic, snd_WoodRubber,
+            snd_StoneFlesh, snd_MetalFlesh, snd_GlassFlesh, snd_WoodFlesh, snd_FleshFlesh, snd_FleshPlastic, snd_FleshRubber,
+            snd_StonePlastic, snd_MetalPlastic, snd_GlassPlastic, snd_WoodPlastic, snd_FleshPlastic, snd_PlasticPlastic, snd_PlasticRubber,
+            snd_StoneRubber, snd_MetalRubber, snd_GlassRubber, snd_WoodRubber, snd_FleshRubber, snd_PlasticRubber, snd_RubberRubber
+            };
+        
+        public static void PartCollisionSound(SceneObjectPart part, List<CollisionForSoundInfo> collidersinfolist)
+        {
+            if (collidersinfolist.Count == 0 || part == null)
+                return;
+
+            if (part.VolumeDetectActive || (part.Flags & PrimFlags.Physics) == 0)
+                return;
+
+            if (part.ParentGroup == null)
+                return;
+
+            if (part.CollisionSoundType < 0)
+                return;
+
+            float volume = 0.0f;
+            bool HaveSound = false;
+
+            UUID soundID = part.CollisionSound;
+
+            if (part.CollisionSoundType > 0)
+            {
+                //                soundID = part.CollisionSound;
+                volume = part.CollisionSoundVolume;
+                if (volume == 0.0f)
+                    return;
+                HaveSound = true;
+            }
+
+            bool doneownsound = false;
+
+            int thisMaterial = (int)part.Material;
+            if (thisMaterial >= MaxMaterials)
+                thisMaterial = 3;
+            int thisMatScaled = thisMaterial * MaxMaterials;
+
+            CollisionForSoundInfo colInfo;
+            uint id;
+
+            for(int i = 0; i< collidersinfolist.Count; i++)
+            {
+                colInfo = collidersinfolist[i];
+
+                id = colInfo.colliderID;
+                if (id == 0) // terrain collision
+                    {
+                        if (!doneownsound)
+                        {
+                            if (!HaveSound)
+                            {
+                                volume = Math.Abs(colInfo.relativeVel);
+                                if (volume < 0.2f)
+                                    continue;
+
+                                volume *= volume * .0625f; // 4m/s == full volume
+                                if (volume > 1.0f)
+                                    volume = 1.0f;
+
+                                soundID = m_TerrainPart[thisMaterial];
+                            }
+                            part.SendCollisionSound(soundID, volume, colInfo.position);
+                            doneownsound = true;
+                        }
+                        continue;
+                    }
+
+                SceneObjectPart otherPart = part.ParentGroup.Scene.GetSceneObjectPart(id);
+                if (otherPart != null)
+                {
+                    if (otherPart.CollisionSoundType < 0 || otherPart.VolumeDetectActive)
+                        continue;
+
+                    if (!HaveSound)
+                    {
+                        if (otherPart.CollisionSoundType > 0)
+                        {
+                            soundID = otherPart.CollisionSound;
+                            volume = otherPart.CollisionSoundVolume;
+                            if (volume == 0.0f)
+                                continue;
+                        }
+                        else
+                        {
+                            volume = Math.Abs(colInfo.relativeVel);
+                            if (volume < 0.2f)
+                                continue;
+
+                            volume *= volume * .0625f; // 4m/s == full volume
+                            if (volume > 1.0f)
+                                volume = 1.0f;
+
+                            int otherMaterial = (int)otherPart.Material;
+                            if (otherMaterial >= MaxMaterials)
+                                otherMaterial = 3;
+
+                            soundID = m_PartPart[thisMatScaled + otherMaterial];
+                        }
+                    }
+
+                    if (doneownsound)
+                        otherPart.SendCollisionSound(soundID, volume, colInfo.position);
+                    else
+                    {
+                        part.SendCollisionSound(soundID, volume, colInfo.position);
+                        doneownsound = true;
+                    }
+                }
+            }
+        }
+
+        public static void AvatarCollisionSound(ScenePresence av, List<CollisionForSoundInfo> collidersinfolist)
+         {
+            if (collidersinfolist.Count == 0 || av == null)
+                return;
+
+            UUID soundID;
+            int otherMaterial;
+
+            int thisMaterial = 4; // flesh
+
+            int thisMatScaled = thisMaterial * MaxMaterials;
+
+            //            bool doneownsound = false;
+
+            CollisionForSoundInfo colInfo;
+            uint id;
+            float volume;
+
+            for(int i = 0; i< collidersinfolist.Count; i++)
+            {
+                colInfo = collidersinfolist[i];
+
+                id = colInfo.colliderID;
+
+                if (id == 0) // no terrain collision sounds for now
+                {
+                    continue;
+//                    volume = Math.Abs(colInfo.relativeVel);
+//                    if (volume < 0.2f)
+//                        continue;
+
+                }
+
+                SceneObjectPart otherPart = av.Scene.GetSceneObjectPart(id);
+                if (otherPart != null)
+                {
+                    if (otherPart.CollisionSoundType < 0)
+                        continue;
+                    if (otherPart.CollisionSoundType > 0 && otherPart.CollisionSoundVolume > 0f)
+                        otherPart.SendCollisionSound(otherPart.CollisionSound, otherPart.CollisionSoundVolume, colInfo.position);
+                    else
+                    {
+                        volume = Math.Abs(colInfo.relativeVel);
+                        // Most noral collisions (running into walls, stairs)
+                        // should never be heard.
+                        if (volume < 3.2f)
+                            continue;
+//                        m_log.DebugFormat("Collision speed was {0}", volume);
+
+                        // Cap to 0.2 times volume because climbing stairs should not be noisy
+                        // Also changed scaling
+                        volume *= volume * .0125f; // 4m/s == volume 0.2
+                        if (volume > 0.2f)
+                            volume = 0.2f;
+                        otherMaterial = (int)otherPart.Material;
+                        if (otherMaterial >= MaxMaterials)
+                            otherMaterial = 3;
+
+                        soundID = m_PartPart[thisMatScaled + otherMaterial];
+                        otherPart.SendCollisionSound(soundID, volume, colInfo.position);
+                    }
+                    continue;
+                }
+/*
+                else if (!doneownsound)
+                {
+                    ScenePresence otherav = av.Scene.GetScenePresence(Id);
+                    if (otherav != null && (!otherav.IsChildAgent))
+                    {
+                        soundID = snd_FleshFlesh;
+                        av.SendCollisionSound(soundID, 1.0);
+                        doneownsound = true;
+                    }
+                }
+ */
+            }
+        }
+    }
+}
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 59d0148..4733547 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -90,6 +90,10 @@ namespace OpenSim.Region.Framework.Scenes
         /// </remarks>
         public event OnTerrainTickDelegate OnTerrainTick;
 
+        public delegate void OnTerrainUpdateDelegate();
+
+        public event OnTerrainUpdateDelegate OnTerrainUpdate;
+
         public delegate void OnBackupDelegate(ISimulationDataService datastore, bool forceBackup);
 
         /// <summary>
@@ -339,8 +343,6 @@ namespace OpenSim.Region.Framework.Scenes
         /// in <see cref="Scene.SetScriptRunning"/>
         /// via <see cref="OpenSim.Framework.IClientAPI.OnSetScriptRunning"/>,
         /// via <see cref="OpenSim.Region.ClientStack.LindenUDP.HandleSetScriptRunning"/>
-        /// XXX: This is only triggered when it is the client that starts the script, not in other situations where
-        /// a script is started, unlike OnStopScript!
         /// </remarks>
         public event StartScript OnStartScript;
 
@@ -354,7 +356,6 @@ namespace OpenSim.Region.Framework.Scenes
         /// in <see cref="SceneObjectPartInventory.CreateScriptInstance"/>,
         /// <see cref="SceneObjectPartInventory.StopScriptInstance"/>,
         /// <see cref="Scene.SetScriptRunning"/>
-        /// XXX: This is triggered when a sciprt is stopped for any reason, unlike OnStartScript!
         /// </remarks>
         public event StopScript OnStopScript;
 
@@ -842,6 +843,10 @@ namespace OpenSim.Region.Framework.Scenes
         public event ParcelPrimCountTainted OnParcelPrimCountTainted;
         public event GetScriptRunning OnGetScriptRunning;
 
+        public delegate void ThrottleUpdate(ScenePresence scenePresence);
+
+        public event ThrottleUpdate OnThrottleUpdate;
+
         /// <summary>
         /// RegisterCapsEvent is called by Scene after the Caps object
         /// has been instantiated and before it is return to the
@@ -1423,6 +1428,26 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
         }
+        public void TriggerTerrainUpdate()
+        {
+            OnTerrainUpdateDelegate handlerTerrainUpdate = OnTerrainUpdate;
+            if (handlerTerrainUpdate != null)
+            {
+                foreach (OnTerrainUpdateDelegate d in handlerTerrainUpdate.GetInvocationList())
+                {
+                    try
+                    {
+                        d();
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                            "[EVENT MANAGER]: Delegate for TriggerTerrainUpdate failed - continuing.  {0} {1}",
+                            e.Message, e.StackTrace);
+                    }
+                }
+            }
+        }
 
         public void TriggerTerrainTick()
         {
@@ -1755,6 +1780,7 @@ namespace OpenSim.Region.Framework.Scenes
                         m_log.ErrorFormat(
                             "[EVENT MANAGER]: Delegate for TriggerRemoveScript failed - continuing.  {0} {1}", 
                             e.Message, e.StackTrace);
+                        m_log.ErrorFormat(Environment.StackTrace);
                     }
                 }
             }
@@ -3033,6 +3059,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 foreach (Action<Scene> d in handler.GetInvocationList())
                 {
+                    m_log.InfoFormat("[EVENT MANAGER]: TriggerSceneShuttingDown invoque {0}", d.Method.Name.ToString());
                     try
                     {
                         d(s);
@@ -3045,6 +3072,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
             }
+            m_log.Info("[EVENT MANAGER]: TriggerSceneShuttingDown done");
         }
 
         public void TriggerOnRegionStarted(Scene scene)
@@ -3214,5 +3242,14 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
         }
+
+        public void TriggerThrottleUpdate(ScenePresence scenePresence)
+        {
+            ThrottleUpdate handler = OnThrottleUpdate;
+            if (handler != null)
+            {
+                handler(scenePresence);
+            }
+        }
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
new file mode 100644
index 0000000..6dc6504
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
@@ -0,0 +1,765 @@
+// Proprietary code of Avination Virtual Limited
+// (c) 2012 Melanie Thielker
+//
+
+using System;
+using System.Timers;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Diagnostics;
+using System.Reflection;
+using System.Threading;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Physics.Manager;
+using OpenSim.Region.Framework.Scenes.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Runtime.Serialization;
+using Timer = System.Timers.Timer;
+using log4net;
+
+namespace OpenSim.Region.Framework.Scenes
+{
+    public class KeyframeTimer
+    {
+        private static Dictionary<Scene, KeyframeTimer>m_timers =
+                new Dictionary<Scene, KeyframeTimer>();
+
+        private Timer m_timer;
+        private Dictionary<KeyframeMotion, object> m_motions = new Dictionary<KeyframeMotion, object>();
+        private object m_lockObject = new object();
+        private object m_timerLock = new object();
+        private const double m_tickDuration = 50.0;
+        private Scene m_scene;
+
+        public double TickDuration
+        {
+            get { return m_tickDuration; }
+        }
+
+        public KeyframeTimer(Scene scene)
+        {
+            m_timer = new Timer();
+            m_timer.Interval = TickDuration;
+            m_timer.AutoReset = true;
+            m_timer.Elapsed += OnTimer;
+
+            m_scene = scene;
+
+            m_timer.Start();
+        }
+
+        private void OnTimer(object sender, ElapsedEventArgs ea)
+        {
+            if (!Monitor.TryEnter(m_timerLock))
+                return;
+
+            try
+            {
+                List<KeyframeMotion> motions;
+
+                lock (m_lockObject)
+                {
+                    motions = new List<KeyframeMotion>(m_motions.Keys);
+                }
+
+                foreach (KeyframeMotion m in motions)
+                {
+                    try
+                    {
+                        m.OnTimer(TickDuration);
+                    }
+                    catch (Exception inner)
+                    {
+                        // Don't stop processing
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                // Keep running no matter what
+            }
+            finally
+            {
+                Monitor.Exit(m_timerLock);
+            }
+        }
+
+        public static void Add(KeyframeMotion motion)
+        {
+            KeyframeTimer timer;
+
+            if (motion.Scene == null)
+                return;
+
+            lock (m_timers)
+            {
+                if (!m_timers.TryGetValue(motion.Scene, out timer))
+                {
+                    timer = new KeyframeTimer(motion.Scene);
+                    m_timers[motion.Scene] = timer;
+                }
+            }
+
+            lock (timer.m_lockObject)
+            {
+                timer.m_motions[motion] = null;
+            }
+        }
+
+        public static void Remove(KeyframeMotion motion)
+        {
+            KeyframeTimer timer;
+
+            if (motion.Scene == null)
+                return;
+
+            lock (m_timers)
+            {
+                if (!m_timers.TryGetValue(motion.Scene, out timer))
+                {
+                    return;
+                }
+            }
+
+            lock (timer.m_lockObject)
+            {
+                timer.m_motions.Remove(motion);
+            }
+        }
+    }
+
+    [Serializable]
+    public class KeyframeMotion
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public enum PlayMode : int
+        {
+            Forward = 0,
+            Reverse = 1,
+            Loop = 2,
+            PingPong = 3
+        };
+
+        [Flags]
+        public enum DataFormat : int
+        {
+            Translation = 2,
+            Rotation = 1
+        }
+
+        [Serializable]
+        public struct Keyframe
+        {
+            public Vector3? Position;
+            public Quaternion? Rotation;
+            public Quaternion StartRotation;
+            public int TimeMS;
+            public int TimeTotal;
+            public Vector3 AngularVelocity;
+        };
+
+        private Vector3 m_serializedPosition;
+        private Vector3 m_basePosition;
+        private Quaternion m_baseRotation;
+
+        private Keyframe m_currentFrame;
+
+        private List<Keyframe> m_frames = new List<Keyframe>();
+
+        private Keyframe[] m_keyframes;
+
+        // skip timer events.
+        //timer.stop doesn't assure there aren't event threads still being fired
+        [NonSerialized()]
+        private bool m_timerStopped;
+
+        [NonSerialized()]
+        private bool m_isCrossing;
+
+        [NonSerialized()]
+        private bool m_waitingCrossing;
+
+        // retry position for cross fail
+        [NonSerialized()]
+        private Vector3 m_nextPosition;
+
+        [NonSerialized()]
+        private SceneObjectGroup m_group;
+
+        private PlayMode m_mode = PlayMode.Forward;
+        private DataFormat m_data = DataFormat.Translation | DataFormat.Rotation;
+
+        private bool m_running = false;
+
+        [NonSerialized()]
+        private bool m_selected = false;
+
+        private int m_iterations = 0;
+
+        private int m_skipLoops = 0;
+
+        [NonSerialized()]
+        private Scene m_scene;
+
+        public Scene Scene
+        {
+            get { return m_scene; }
+        }
+
+        public DataFormat Data
+        {
+            get { return m_data; }
+        }
+
+        public bool Selected
+        {
+            set
+            {
+                if (m_group != null)
+                {
+                    if (!value)
+                    {
+                        // Once we're let go, recompute positions
+                        if (m_selected)
+                            UpdateSceneObject(m_group);
+                    }
+                    else
+                    {
+                        // Save selection position in case we get moved
+                        if (!m_selected)
+                        {
+                            StopTimer();
+                            m_serializedPosition = m_group.AbsolutePosition;
+                        }
+                    }
+                }
+                m_isCrossing = false;
+                m_waitingCrossing = false;
+                m_selected = value;
+            }
+        }
+
+        private void StartTimer()
+        {
+            KeyframeTimer.Add(this);
+            m_timerStopped = false;
+        }
+
+        private void StopTimer()
+        {
+            m_timerStopped = true;
+            KeyframeTimer.Remove(this);
+        }
+
+        public static KeyframeMotion FromData(SceneObjectGroup grp, Byte[] data)
+        {
+            KeyframeMotion newMotion = null;
+
+            try
+            {
+                MemoryStream ms = new MemoryStream(data);
+                BinaryFormatter fmt = new BinaryFormatter();
+
+                newMotion = (KeyframeMotion)fmt.Deserialize(ms);
+
+                newMotion.m_group = grp;
+
+                if (grp != null)
+                {
+                    newMotion.m_scene = grp.Scene;
+                    if (grp.IsSelected)
+                        newMotion.m_selected = true;
+                }
+
+                newMotion.m_timerStopped = false;
+                newMotion.m_isCrossing = false;
+                newMotion.m_waitingCrossing = false;
+            }
+            catch
+            {
+                newMotion = null;
+            }
+
+            return newMotion;
+        }
+
+        public void UpdateSceneObject(SceneObjectGroup grp)
+        {
+            m_isCrossing = false;
+            m_waitingCrossing = false;
+            StopTimer();
+
+            if (grp == null)
+                return;
+
+            m_group = grp;
+            m_scene = grp.Scene;
+
+            Vector3 grppos = grp.AbsolutePosition;
+            Vector3 offset = grppos - m_serializedPosition;
+            // avoid doing it more than once
+            // current this will happen draging a prim to other region
+            m_serializedPosition = grppos;
+
+            m_basePosition += offset;
+            m_currentFrame.Position += offset;
+
+            m_nextPosition += offset;
+
+            for (int i = 0; i < m_frames.Count; i++)
+            {
+                Keyframe k = m_frames[i];
+                k.Position += offset;
+                m_frames[i]=k;
+            }
+
+            if (m_running)
+                Start();
+        }
+
+        public KeyframeMotion(SceneObjectGroup grp, PlayMode mode, DataFormat data)
+        {
+            m_mode = mode;
+            m_data = data;
+
+            m_group = grp;
+            if (grp != null)
+            {
+                m_basePosition = grp.AbsolutePosition;
+                m_baseRotation = grp.GroupRotation;
+                m_scene = grp.Scene;
+            }
+
+            m_timerStopped = true;
+            m_isCrossing = false;
+            m_waitingCrossing = false;
+        }
+
+        public void SetKeyframes(Keyframe[] frames)
+        {
+            m_keyframes = frames;
+        }
+
+        public KeyframeMotion Copy(SceneObjectGroup newgrp)
+        {
+            StopTimer();
+
+            KeyframeMotion newmotion = new KeyframeMotion(null, m_mode, m_data);
+
+            newmotion.m_group = newgrp;
+            newmotion.m_scene = newgrp.Scene;
+
+            if (m_keyframes != null)
+            {
+                newmotion.m_keyframes = new Keyframe[m_keyframes.Length];
+                m_keyframes.CopyTo(newmotion.m_keyframes, 0);
+            }
+
+            newmotion.m_frames = new List<Keyframe>(m_frames);
+
+            newmotion.m_basePosition = m_basePosition;
+            newmotion.m_baseRotation = m_baseRotation;
+
+            if (m_selected)
+                newmotion.m_serializedPosition = m_serializedPosition;
+            else
+            {
+                if (m_group != null)
+                    newmotion.m_serializedPosition = m_group.AbsolutePosition;
+                else
+                    newmotion.m_serializedPosition = m_serializedPosition;
+            }
+
+            newmotion.m_currentFrame = m_currentFrame;
+
+            newmotion.m_iterations = m_iterations;
+            newmotion.m_running = m_running;
+
+            if (m_running && !m_waitingCrossing)
+                StartTimer();
+
+            return newmotion;
+        }
+
+        public void Delete()
+        {
+            m_running = false;
+            StopTimer();
+            m_isCrossing = false;
+            m_waitingCrossing = false;
+            m_frames.Clear();
+            m_keyframes = null;
+        }
+
+        public void Start()
+        {
+            m_isCrossing = false;
+            m_waitingCrossing = false;
+            if (m_keyframes != null && m_group != null && m_keyframes.Length > 0)
+            {
+                StartTimer();
+                m_running = true;
+            }
+            else
+            {
+                m_running = false;
+                StopTimer();
+            }
+        }
+
+        public void Stop()
+        {
+            m_running = false;
+            m_isCrossing = false;
+            m_waitingCrossing = false;
+
+            StopTimer();
+
+            m_basePosition = m_group.AbsolutePosition;
+            m_baseRotation = m_group.GroupRotation;
+
+            m_group.RootPart.Velocity = Vector3.Zero;
+            m_group.RootPart.AngularVelocity = Vector3.Zero;
+            m_group.SendGroupRootTerseUpdate();
+//            m_group.RootPart.ScheduleTerseUpdate();
+            m_frames.Clear();
+        }
+
+        public void Pause()
+        {
+            m_running = false;
+            StopTimer();
+
+            m_group.RootPart.Velocity = Vector3.Zero;
+            m_group.RootPart.AngularVelocity = Vector3.Zero;
+            m_group.SendGroupRootTerseUpdate();
+//            m_group.RootPart.ScheduleTerseUpdate();
+
+        }
+
+        private void GetNextList()
+        {
+            m_frames.Clear();
+            Vector3 pos = m_basePosition;
+            Quaternion rot = m_baseRotation;
+
+            if (m_mode == PlayMode.Loop || m_mode == PlayMode.PingPong || m_iterations == 0)
+            {
+                int direction = 1;
+                if (m_mode == PlayMode.Reverse || ((m_mode == PlayMode.PingPong) && ((m_iterations & 1) != 0)))
+                    direction = -1;
+
+                int start = 0;
+                int end = m_keyframes.Length;
+
+                if (direction < 0)
+                {
+                    start = m_keyframes.Length - 1;
+                    end = -1;
+                }
+
+                for (int i = start; i != end ; i += direction)
+                {
+                    Keyframe k = m_keyframes[i];
+
+                    if (k.Position.HasValue)
+                    {
+                        k.Position = (k.Position * direction);
+//                        k.Velocity = (Vector3)k.Position / (k.TimeMS / 1000.0f);
+                        k.Position += pos;
+                    }
+                    else
+                    {
+                        k.Position = pos;
+//                        k.Velocity = Vector3.Zero;
+                    }
+
+                    k.StartRotation = rot;
+                    if (k.Rotation.HasValue)
+                    {
+                        if (direction == -1)
+                            k.Rotation = Quaternion.Conjugate((Quaternion)k.Rotation);
+                        k.Rotation = rot * k.Rotation;
+                    }
+                    else
+                    {
+                        k.Rotation = rot;
+                    }
+
+/* ang vel not in use for now
+
+                    float angle = 0;
+
+                    float aa = k.StartRotation.X * k.StartRotation.X + k.StartRotation.Y * k.StartRotation.Y + k.StartRotation.Z * k.StartRotation.Z + k.StartRotation.W * k.StartRotation.W;
+                    float bb = ((Quaternion)k.Rotation).X * ((Quaternion)k.Rotation).X + ((Quaternion)k.Rotation).Y * ((Quaternion)k.Rotation).Y + ((Quaternion)k.Rotation).Z * ((Quaternion)k.Rotation).Z + ((Quaternion)k.Rotation).W * ((Quaternion)k.Rotation).W;
+                    float aa_bb = aa * bb;
+
+                    if (aa_bb == 0)
+                    {
+                        angle = 0;
+                    }
+                    else
+                    {
+                        float ab = k.StartRotation.X * ((Quaternion)k.Rotation).X +
+                                   k.StartRotation.Y * ((Quaternion)k.Rotation).Y +
+                                   k.StartRotation.Z * ((Quaternion)k.Rotation).Z +
+                                   k.StartRotation.W * ((Quaternion)k.Rotation).W;
+                        float q = (ab * ab) / aa_bb;
+
+                        if (q > 1.0f)
+                        {
+                            angle = 0;
+                        }
+                        else
+                        {
+                            angle = (float)Math.Acos(2 * q - 1);
+                        }
+                    }
+
+                    k.AngularVelocity = (new Vector3(0, 0, 1) * (Quaternion)k.Rotation) * (angle / (k.TimeMS / 1000));
+ */
+                    k.TimeTotal = k.TimeMS;
+
+                    m_frames.Add(k);
+
+                    pos = (Vector3)k.Position;
+                    rot = (Quaternion)k.Rotation;
+                }
+
+                m_basePosition = pos;
+                m_baseRotation = rot;
+
+                m_iterations++;
+            }
+        }
+
+        public void OnTimer(double tickDuration)
+        {
+            if (m_skipLoops > 0)
+            {
+                m_skipLoops--;
+                return;
+            }
+
+            if (m_timerStopped) // trap events still in air even after a timer.stop
+                return;
+
+            if (m_group == null)
+                return;
+
+            bool update = false;
+
+            if (m_selected)
+            {
+                if (m_group.RootPart.Velocity != Vector3.Zero)
+                {
+                    m_group.RootPart.Velocity = Vector3.Zero;
+                    m_group.SendGroupRootTerseUpdate();
+
+                }
+                return;
+            }
+
+            if (m_isCrossing)
+            {
+                // if crossing and timer running then cross failed
+                // wait some time then
+                // retry to set the position that evtually caused the outbound
+                // if still outside region this will call startCrossing below
+                m_isCrossing = false;
+                m_group.AbsolutePosition = m_nextPosition;
+                if (!m_isCrossing)
+                {
+                    StopTimer();
+                    StartTimer();
+                }
+                return;
+            }
+
+            if (m_frames.Count == 0)
+            {
+                GetNextList();
+
+                if (m_frames.Count == 0)
+                {
+                    Stop();
+                    Scene scene = m_group.Scene;
+
+                    IScriptModule[] scriptModules = scene.RequestModuleInterfaces<IScriptModule>();
+                    foreach (IScriptModule m in scriptModules)
+                    {
+                        if (m == null)
+                            continue;
+                        m.PostObjectEvent(m_group.RootPart.UUID, "moving_end", new object[0]);
+                    }
+
+                    return;
+                }
+
+                m_currentFrame = m_frames[0];
+                m_currentFrame.TimeMS += (int)tickDuration;
+
+                //force a update on a keyframe transition
+                update = true;
+            }
+
+            m_currentFrame.TimeMS -= (int)tickDuration;
+
+            // Do the frame processing
+            double steps = (double)m_currentFrame.TimeMS / tickDuration;
+
+            if (steps <= 0.0)
+            {
+                m_group.RootPart.Velocity = Vector3.Zero;
+                m_group.RootPart.AngularVelocity = Vector3.Zero;
+
+                m_nextPosition = (Vector3)m_currentFrame.Position;
+                m_group.AbsolutePosition = m_nextPosition;
+
+                // we are sending imediate updates, no doing force a extra terseUpdate
+                // m_group.UpdateGroupRotationR((Quaternion)m_currentFrame.Rotation);
+
+                m_group.RootPart.RotationOffset = (Quaternion)m_currentFrame.Rotation;
+                m_frames.RemoveAt(0);
+                if (m_frames.Count > 0)
+                    m_currentFrame = m_frames[0];
+
+                update = true;
+            }
+            else
+            {
+                float complete = ((float)m_currentFrame.TimeTotal - (float)m_currentFrame.TimeMS) / (float)m_currentFrame.TimeTotal;
+
+                Vector3 v = (Vector3)m_currentFrame.Position - m_group.AbsolutePosition;
+                Vector3 motionThisFrame = v / (float)steps;
+                v = v * 1000 / m_currentFrame.TimeMS;
+
+                if (Vector3.Mag(motionThisFrame) >= 0.05f)
+                {
+                    // m_group.AbsolutePosition += motionThisFrame;
+                    m_nextPosition = m_group.AbsolutePosition + motionThisFrame;
+                    m_group.AbsolutePosition = m_nextPosition;
+
+                    m_group.RootPart.Velocity = v;
+                    update = true;
+                }
+
+                if ((Quaternion)m_currentFrame.Rotation != m_group.GroupRotation)
+                {
+                    Quaternion current = m_group.GroupRotation;
+
+                    Quaternion step = Quaternion.Slerp(m_currentFrame.StartRotation, (Quaternion)m_currentFrame.Rotation, complete);
+                    step.Normalize();
+/* use simpler change detection
+* float angle = 0;
+
+                    float aa = current.X * current.X + current.Y * current.Y + current.Z * current.Z + current.W * current.W;
+                    float bb = step.X * step.X + step.Y * step.Y + step.Z * step.Z + step.W * step.W;
+                    float aa_bb = aa * bb;
+
+                    if (aa_bb == 0)
+                    {
+                        angle = 0;
+                    }
+                    else
+                    {
+                        float ab = current.X * step.X +
+                                   current.Y * step.Y +
+                                   current.Z * step.Z +
+                                   current.W * step.W;
+                        float q = (ab * ab) / aa_bb;
+
+                        if (q > 1.0f)
+                        {
+                            angle = 0;
+                        }
+                        else
+                        {
+                            angle = (float)Math.Acos(2 * q - 1);
+                        }
+                    }
+
+                    if (angle > 0.01f)
+*/
+                    if(Math.Abs(step.X - current.X) > 0.001f 
+                        || Math.Abs(step.Y - current.Y) > 0.001f 
+                        || Math.Abs(step.Z - current.Z) > 0.001f)
+                        // assuming w is a dependente var
+
+                    {
+//                                m_group.UpdateGroupRotationR(step);
+                        m_group.RootPart.RotationOffset = step;
+
+                        //m_group.RootPart.UpdateAngularVelocity(m_currentFrame.AngularVelocity / 2);
+                        update = true;
+                    }
+                }
+            }
+
+            if (update)
+            {
+                m_group.SendGroupRootTerseUpdate();
+            }
+        }
+
+        public Byte[] Serialize()
+        {
+            StopTimer();
+            MemoryStream ms = new MemoryStream();
+
+            BinaryFormatter fmt = new BinaryFormatter();
+            SceneObjectGroup tmp = m_group;
+            m_group = null;
+            if (!m_selected && tmp != null)
+                m_serializedPosition = tmp.AbsolutePosition;
+            fmt.Serialize(ms, this);
+            m_group = tmp;
+            if (m_running && !m_waitingCrossing)
+                StartTimer();
+
+            return ms.ToArray();
+        }
+
+        public void StartCrossingCheck()
+        {
+            // timer will be restart by crossingFailure
+            // or never since crossing worked and this 
+            // should be deleted
+            StopTimer();
+           
+            m_isCrossing = true;
+            m_waitingCrossing = true;
+
+            // to remove / retune to smoth crossings
+            if (m_group.RootPart.Velocity != Vector3.Zero)
+            {
+                m_group.RootPart.Velocity = Vector3.Zero;
+                m_group.SendGroupRootTerseUpdate();
+//                m_group.RootPart.ScheduleTerseUpdate();
+            }
+        }
+
+        public void CrossingFailure()
+        {
+            m_waitingCrossing = false;
+
+            if (m_group != null)
+            {
+                m_group.RootPart.Velocity = Vector3.Zero;
+                m_group.SendGroupRootTerseUpdate();
+//                m_group.RootPart.ScheduleTerseUpdate();
+
+                if (m_running)
+                {
+                    StopTimer();
+                    m_skipLoops = 1200; // 60 seconds
+                    StartTimer();
+                }
+            }
+        }
+    }
+}
diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
index 1b10e3c..ddae073 100644
--- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs
+++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
@@ -157,7 +157,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         private uint GetPriorityByBestAvatarResponsiveness(IClientAPI client, ISceneEntity entity)
         {
-            uint pqueue = ComputeDistancePriority(client,entity,true);
+            uint pqueue = ComputeDistancePriority(client,entity,false);
 
             ScenePresence presence = m_scene.GetScenePresence(client.AgentId);
             if (presence != null)
@@ -212,9 +212,15 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             // Use the camera position for local agents and avatar position for remote agents
-            Vector3 presencePos = (presence.IsChildAgent) ?
-                presence.AbsolutePosition :
-                presence.CameraPosition;
+            // Why would I want that? They could be camming but I still see them at the
+            // avatar position, so why should I update them as if they were at their
+            // camera positions? Makes no sense!
+            // TODO: Fix this mess
+            //Vector3 presencePos = (presence.IsChildAgent) ?
+            //    presence.AbsolutePosition :
+            //    presence.CameraPosition;
+
+            Vector3 presencePos = presence.AbsolutePosition;
 
             // Compute the distance... 
             double distance = Vector3.Distance(presencePos, entityPos);
@@ -226,7 +232,7 @@ namespace OpenSim.Region.Framework.Scenes
             
             for (int i = 0; i < queues - 1; i++)
             {
-                if (distance < 10 * Math.Pow(2.0,i))
+                if (distance < 30 * Math.Pow(2.0,i))
                     break;
                 pqueue++;
             }
diff --git a/OpenSim/Region/Framework/Scenes/SOPMaterial.cs b/OpenSim/Region/Framework/Scenes/SOPMaterial.cs
new file mode 100644
index 0000000..10ac37c
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/SOPMaterial.cs
@@ -0,0 +1,95 @@
+/*
+ * 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 OpenSim.Framework;
+
+namespace OpenSim.Region.Framework.Scenes
+{
+    public static class SOPMaterialData
+    {
+        public enum SopMaterial : int // redundante and not in use for now 
+        {
+            Stone = 0,
+            Metal = 1,
+            Glass = 2,
+            Wood = 3,
+            Flesh = 4,
+            Plastic = 5,
+            Rubber = 6,
+            light = 7 // compatibility with old viewers
+        }
+
+        private struct MaterialData
+        {
+            public float friction;
+            public float bounce;
+            public MaterialData(float f, float b)
+            {
+                friction = f;
+                bounce = b;
+            }
+        }
+
+        private static MaterialData[] m_materialdata = {
+            new MaterialData(0.8f,0.4f), // Stone
+            new MaterialData(0.3f,0.4f), // Metal
+            new MaterialData(0.2f,0.7f), // Glass
+            new MaterialData(0.6f,0.5f), // Wood
+            new MaterialData(0.9f,0.3f), // Flesh
+            new MaterialData(0.4f,0.7f), // Plastic
+            new MaterialData(0.9f,0.95f), // Rubber
+            new MaterialData(0.0f,0.0f) // light ??
+        };
+
+        public static Material MaxMaterial
+        {
+            get { return (Material)(m_materialdata.Length - 1); }
+        }
+
+        public static float friction(Material material)
+        {
+            int indx = (int)material;
+            if (indx < m_materialdata.Length)
+                return (m_materialdata[indx].friction);
+            else
+                return 0;
+        }
+
+        public static float bounce(Material material)
+        {
+            int indx = (int)material;
+            if (indx < m_materialdata.Length)
+                return (m_materialdata[indx].bounce);
+            else
+                return 0;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
new file mode 100644
index 0000000..9cb901a
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
@@ -0,0 +1,791 @@
+/*
+ * 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 OpenSim.Framework;
+using OpenSim.Region.Physics.Manager;
+using System.Text;
+using System.IO;
+using System.Xml;
+using OpenSim.Framework.Serialization;
+using OpenSim.Framework.Serialization.External;
+using OpenSim.Region.Framework.Scenes.Serialization;
+
+namespace OpenSim.Region.Framework.Scenes
+{
+    public class SOPVehicle
+    {
+        public VehicleData vd;
+
+        public Vehicle Type
+        {
+            get { return vd.m_type; }
+        }
+
+        public SOPVehicle()
+        {
+            vd = new VehicleData();
+            ProcessTypeChange(Vehicle.TYPE_NONE); // is needed?
+        }
+
+        public void ProcessFloatVehicleParam(Vehicle pParam, float pValue)
+        {
+            float len;
+            float timestep = 0.01f;
+            switch (pParam)
+            {
+                case Vehicle.ANGULAR_DEFLECTION_EFFICIENCY:
+                    if (pValue < 0f) pValue = 0f;
+                    if (pValue > 1f) pValue = 1f;
+                    vd.m_angularDeflectionEfficiency = pValue;
+                    break;
+                case Vehicle.ANGULAR_DEFLECTION_TIMESCALE:
+                    if (pValue < timestep) pValue = timestep;
+                    vd.m_angularDeflectionTimescale = pValue;
+                    break;
+                case Vehicle.ANGULAR_MOTOR_DECAY_TIMESCALE:
+                    if (pValue < timestep) pValue = timestep;
+                    else if (pValue > 120) pValue = 120;
+                    vd.m_angularMotorDecayTimescale = pValue;
+                    break;
+                case Vehicle.ANGULAR_MOTOR_TIMESCALE:
+                    if (pValue < timestep) pValue = timestep;
+                    vd.m_angularMotorTimescale = pValue;
+                    break;
+                case Vehicle.BANKING_EFFICIENCY:
+                    if (pValue < -1f) pValue = -1f;
+                    if (pValue > 1f) pValue = 1f;
+                    vd.m_bankingEfficiency = pValue;
+                    break;
+                case Vehicle.BANKING_MIX:
+                    if (pValue < 0f) pValue = 0f;
+                    if (pValue > 1f) pValue = 1f;
+                    vd.m_bankingMix = pValue;
+                    break;
+                case Vehicle.BANKING_TIMESCALE:
+                    if (pValue < timestep) pValue = timestep;
+                    vd.m_bankingTimescale = pValue;
+                    break;
+                case Vehicle.BUOYANCY:
+                    if (pValue < -1f) pValue = -1f;
+                    if (pValue > 1f) pValue = 1f;
+                    vd.m_VehicleBuoyancy = pValue;
+                    break;
+                case Vehicle.HOVER_EFFICIENCY:
+                    if (pValue < 0f) pValue = 0f;
+                    if (pValue > 1f) pValue = 1f;
+                    vd.m_VhoverEfficiency = pValue;
+                    break;
+                case Vehicle.HOVER_HEIGHT:
+                    vd.m_VhoverHeight = pValue;
+                    break;
+                case Vehicle.HOVER_TIMESCALE:
+                    if (pValue < timestep) pValue = timestep;
+                    vd.m_VhoverTimescale = pValue;
+                    break;
+                case Vehicle.LINEAR_DEFLECTION_EFFICIENCY:
+                    if (pValue < 0f) pValue = 0f;
+                    if (pValue > 1f) pValue = 1f;
+                    vd.m_linearDeflectionEfficiency = pValue;
+                    break;
+                case Vehicle.LINEAR_DEFLECTION_TIMESCALE:
+                    if (pValue < timestep) pValue = timestep;
+                    vd.m_linearDeflectionTimescale = pValue;
+                    break;
+                case Vehicle.LINEAR_MOTOR_DECAY_TIMESCALE:
+                    if (pValue < timestep) pValue = timestep;
+                    else if (pValue > 120) pValue = 120;
+                    vd.m_linearMotorDecayTimescale = pValue;
+                    break;
+                case Vehicle.LINEAR_MOTOR_TIMESCALE:
+                    if (pValue < timestep) pValue = timestep;
+                    vd.m_linearMotorTimescale = pValue;
+                    break;
+                case Vehicle.VERTICAL_ATTRACTION_EFFICIENCY:
+                    if (pValue < 0f) pValue = 0f;
+                    if (pValue > 1f) pValue = 1f;
+                    vd.m_verticalAttractionEfficiency = pValue;
+                    break;
+                case Vehicle.VERTICAL_ATTRACTION_TIMESCALE:
+                    if (pValue < timestep) pValue = timestep;
+                    vd.m_verticalAttractionTimescale = pValue;
+                    break;
+
+                // These are vector properties but the engine lets you use a single float value to
+                // set all of the components to the same value
+                case Vehicle.ANGULAR_FRICTION_TIMESCALE:
+                    if (pValue < timestep) pValue = timestep;
+                    vd.m_angularFrictionTimescale = new Vector3(pValue, pValue, pValue);
+                    break;
+                case Vehicle.ANGULAR_MOTOR_DIRECTION:
+                    vd.m_angularMotorDirection = new Vector3(pValue, pValue, pValue);
+                    len = vd.m_angularMotorDirection.Length();
+                    if (len > 12.566f)
+                        vd.m_angularMotorDirection *= (12.566f / len);
+                    break;
+                case Vehicle.LINEAR_FRICTION_TIMESCALE:
+                    if (pValue < timestep) pValue = timestep;
+                    vd.m_linearFrictionTimescale = new Vector3(pValue, pValue, pValue);
+                    break;
+                case Vehicle.LINEAR_MOTOR_DIRECTION:
+                    vd.m_linearMotorDirection = new Vector3(pValue, pValue, pValue);
+                    len = vd.m_linearMotorDirection.Length();
+                    if (len > 30.0f)
+                        vd.m_linearMotorDirection *= (30.0f / len);
+                    break;
+                case Vehicle.LINEAR_MOTOR_OFFSET:
+                    vd.m_linearMotorOffset = new Vector3(pValue, pValue, pValue);
+                    len = vd.m_linearMotorOffset.Length();
+                    if (len > 100.0f)
+                        vd.m_linearMotorOffset *= (100.0f / len);
+                    break;
+            }
+        }//end ProcessFloatVehicleParam
+
+        public void ProcessVectorVehicleParam(Vehicle pParam, Vector3 pValue)
+        {
+            float len;
+            float timestep = 0.01f;
+            switch (pParam)
+            {
+                case Vehicle.ANGULAR_FRICTION_TIMESCALE:
+                    if (pValue.X < timestep) pValue.X = timestep;
+                    if (pValue.Y < timestep) pValue.Y = timestep;
+                    if (pValue.Z < timestep) pValue.Z = timestep;
+
+                    vd.m_angularFrictionTimescale = new Vector3(pValue.X, pValue.Y, pValue.Z);
+                    break;
+                case Vehicle.ANGULAR_MOTOR_DIRECTION:
+                    vd.m_angularMotorDirection = new Vector3(pValue.X, pValue.Y, pValue.Z);
+                    // Limit requested angular speed to 2 rps= 4 pi rads/sec
+                    len = vd.m_angularMotorDirection.Length();
+                    if (len > 12.566f)
+                        vd.m_angularMotorDirection *= (12.566f / len);
+                    break;
+                case Vehicle.LINEAR_FRICTION_TIMESCALE:
+                    if (pValue.X < timestep) pValue.X = timestep;
+                    if (pValue.Y < timestep) pValue.Y = timestep;
+                    if (pValue.Z < timestep) pValue.Z = timestep;
+                    vd.m_linearFrictionTimescale = new Vector3(pValue.X, pValue.Y, pValue.Z);
+                    break;
+                case Vehicle.LINEAR_MOTOR_DIRECTION:
+                    vd.m_linearMotorDirection = new Vector3(pValue.X, pValue.Y, pValue.Z);
+                    len = vd.m_linearMotorDirection.Length();
+                    if (len > 30.0f)
+                        vd.m_linearMotorDirection *= (30.0f / len);
+                    break;
+                case Vehicle.LINEAR_MOTOR_OFFSET:
+                    vd.m_linearMotorOffset = new Vector3(pValue.X, pValue.Y, pValue.Z);
+                    len = vd.m_linearMotorOffset.Length();
+                    if (len > 100.0f)
+                        vd.m_linearMotorOffset *= (100.0f / len);
+                    break;
+            }
+        }//end ProcessVectorVehicleParam
+
+        public void ProcessRotationVehicleParam(Vehicle pParam, Quaternion pValue)
+        {
+            switch (pParam)
+            {
+                case Vehicle.REFERENCE_FRAME:
+                    vd.m_referenceFrame = pValue;
+                    break;
+            }
+        }//end ProcessRotationVehicleParam
+
+        public void ProcessVehicleFlags(int pParam, bool remove)
+        {
+            if (remove)
+            {
+                vd.m_flags &= ~((VehicleFlag)pParam);
+            }
+            else
+            {
+                vd.m_flags |= (VehicleFlag)pParam;
+            }
+        }//end ProcessVehicleFlags
+
+        public void ProcessTypeChange(Vehicle pType)
+        {
+            vd.m_linearMotorDirection = Vector3.Zero;
+            vd.m_angularMotorDirection = Vector3.Zero;
+            vd.m_linearMotorOffset = Vector3.Zero;
+            vd.m_referenceFrame = Quaternion.Identity;
+
+            // Set Defaults For Type
+            vd.m_type = pType;
+            switch (pType)
+            {
+                case Vehicle.TYPE_NONE:
+                    vd.m_linearFrictionTimescale = new Vector3(1000, 1000, 1000);
+                    vd.m_angularFrictionTimescale = new Vector3(1000, 1000, 1000);
+                    vd.m_linearMotorTimescale = 1000;
+                    vd.m_linearMotorDecayTimescale = 120;
+                    vd.m_angularMotorTimescale = 1000;
+                    vd.m_angularMotorDecayTimescale = 1000;
+                    vd.m_VhoverHeight = 0;
+                    vd.m_VhoverEfficiency = 1;
+                    vd.m_VhoverTimescale = 1000;
+                    vd.m_VehicleBuoyancy = 0;
+                    vd.m_linearDeflectionEfficiency = 0;
+                    vd.m_linearDeflectionTimescale = 1000;
+                    vd.m_angularDeflectionEfficiency = 0;
+                    vd.m_angularDeflectionTimescale = 1000;
+                    vd.m_bankingEfficiency = 0;
+                    vd.m_bankingMix = 1;
+                    vd.m_bankingTimescale = 1000;
+                    vd.m_verticalAttractionEfficiency = 0;
+                    vd.m_verticalAttractionTimescale = 1000;
+
+                    vd.m_flags = (VehicleFlag)0;
+                    break;
+
+                case Vehicle.TYPE_SLED:
+                    vd.m_linearFrictionTimescale = new Vector3(30, 1, 1000);
+                    vd.m_angularFrictionTimescale = new Vector3(1000, 1000, 1000);
+                    vd.m_linearMotorTimescale = 1000;
+                    vd.m_linearMotorDecayTimescale = 120;
+                    vd.m_angularMotorTimescale = 1000;
+                    vd.m_angularMotorDecayTimescale = 120;
+                    vd.m_VhoverHeight = 0;
+                    vd.m_VhoverEfficiency = 1;
+                    vd.m_VhoverTimescale = 10;
+                    vd.m_VehicleBuoyancy = 0;
+                    vd.m_linearDeflectionEfficiency = 1;
+                    vd.m_linearDeflectionTimescale = 1;
+                    vd.m_angularDeflectionEfficiency = 0;
+                    vd.m_angularDeflectionTimescale = 1000;
+                    vd.m_bankingEfficiency = 0;
+                    vd.m_bankingMix = 1;
+                    vd.m_bankingTimescale = 10;
+                    vd.m_flags &=
+                         ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
+                           VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY);
+                    vd.m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.LIMIT_MOTOR_UP);
+                    break;
+                case Vehicle.TYPE_CAR:
+                    vd.m_linearFrictionTimescale = new Vector3(100, 2, 1000);
+                    vd.m_angularFrictionTimescale = new Vector3(1000, 1000, 1000);
+                    vd.m_linearMotorTimescale = 1;
+                    vd.m_linearMotorDecayTimescale = 60;
+                    vd.m_angularMotorTimescale = 1;
+                    vd.m_angularMotorDecayTimescale = 0.8f;
+                    vd.m_VhoverHeight = 0;
+                    vd.m_VhoverEfficiency = 0;
+                    vd.m_VhoverTimescale = 1000;
+                    vd.m_VehicleBuoyancy = 0;
+                    vd.m_linearDeflectionEfficiency = 1;
+                    vd.m_linearDeflectionTimescale = 2;
+                    vd.m_angularDeflectionEfficiency = 0;
+                    vd.m_angularDeflectionTimescale = 10;
+                    vd.m_verticalAttractionEfficiency = 1f;
+                    vd.m_verticalAttractionTimescale = 10f;
+                    vd.m_bankingEfficiency = -0.2f;
+                    vd.m_bankingMix = 1;
+                    vd.m_bankingTimescale = 1;
+                    vd.m_flags &= ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT);
+                    vd.m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.LIMIT_ROLL_ONLY |
+                                VehicleFlag.LIMIT_MOTOR_UP | VehicleFlag.HOVER_UP_ONLY);
+                    break;
+                case Vehicle.TYPE_BOAT:
+                    vd.m_linearFrictionTimescale = new Vector3(10, 3, 2);
+                    vd.m_angularFrictionTimescale = new Vector3(10, 10, 10);
+                    vd.m_linearMotorTimescale = 5;
+                    vd.m_linearMotorDecayTimescale = 60;
+                    vd.m_angularMotorTimescale = 4;
+                    vd.m_angularMotorDecayTimescale = 4;
+                    vd.m_VhoverHeight = 0;
+                    vd.m_VhoverEfficiency = 0.5f;
+                    vd.m_VhoverTimescale = 2;
+                    vd.m_VehicleBuoyancy = 1;
+                    vd.m_linearDeflectionEfficiency = 0.5f;
+                    vd.m_linearDeflectionTimescale = 3;
+                    vd.m_angularDeflectionEfficiency = 0.5f;
+                    vd.m_angularDeflectionTimescale = 5;
+                    vd.m_verticalAttractionEfficiency = 0.5f;
+                    vd.m_verticalAttractionTimescale = 5f;
+                    vd.m_bankingEfficiency = -0.3f;
+                    vd.m_bankingMix = 0.8f;
+                    vd.m_bankingTimescale = 1;
+                    vd.m_flags &= ~(VehicleFlag.HOVER_TERRAIN_ONLY |
+                            VehicleFlag.HOVER_GLOBAL_HEIGHT |
+                            VehicleFlag.HOVER_UP_ONLY |
+                            VehicleFlag.LIMIT_ROLL_ONLY);
+                    vd.m_flags |= (VehicleFlag.NO_DEFLECTION_UP |
+                                VehicleFlag.LIMIT_MOTOR_UP |
+                                VehicleFlag.HOVER_WATER_ONLY);
+                    break;
+                case Vehicle.TYPE_AIRPLANE:
+                    vd.m_linearFrictionTimescale = new Vector3(200, 10, 5);
+                    vd.m_angularFrictionTimescale = new Vector3(20, 20, 20);
+                    vd.m_linearMotorTimescale = 2;
+                    vd.m_linearMotorDecayTimescale = 60;
+                    vd.m_angularMotorTimescale = 4;
+                    vd.m_angularMotorDecayTimescale = 8;
+                    vd.m_VhoverHeight = 0;
+                    vd.m_VhoverEfficiency = 0.5f;
+                    vd.m_VhoverTimescale = 1000;
+                    vd.m_VehicleBuoyancy = 0;
+                    vd.m_linearDeflectionEfficiency = 0.5f;
+                    vd.m_linearDeflectionTimescale = 0.5f;
+                    vd.m_angularDeflectionEfficiency = 1;
+                    vd.m_angularDeflectionTimescale = 2;
+                    vd.m_verticalAttractionEfficiency = 0.9f;
+                    vd.m_verticalAttractionTimescale = 2f;
+                    vd.m_bankingEfficiency = 1;
+                    vd.m_bankingMix = 0.7f;
+                    vd.m_bankingTimescale = 2;
+                    vd.m_flags &= ~(VehicleFlag.HOVER_WATER_ONLY |
+                        VehicleFlag.HOVER_TERRAIN_ONLY |
+                        VehicleFlag.HOVER_GLOBAL_HEIGHT |
+                        VehicleFlag.HOVER_UP_ONLY |
+                        VehicleFlag.NO_DEFLECTION_UP |
+                        VehicleFlag.LIMIT_MOTOR_UP);
+                    vd.m_flags |= (VehicleFlag.LIMIT_ROLL_ONLY);
+                    break;
+                case Vehicle.TYPE_BALLOON:
+                    vd.m_linearFrictionTimescale = new Vector3(5, 5, 5);
+                    vd.m_angularFrictionTimescale = new Vector3(10, 10, 10);
+                    vd.m_linearMotorTimescale = 5;
+                    vd.m_linearMotorDecayTimescale = 60;
+                    vd.m_angularMotorTimescale = 6;
+                    vd.m_angularMotorDecayTimescale = 10;
+                    vd.m_VhoverHeight = 5;
+                    vd.m_VhoverEfficiency = 0.8f;
+                    vd.m_VhoverTimescale = 10;
+                    vd.m_VehicleBuoyancy = 1;
+                    vd.m_linearDeflectionEfficiency = 0;
+                    vd.m_linearDeflectionTimescale = 5;
+                    vd.m_angularDeflectionEfficiency = 0;
+                    vd.m_angularDeflectionTimescale = 5;
+                    vd.m_verticalAttractionEfficiency = 0f;
+                    vd.m_verticalAttractionTimescale = 1000f;
+                    vd.m_bankingEfficiency = 0;
+                    vd.m_bankingMix = 0.7f;
+                    vd.m_bankingTimescale = 5;
+                    vd.m_flags &= ~(VehicleFlag.HOVER_WATER_ONLY |
+                        VehicleFlag.HOVER_TERRAIN_ONLY |
+                        VehicleFlag.HOVER_UP_ONLY |
+                        VehicleFlag.NO_DEFLECTION_UP |
+                        VehicleFlag.LIMIT_MOTOR_UP);
+                    vd.m_flags |= (VehicleFlag.LIMIT_ROLL_ONLY |
+                        VehicleFlag.HOVER_GLOBAL_HEIGHT);
+                    break;
+            }
+        }
+        public void SetVehicle(PhysicsActor ph)
+        {
+            if (ph == null)
+                return;
+            ph.SetVehicle(vd);
+        }
+
+        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(Utils.EnUsCulture));
+        }
+
+        private void XWVector(string name, Vector3 vec)
+        {
+            writer.WriteStartElement(name);
+            writer.WriteElementString("X", vec.X.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("Y", vec.Y.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("Z", vec.Z.ToString(Utils.EnUsCulture));
+            writer.WriteEndElement();
+        }
+
+        private void XWQuat(string name, Quaternion quat)
+        {
+            writer.WriteStartElement(name);
+            writer.WriteElementString("X", quat.X.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("Y", quat.Y.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("Z", quat.Z.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("W", quat.W.ToString(Utils.EnUsCulture));
+            writer.WriteEndElement();
+        }
+
+        public void ToXml2(XmlTextWriter twriter)
+        {
+            writer = twriter;
+            writer.WriteStartElement("Vehicle");
+
+            XWint("TYPE", (int)vd.m_type);
+            XWint("FLAGS", (int)vd.m_flags);
+
+            // Linear properties
+            XWVector("LMDIR", vd.m_linearMotorDirection);
+            XWVector("LMFTIME", vd.m_linearFrictionTimescale);
+            XWfloat("LMDTIME", vd.m_linearMotorDecayTimescale);
+            XWfloat("LMTIME", vd.m_linearMotorTimescale);
+            XWVector("LMOFF", vd.m_linearMotorOffset);
+
+            //Angular properties
+            XWVector("AMDIR", vd.m_angularMotorDirection);
+            XWfloat("AMTIME", vd.m_angularMotorTimescale);
+            XWfloat("AMDTIME", vd.m_angularMotorDecayTimescale);
+            XWVector("AMFTIME", vd.m_angularFrictionTimescale);
+
+            //Deflection properties
+            XWfloat("ADEFF", vd.m_angularDeflectionEfficiency);
+            XWfloat("ADTIME", vd.m_angularDeflectionTimescale);
+            XWfloat("LDEFF", vd.m_linearDeflectionEfficiency);
+            XWfloat("LDTIME", vd.m_linearDeflectionTimescale);
+
+            //Banking properties
+            XWfloat("BEFF", vd.m_bankingEfficiency);
+            XWfloat("BMIX", vd.m_bankingMix);
+            XWfloat("BTIME", vd.m_bankingTimescale);
+
+            //Hover and Buoyancy properties
+            XWfloat("HHEI", vd.m_VhoverHeight);
+            XWfloat("HEFF", vd.m_VhoverEfficiency);
+            XWfloat("HTIME", vd.m_VhoverTimescale);
+            XWfloat("VBUO", vd.m_VehicleBuoyancy);
+
+            //Attractor properties
+            XWfloat("VAEFF", vd.m_verticalAttractionEfficiency);
+            XWfloat("VATIME", vd.m_verticalAttractionTimescale);
+
+            XWQuat("REF_FRAME", vd.m_referenceFrame);
+
+            writer.WriteEndElement();
+            writer = null;
+        }
+
+
+
+        XmlTextReader 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 Quaternion XRquat()
+        {
+            Quaternion 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,
+            XmlTextReader xtr)
+        {
+            bool errors = false;
+
+            string nodeName = string.Empty;
+            while (xtr.NodeType != XmlNodeType.EndElement)
+            {
+                nodeName = xtr.Name;
+
+                //                        m_log.DebugFormat("[ExternalRepresentationUtils]: Processing: {0}", nodeName);
+
+                Action p = null;
+                if (processors.TryGetValue(xtr.Name, out p))
+                {
+                    //                            m_log.DebugFormat("[ExternalRepresentationUtils]: Found {0} processor, nodeName);
+
+                    try
+                    {
+                        p();
+                    }
+                    catch (Exception e)
+                    {
+                        errors = true;
+                        if (xtr.NodeType == XmlNodeType.EndElement)
+                            xtr.Read();
+                    }
+                }
+                else
+                {
+                    // m_log.DebugFormat("[LandDataSerializer]: caught unknown element {0}", nodeName);
+                    xtr.ReadOuterXml(); // ignore
+                }
+            }
+
+            return errors;
+        }
+
+        
+        public string ToXml2()
+        {
+            MemoryStream ms = new MemoryStream(512);
+            UTF8Encoding enc = new UTF8Encoding();
+            XmlTextWriter xwriter = new XmlTextWriter(ms, enc);
+            ToXml2(xwriter);
+            xwriter.Flush();
+            string s = ms.GetStreamString();
+            xwriter.Close();
+            return s;
+        }
+
+        public static SOPVehicle FromXml2(string text)
+        {
+            if (text == String.Empty)
+                return null;
+
+            UTF8Encoding enc = new UTF8Encoding();
+            MemoryStream ms = new MemoryStream(enc.GetBytes(text));
+            XmlTextReader xreader = new XmlTextReader(ms);
+
+            SOPVehicle v = new SOPVehicle();
+            bool error;
+
+            v.FromXml2(xreader, out error);
+
+            xreader.Close();
+
+            if (error)
+            {
+                v = null;
+                return null;
+            }
+            return v;
+        }
+
+        public static SOPVehicle FromXml2(XmlTextReader reader)
+        {
+            SOPVehicle vehicle = new SOPVehicle();
+
+            bool errors = false;
+
+            vehicle.FromXml2(reader, out errors);
+            if (errors)
+                return null;
+
+            return vehicle;
+        }
+
+        private void FromXml2(XmlTextReader _reader, out bool errors)
+        {
+            errors = false;
+            reader = _reader;
+
+            Dictionary<string, Action> m_VehicleXmlProcessors
+            = new Dictionary<string, Action>();
+
+            m_VehicleXmlProcessors.Add("TYPE", ProcessXR_type);
+            m_VehicleXmlProcessors.Add("FLAGS", ProcessXR_flags);
+
+            // Linear properties
+            m_VehicleXmlProcessors.Add("LMDIR", ProcessXR_linearMotorDirection);
+            m_VehicleXmlProcessors.Add("LMFTIME", ProcessXR_linearFrictionTimescale);
+            m_VehicleXmlProcessors.Add("LMDTIME", ProcessXR_linearMotorDecayTimescale);
+            m_VehicleXmlProcessors.Add("LMTIME", ProcessXR_linearMotorTimescale);
+            m_VehicleXmlProcessors.Add("LMOFF", ProcessXR_linearMotorOffset);
+
+            //Angular properties
+            m_VehicleXmlProcessors.Add("AMDIR", ProcessXR_angularMotorDirection);
+            m_VehicleXmlProcessors.Add("AMTIME", ProcessXR_angularMotorTimescale);
+            m_VehicleXmlProcessors.Add("AMDTIME", ProcessXR_angularMotorDecayTimescale);
+            m_VehicleXmlProcessors.Add("AMFTIME", ProcessXR_angularFrictionTimescale);
+
+            //Deflection properties
+            m_VehicleXmlProcessors.Add("ADEFF", ProcessXR_angularDeflectionEfficiency);
+            m_VehicleXmlProcessors.Add("ADTIME", ProcessXR_angularDeflectionTimescale);
+            m_VehicleXmlProcessors.Add("LDEFF", ProcessXR_linearDeflectionEfficiency);
+            m_VehicleXmlProcessors.Add("LDTIME", ProcessXR_linearDeflectionTimescale);
+
+            //Banking properties
+            m_VehicleXmlProcessors.Add("BEFF", ProcessXR_bankingEfficiency);
+            m_VehicleXmlProcessors.Add("BMIX", ProcessXR_bankingMix);
+            m_VehicleXmlProcessors.Add("BTIME", ProcessXR_bankingTimescale);
+
+            //Hover and Buoyancy properties
+            m_VehicleXmlProcessors.Add("HHEI", ProcessXR_VhoverHeight);
+            m_VehicleXmlProcessors.Add("HEFF", ProcessXR_VhoverEfficiency);
+            m_VehicleXmlProcessors.Add("HTIME", ProcessXR_VhoverTimescale);
+
+            m_VehicleXmlProcessors.Add("VBUO", ProcessXR_VehicleBuoyancy);
+
+            //Attractor properties
+            m_VehicleXmlProcessors.Add("VAEFF", ProcessXR_verticalAttractionEfficiency);
+            m_VehicleXmlProcessors.Add("VATIME", ProcessXR_verticalAttractionTimescale);
+
+            m_VehicleXmlProcessors.Add("REF_FRAME", ProcessXR_referenceFrame);
+
+            vd = new VehicleData();
+
+            reader.ReadStartElement("Vehicle", String.Empty);
+
+            errors = EReadProcessors(
+                m_VehicleXmlProcessors,
+                reader);
+
+            reader.ReadEndElement();
+            reader = null;
+        }
+
+        private void ProcessXR_type()
+        {
+            vd.m_type = (Vehicle)XRint();
+        }
+        private void ProcessXR_flags()
+        {
+            vd.m_flags = (VehicleFlag)XRint();
+        }
+        // Linear properties
+        private void ProcessXR_linearMotorDirection()
+        {
+            vd.m_linearMotorDirection = XRvector();
+        }
+
+        private void ProcessXR_linearFrictionTimescale()
+        {
+            vd.m_linearFrictionTimescale = XRvector();
+        }
+
+        private void ProcessXR_linearMotorDecayTimescale()
+        {
+            vd.m_linearMotorDecayTimescale = XRfloat();
+        }
+        private void ProcessXR_linearMotorTimescale()
+        {
+            vd.m_linearMotorTimescale = XRfloat();
+        }
+        private void ProcessXR_linearMotorOffset()
+        {
+            vd.m_linearMotorOffset = XRvector();
+        }
+
+
+        //Angular properties
+        private void ProcessXR_angularMotorDirection()
+        {
+            vd.m_angularMotorDirection = XRvector();
+        }
+        private void ProcessXR_angularMotorTimescale()
+        {
+            vd.m_angularMotorTimescale = XRfloat();
+        }
+        private void ProcessXR_angularMotorDecayTimescale()
+        {
+            vd.m_angularMotorDecayTimescale = XRfloat();
+        }
+        private void ProcessXR_angularFrictionTimescale()
+        {
+            vd.m_angularFrictionTimescale = XRvector();
+        }
+
+        //Deflection properties
+        private void ProcessXR_angularDeflectionEfficiency()
+        {
+            vd.m_angularDeflectionEfficiency = XRfloat();
+        }
+        private void ProcessXR_angularDeflectionTimescale()
+        {
+            vd.m_angularDeflectionTimescale = XRfloat();
+        }
+        private void ProcessXR_linearDeflectionEfficiency()
+        {
+            vd.m_linearDeflectionEfficiency = XRfloat();
+        }
+        private void ProcessXR_linearDeflectionTimescale()
+        {
+            vd.m_linearDeflectionTimescale = XRfloat();
+        }
+
+        //Banking properties
+        private void ProcessXR_bankingEfficiency()
+        {
+            vd.m_bankingEfficiency = XRfloat();
+        }
+        private void ProcessXR_bankingMix()
+        {
+            vd.m_bankingMix = XRfloat();
+        }
+        private void ProcessXR_bankingTimescale()
+        {
+            vd.m_bankingTimescale = XRfloat();
+        }
+
+        //Hover and Buoyancy properties
+        private void ProcessXR_VhoverHeight()
+        {
+            vd.m_VhoverHeight = XRfloat();
+        }
+        private void ProcessXR_VhoverEfficiency()
+        {
+            vd.m_VhoverEfficiency = XRfloat();
+        }
+        private void ProcessXR_VhoverTimescale()
+        {
+            vd.m_VhoverTimescale = XRfloat();
+        }
+
+        private void ProcessXR_VehicleBuoyancy()
+        {
+            vd.m_VehicleBuoyancy = XRfloat();
+        }
+
+        //Attractor properties
+        private void ProcessXR_verticalAttractionEfficiency()
+        {
+            vd.m_verticalAttractionEfficiency = XRfloat();
+        }
+        private void ProcessXR_verticalAttractionTimescale()
+        {
+            vd.m_verticalAttractionTimescale = XRfloat();
+        }
+
+        private void ProcessXR_referenceFrame()
+        {
+            vd.m_referenceFrame = XRquat();
+        }
+    }
+}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 6808017..a9e1fc2 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -101,12 +101,12 @@ namespace OpenSim.Region.Framework.Scenes
                 engine.StartProcessing();
         }
 
-        public void AddUploadedInventoryItem(UUID agentID, InventoryItemBase item)
+        public void AddUploadedInventoryItem(UUID agentID, InventoryItemBase item, uint cost)
         {
             IMoneyModule money = RequestModuleInterface<IMoneyModule>();
             if (money != null)
             {
-                money.ApplyUploadCharge(agentID, money.UploadCharge, "Asset upload");
+                money.ApplyUploadCharge(agentID, (int)cost, "Asset upload");
             }
 
             AddInventoryItem(item);
@@ -169,7 +169,7 @@ namespace OpenSim.Region.Framework.Scenes
                     return false;
                 }
             }
-            
+
             if (InventoryService.AddItem(item))
             {
                 int userlevel = 0;
@@ -324,8 +324,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             // Update item with new asset
             item.AssetID = asset.FullID;
-            if (group.UpdateInventoryItem(item))
-                remoteClient.SendAgentAlertMessage("Script saved", false);
+            group.UpdateInventoryItem(item);
             
             part.SendPropertiesToClient(remoteClient);
 
@@ -336,12 +335,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 // Needs to determine which engine was running it and use that
                 //
-                part.Inventory.CreateScriptInstance(item.ItemID, 0, false, DefaultScriptEngine, 0);
-                errors = part.Inventory.GetScriptErrors(item.ItemID);
-            }
-            else
-            {
-                remoteClient.SendAgentAlertMessage("Script saved", false);
+                errors = part.Inventory.CreateScriptInstanceEr(item.ItemID, 0, false, DefaultScriptEngine, 1);
             }
 
             // Tell anyone managing scripts that a script has been reloaded/changed
@@ -407,6 +401,7 @@ namespace OpenSim.Region.Framework.Scenes
                 if (item.Owner != remoteClient.AgentId)
                     return;
 
+                item.Flags = (item.Flags & ~(uint)255) | (itemUpd.Flags & (uint)255);
                 item.Name = itemUpd.Name;
                 item.Description = itemUpd.Description;
 
@@ -794,6 +789,8 @@ namespace OpenSim.Region.Framework.Scenes
                     return;
             }
 
+            if (newName == null) newName = item.Name;
+
             AssetBase asset = AssetService.Get(item.AssetID.ToString());
 
             if (asset != null)
@@ -854,6 +851,24 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
+        /// Move an item within the agent's inventory, and leave a copy (used in making a new outfit)
+        /// </summary>
+        public void MoveInventoryItemsLeaveCopy(IClientAPI remoteClient, List<InventoryItemBase> items, UUID destfolder)
+        {
+            List<InventoryItemBase> moveitems = new List<InventoryItemBase>();
+            foreach (InventoryItemBase b in items)
+            {
+                CopyInventoryItem(remoteClient, 0, remoteClient.AgentId, b.ID, b.Folder, null);
+                InventoryItemBase n = InventoryService.GetItem(b);
+                n.Folder = destfolder;
+                moveitems.Add(n);
+                remoteClient.SendInventoryItemCreateUpdate(n, 0);
+            }
+            
+            MoveInventoryItem(remoteClient, moveitems);
+        }
+
+        /// <summary>
         /// Move an item within the agent's inventory.
         /// </summary>
         /// <param name="remoteClient"></param>
@@ -888,11 +903,22 @@ namespace OpenSim.Region.Framework.Scenes
         public void CreateNewInventoryItem(
             IClientAPI remoteClient, string creatorID, string creatorData, UUID folderID,
             string name, string description, uint flags, uint callbackID,
-            AssetBase asset, sbyte invType, uint nextOwnerMask, int creationDate)
+            AssetBase asset, sbyte invType, uint nextOwnerMask, int creationDate, UUID transationID)
         {
             CreateNewInventoryItem(
                 remoteClient, creatorID, creatorData, folderID, name, description, flags, callbackID, asset, invType,
-                (uint)PermissionMask.All, (uint)PermissionMask.All, 0, nextOwnerMask, 0, creationDate);
+                (uint)PermissionMask.All, (uint)PermissionMask.All, 0, nextOwnerMask, 0, creationDate, transationID);
+        }
+
+
+        private void CreateNewInventoryItem(
+            IClientAPI remoteClient, string creatorID, string creatorData, UUID folderID,
+            string name, string description, uint flags, uint callbackID, AssetBase asset, sbyte invType,
+            uint baseMask, uint currentMask, uint everyoneMask, uint nextOwnerMask, uint groupMask, int creationDate)
+        {
+            CreateNewInventoryItem(remoteClient, creatorID, creatorData, folderID,
+                name, description, flags, callbackID, asset, invType,
+                baseMask, currentMask, everyoneMask, nextOwnerMask, groupMask, creationDate, UUID.Zero);
         }
 
         /// <summary>
@@ -917,7 +943,7 @@ namespace OpenSim.Region.Framework.Scenes
         private void CreateNewInventoryItem(
             IClientAPI remoteClient, string creatorID, string creatorData, UUID folderID,
             string name, string description, uint flags, uint callbackID, AssetBase asset, sbyte invType,
-            uint baseMask, uint currentMask, uint everyoneMask, uint nextOwnerMask, uint groupMask, int creationDate)
+            uint baseMask, uint currentMask, uint everyoneMask, uint nextOwnerMask, uint groupMask, int creationDate,UUID transationID)
         {
             InventoryItemBase item = new InventoryItemBase();
             item.Owner = remoteClient.AgentId;
@@ -940,7 +966,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (AddInventoryItem(item))
             {
-                remoteClient.SendInventoryItemCreateUpdate(item, callbackID);
+                remoteClient.SendInventoryItemCreateUpdate(item, transationID, callbackID);
             }
             else
             {
@@ -1215,6 +1241,10 @@ namespace OpenSim.Region.Framework.Scenes
         {
             SceneObjectPart part = GetSceneObjectPart(primLocalId);
 
+            // Can't move a null item
+            if (itemId == UUID.Zero)
+                return;
+
             if (null == part)
             {
                 m_log.WarnFormat(
@@ -1319,21 +1349,28 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
             }
 
-            if (part.OwnerID != destPart.OwnerID)
+            // Can't transfer this
+            //
+            if (part.OwnerID != destPart.OwnerID && (srcTaskItem.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)
+                return;
+
+            bool overrideNoMod = false;
+            if ((part.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) != 0)
+                overrideNoMod = true;
+
+            if (part.OwnerID != destPart.OwnerID && (destPart.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) == 0)
             {
-                // Source must have transfer permissions
-                if ((srcTaskItem.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)
-                    return;
+                // object cannot copy items to an object owned by a different owner
+                // unless llAllowInventoryDrop has been called
 
-                // Object cannot copy items to an object owned by a different owner
-                // unless llAllowInventoryDrop has been called on the destination
-                if ((destPart.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) == 0)
-                    return;
+                return;
             }
 
             // must have both move and modify permission to put an item in an object
-            if ((part.OwnerMask & ((uint)PermissionMask.Move | (uint)PermissionMask.Modify)) == 0)
+            if (((part.OwnerMask & (uint)PermissionMask.Modify) == 0) && (!overrideNoMod))
+            {
                 return;
+            }
 
             TaskInventoryItem destTaskItem = new TaskInventoryItem();
 
@@ -1389,6 +1426,14 @@ namespace OpenSim.Region.Framework.Scenes
 
         public UUID MoveTaskInventoryItems(UUID destID, string category, SceneObjectPart host, List<UUID> items)
         {
+            SceneObjectPart destPart = GetSceneObjectPart(destID);
+            if (destPart != null) // Move into a prim
+            {
+                foreach(UUID itemID in items)
+                    MoveTaskInventoryItem(destID, host, itemID);
+                return destID; // Prim folder ID == prim ID
+            }
+
             InventoryFolderBase rootFolder = InventoryService.GetRootFolder(destID);
 
             UUID newFolderID = UUID.Random();
@@ -1571,12 +1616,12 @@ namespace OpenSim.Region.Framework.Scenes
                         AgentTransactionsModule.HandleTaskItemUpdateFromTransaction(
                             remoteClient, part, transactionID, currentItem);
 
-                        if ((InventoryType)itemInfo.InvType == InventoryType.Notecard)
-                            remoteClient.SendAgentAlertMessage("Notecard saved", false);
-                        else if ((InventoryType)itemInfo.InvType == InventoryType.LSL)
-                            remoteClient.SendAgentAlertMessage("Script saved", false);
-                        else
-                            remoteClient.SendAgentAlertMessage("Item saved", false);
+//                        if ((InventoryType)itemInfo.InvType == InventoryType.Notecard)
+//                            remoteClient.SendAgentAlertMessage("Notecard saved", false);
+//                        else if ((InventoryType)itemInfo.InvType == InventoryType.LSL)
+//                            remoteClient.SendAgentAlertMessage("Script saved", false);
+//                        else
+//                            remoteClient.SendAgentAlertMessage("Item saved", false);
                     }
 
                     // Base ALWAYS has move
@@ -1946,23 +1991,32 @@ namespace OpenSim.Region.Framework.Scenes
             // build a list of eligible objects
             List<uint> deleteIDs = new List<uint>();
             List<SceneObjectGroup> deleteGroups = new List<SceneObjectGroup>();
-
-            // Start with true for both, then remove the flags if objects
-            // that we can't derez are part of the selection
-            bool permissionToTake = true;
-            bool permissionToTakeCopy = true;
-            bool permissionToDelete = true;
+            List<SceneObjectGroup> takeGroups = new List<SceneObjectGroup>();
 
             foreach (uint localID in localIDs)
             {
+                // Start with true for both, then remove the flags if objects
+                // that we can't derez are part of the selection
+                bool permissionToTake = true;
+                bool permissionToTakeCopy = true;
+                bool permissionToDelete = true;
+
                 // Invalid id
                 SceneObjectPart part = GetSceneObjectPart(localID);
                 if (part == null)
+                {
+                    //Client still thinks the object exists, kill it
+                    deleteIDs.Add(localID);
                     continue;
+                }
 
                 // Already deleted by someone else
                 if (part.ParentGroup.IsDeleted)
+                {
+                    //Client still thinks the object exists, kill it
+                    deleteIDs.Add(localID);
                     continue;
+                }
 
                 // Can't delete child prims
                 if (part != part.ParentGroup.RootPart)
@@ -1970,8 +2024,8 @@ namespace OpenSim.Region.Framework.Scenes
 
                 SceneObjectGroup grp = part.ParentGroup;
 
-                deleteIDs.Add(localID);
-                deleteGroups.Add(grp);
+                // If child prims have invalid perms, fix them
+                grp.AdjustChildPrimPermissions();
 
                 // If child prims have invalid perms, fix them
                 grp.AdjustChildPrimPermissions();
@@ -1992,81 +2046,193 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 else
                 {
-                    if (!Permissions.CanTakeCopyObject(grp.UUID, remoteClient.AgentId))
+                    if (action == DeRezAction.TakeCopy)
+                    {
+                        if (!Permissions.CanTakeCopyObject(grp.UUID, remoteClient.AgentId))
+                            permissionToTakeCopy = false;
+                    }
+                    else
+                    {
                         permissionToTakeCopy = false;
-                    
+                    }
                     if (!Permissions.CanTakeObject(grp.UUID, remoteClient.AgentId))
                         permissionToTake = false;
                     
                     if (!Permissions.CanDeleteObject(grp.UUID, remoteClient.AgentId))
                         permissionToDelete = false;
                 }
-            }
 
-            // Handle god perms
-            if ((remoteClient != null) && Permissions.IsGod(remoteClient.AgentId))
-            {
-                permissionToTake = true;
-                permissionToTakeCopy = true;
-                permissionToDelete = true;
-            }
+                // Handle god perms
+                if ((remoteClient != null) && Permissions.IsGod(remoteClient.AgentId))
+                {
+                    permissionToTake = true;
+                    permissionToTakeCopy = true;
+                    permissionToDelete = true;
+                }
 
-            // If we're re-saving, we don't even want to delete
-            if (action == DeRezAction.SaveToExistingUserInventoryItem)
-                permissionToDelete = false;
+                // If we're re-saving, we don't even want to delete
+                if (action == DeRezAction.SaveToExistingUserInventoryItem)
+                    permissionToDelete = false;
 
-            // if we want to take a copy, we also don't want to delete
-            // Note: after this point, the permissionToTakeCopy flag
-            // becomes irrelevant. It already includes the permissionToTake
-            // permission and after excluding no copy items here, we can
-            // just use that.
-            if (action == DeRezAction.TakeCopy)
-            {
-                // If we don't have permission, stop right here
-                if (!permissionToTakeCopy)
-                    return;
+                // if we want to take a copy, we also don't want to delete
+                // Note: after this point, the permissionToTakeCopy flag
+                // becomes irrelevant. It already includes the permissionToTake
+                // permission and after excluding no copy items here, we can
+                // just use that.
+                if (action == DeRezAction.TakeCopy)
+                {
+                    // If we don't have permission, stop right here
+                    if (!permissionToTakeCopy)
+                        return;
 
-                permissionToTake = true;
-                // Don't delete
-                permissionToDelete = false;
-            }
+                    permissionToTake = true;
+                    // Don't delete
+                    permissionToDelete = false;
+                }
 
-            if (action == DeRezAction.Return)
-            {
-                if (remoteClient != null)
+                if (action == DeRezAction.Return)
                 {
-                    if (Permissions.CanReturnObjects(
-                                    null,
-                                    remoteClient.AgentId,
-                                    deleteGroups))
+                    if (remoteClient != null)
                     {
-                        permissionToTake = true;
-                        permissionToDelete = true;
-
-                        foreach (SceneObjectGroup g in deleteGroups)
+                        if (Permissions.CanReturnObjects(
+                                        null,
+                                        remoteClient.AgentId,
+                                        new List<SceneObjectGroup>() {grp}))
                         {
-                            AddReturn(g.OwnerID == g.GroupID ? g.LastOwnerID : g.OwnerID, g.Name, g.AbsolutePosition, "parcel owner return");
+                            permissionToTake = true;
+                            permissionToDelete = true;
+
+                            AddReturn(grp.OwnerID == grp.GroupID ? grp.LastOwnerID : grp.OwnerID, grp.Name, grp.AbsolutePosition, "parcel owner return");
                         }
                     }
+                    else // Auto return passes through here with null agent
+                    {
+                        permissionToTake = true;
+                        permissionToDelete = true;
+                    }
                 }
-                else // Auto return passes through here with null agent
+
+                if (permissionToTake && (!permissionToDelete))
+                    takeGroups.Add(grp);
+
+                if (permissionToDelete)
                 {
-                    permissionToTake = true;
-                    permissionToDelete = true;
+                    if (permissionToTake)
+                        deleteGroups.Add(grp);
+                    deleteIDs.Add(grp.LocalId);
                 }
             }
 
-            if (permissionToTake && (action != DeRezAction.Delete || this.m_useTrashOnDelete))
+            SendKillObject(deleteIDs);
+
+            if (deleteGroups.Count > 0)
             {
+                foreach (SceneObjectGroup g in deleteGroups)
+                    deleteIDs.Remove(g.LocalId);
+
                 m_asyncSceneObjectDeleter.DeleteToInventory(
                         action, destinationID, deleteGroups, remoteClient,
-                        permissionToDelete);
+                        true);
+            }
+            if (takeGroups.Count > 0)
+            {
+                m_asyncSceneObjectDeleter.DeleteToInventory(
+                        action, destinationID, takeGroups, remoteClient,
+                        false);
             }
-            else if (permissionToDelete)
+            if (deleteIDs.Count > 0)
             {
                 foreach (SceneObjectGroup g in deleteGroups)
-                    DeleteSceneObject(g, false);
+                    DeleteSceneObject(g, true);
+            }
+        }
+
+        public UUID attachObjectAssetStore(IClientAPI remoteClient, SceneObjectGroup grp, UUID AgentId, out UUID itemID)
+        {
+            itemID = UUID.Zero;
+            if (grp != null)
+            {
+                Vector3 inventoryStoredPosition = new Vector3
+                       (((grp.AbsolutePosition.X > (int)Constants.RegionSize)
+                             ? 250
+                             : grp.AbsolutePosition.X)
+                        ,
+                        (grp.AbsolutePosition.X > (int)Constants.RegionSize)
+                            ? 250
+                            : grp.AbsolutePosition.X,
+                        grp.AbsolutePosition.Z);
+
+                Vector3 originalPosition = grp.AbsolutePosition;
+
+                grp.AbsolutePosition = inventoryStoredPosition;
+
+                string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp);
+
+                grp.AbsolutePosition = originalPosition;
+
+                AssetBase asset = CreateAsset(
+                    grp.GetPartName(grp.LocalId),
+                    grp.GetPartDescription(grp.LocalId),
+                    (sbyte)AssetType.Object,
+                    Utils.StringToBytes(sceneObjectXml),
+                    remoteClient.AgentId);
+                AssetService.Store(asset);
+
+                InventoryItemBase item = new InventoryItemBase();
+                item.CreatorId = grp.RootPart.CreatorID.ToString();
+                item.CreatorData = grp.RootPart.CreatorData;
+                item.Owner = remoteClient.AgentId;
+                item.ID = UUID.Random();
+                item.AssetID = asset.FullID;
+                item.Description = asset.Description;
+                item.Name = asset.Name;
+                item.AssetType = asset.Type;
+                item.InvType = (int)InventoryType.Object;
+
+                InventoryFolderBase folder = InventoryService.GetFolderForType(remoteClient.AgentId, AssetType.Object);
+                if (folder != null)
+                    item.Folder = folder.ID;
+                else // oopsies
+                    item.Folder = UUID.Zero;
+
+                // Set up base perms properly
+                uint permsBase = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify);
+                permsBase &= grp.RootPart.BaseMask;
+                permsBase |= (uint)PermissionMask.Move;
+
+                // Make sure we don't lock it
+                grp.RootPart.NextOwnerMask |= (uint)PermissionMask.Move;
+
+                if ((remoteClient.AgentId != grp.RootPart.OwnerID) && Permissions.PropagatePermissions())
+                {
+                    item.BasePermissions = permsBase & grp.RootPart.NextOwnerMask;
+                    item.CurrentPermissions = permsBase & grp.RootPart.NextOwnerMask;
+                    item.NextPermissions = permsBase & grp.RootPart.NextOwnerMask;
+                    item.EveryOnePermissions = permsBase & grp.RootPart.EveryoneMask & grp.RootPart.NextOwnerMask;
+                    item.GroupPermissions = permsBase & grp.RootPart.GroupMask & grp.RootPart.NextOwnerMask;
+                }
+                else
+                {
+                    item.BasePermissions = permsBase;
+                    item.CurrentPermissions = permsBase & grp.RootPart.OwnerMask;
+                    item.NextPermissions = permsBase & grp.RootPart.NextOwnerMask;
+                    item.EveryOnePermissions = permsBase & grp.RootPart.EveryoneMask;
+                    item.GroupPermissions = permsBase & grp.RootPart.GroupMask;
+                }
+                item.CreationDate = Util.UnixTimeSinceEpoch();
+
+                // sets itemID so client can show item as 'attached' in inventory
+                grp.FromItemID = item.ID;
+
+                if (AddInventoryItem(item))
+                    remoteClient.SendInventoryItemCreateUpdate(item, 0);
+                else
+                    m_dialogModule.SendAlertToUser(remoteClient, "Operation failed");
+
+                itemID = item.ID;
+                return item.AssetID;
             }
+            return UUID.Zero;
         }
 
         /// <summary>
@@ -2196,6 +2362,9 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void SetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID, bool running)
         {
+            if (!Permissions.CanEditScript(itemID, objectID, controllingClient.AgentId))
+                return;
+
             SceneObjectPart part = GetSceneObjectPart(objectID);
             if (part == null)
                 return;
@@ -2252,7 +2421,10 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 else
                 {
-                    if (!Permissions.CanEditObject(sog.UUID, remoteClient.AgentId))
+                    if (!Permissions.IsGod(remoteClient.AgentId) && sog.OwnerID != remoteClient.AgentId)
+                        continue;
+
+                    if (!Permissions.CanTransferObject(sog.UUID, groupID))
                         continue;
 
                     if (sog.GroupID != groupID)
@@ -2364,6 +2536,12 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             m_sceneGraph.LinkObjects(root, children);
+
+            ScenePresence sp;
+            if (TryGetScenePresence(agentId, out sp))
+            {
+                root.SendPropertiesToClient(sp.ControllingClient);
+            }
         }
 
         private string PermissionString(uint permissions)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index df43271..ce6415a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name='targetID'></param>
         /// <param name='fromAgent'></param>
         /// <param name='broadcast'></param>
-        protected void SimChat(byte[] message, ChatTypeEnum type, int channel, Vector3 fromPos, string fromName,
+        public void SimChat(byte[] message, ChatTypeEnum type, int channel, Vector3 fromPos, string fromName,
                                UUID fromID, UUID targetID, bool fromAgent, bool broadcast)
         {
             OSChatMessage args = new OSChatMessage();
@@ -61,6 +61,7 @@ namespace OpenSim.Region.Framework.Scenes
             args.Position = fromPos;
             args.SenderUUID = fromID;
             args.Scene = this;
+            args.Destination = targetID;
 
             if (fromAgent)
             {
@@ -75,7 +76,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             args.From = fromName;
-            args.TargetUUID = targetID;
+            //args.
 
 //            m_log.DebugFormat(
 //                "[SCENE]: Sending message {0} on channel {1}, type {2} from {3}, broadcast {4}",
@@ -86,7 +87,7 @@ namespace OpenSim.Region.Framework.Scenes
             else
                 EventManager.TriggerOnChatFromWorld(this, args);
         }
-
+        
         protected void SimChat(byte[] message, ChatTypeEnum type, int channel, Vector3 fromPos, string fromName,
                                UUID fromID, bool fromAgent, bool broadcast)
         {
@@ -130,19 +131,6 @@ namespace OpenSim.Region.Framework.Scenes
         {
             SimChat(message, type, channel, fromPos, fromName, fromID, fromAgent, true);
         }
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="type"></param>
-        /// <param name="fromPos"></param>
-        /// <param name="fromName"></param>
-        /// <param name="fromAgentID"></param>
-        /// <param name="targetID"></param>
-        public void SimChatToAgent(UUID targetID, byte[] message, Vector3 fromPos, string fromName, UUID fromID, bool fromAgent)
-        {
-            SimChat(message, ChatTypeEnum.Say, 0, fromPos, fromName, fromID, targetID, fromAgent, false);
-        }
 
         /// <summary>
         /// Invoked when the client requests a prim.
@@ -164,27 +152,47 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="remoteClient"></param>
         public void SelectPrim(uint primLocalID, IClientAPI remoteClient)
         {
+            /*
+                        SceneObjectPart part = GetSceneObjectPart(primLocalID);
+
+                        if (null == part)
+                            return;
+
+                        if (part.IsRoot)
+                        {
+                            SceneObjectGroup sog = part.ParentGroup;
+                            sog.SendPropertiesToClient(remoteClient);
+
+                            // A prim is only tainted if it's allowed to be edited by the person clicking it.
+                            if (Permissions.CanEditObject(sog.UUID, remoteClient.AgentId)
+                                || Permissions.CanMoveObject(sog.UUID, remoteClient.AgentId))
+                            {
+                                sog.IsSelected = true;
+                                EventManager.TriggerParcelPrimCountTainted();
+                            }
+                        }
+                        else
+                        {
+                             part.SendPropertiesToClient(remoteClient);
+                        }
+             */
             SceneObjectPart part = GetSceneObjectPart(primLocalID);
 
             if (null == part)
                 return;
 
-            if (part.IsRoot)
-            {
-                SceneObjectGroup sog = part.ParentGroup;
-                sog.SendPropertiesToClient(remoteClient);
-                sog.IsSelected = true;
+            SceneObjectGroup sog = part.ParentGroup;
+            if (sog == null)
+                return;
 
-                // A prim is only tainted if it's allowed to be edited by the person clicking it.
-                if (Permissions.CanEditObject(sog.UUID, remoteClient.AgentId)
-                    || Permissions.CanMoveObject(sog.UUID, remoteClient.AgentId))
-                {
-                    EventManager.TriggerParcelPrimCountTainted();
-                }
-            }
-            else
+            part.SendPropertiesToClient(remoteClient);
+
+            // A prim is only tainted if it's allowed to be edited by the person clicking it.
+            if (Permissions.CanEditObject(sog.UUID, remoteClient.AgentId)
+                || Permissions.CanMoveObject(sog.UUID, remoteClient.AgentId))
             {
-                 part.SendPropertiesToClient(remoteClient);
+                part.IsSelected = true;
+                EventManager.TriggerParcelPrimCountTainted();
             }
         }
 
@@ -237,7 +245,7 @@ namespace OpenSim.Region.Framework.Scenes
             SceneObjectPart part = GetSceneObjectPart(primLocalID);
             if (part == null)
                 return;
-            
+ /*           
             // A deselect packet contains all the local prims being deselected.  However, since selection is still
             // group based we only want the root prim to trigger a full update - otherwise on objects with many prims
             // we end up sending many duplicate ObjectUpdates
@@ -250,7 +258,9 @@ namespace OpenSim.Region.Framework.Scenes
             // handled by group, but by prim. Legacy cruft.
             // TODO: Make selection flagging per prim!
             //
-            part.ParentGroup.IsSelected = false;
+            if (Permissions.CanEditObject(part.ParentGroup.UUID, remoteClient.AgentId)
+                || Permissions.CanMoveObject(part.ParentGroup.UUID, remoteClient.AgentId))
+                part.ParentGroup.IsSelected = false;
             
             if (part.ParentGroup.IsAttachment)
                 isAttachment = true;
@@ -270,6 +280,22 @@ namespace OpenSim.Region.Framework.Scenes
                         part.UUID, remoteClient.AgentId))
                     EventManager.TriggerParcelPrimCountTainted();
             }
+  */
+
+            bool oldgprSelect = part.ParentGroup.IsSelected;
+
+            // This is wrong, wrong, wrong. Selection should not be
+            // handled by group, but by prim. Legacy cruft.
+            // TODO: Make selection flagging per prim!
+            //
+            if (Permissions.CanEditObject(part.ParentGroup.UUID, remoteClient.AgentId)
+                || Permissions.CanMoveObject(part.ParentGroup.UUID, remoteClient.AgentId))
+            {
+                part.IsSelected = false;
+                if (!part.ParentGroup.IsAttachment && oldgprSelect != part.ParentGroup.IsSelected)
+                    EventManager.TriggerParcelPrimCountTainted();
+            }
+
         }
 
         public virtual void ProcessMoneyTransferRequest(UUID source, UUID destination, int amount, 
@@ -412,6 +438,20 @@ namespace OpenSim.Region.Framework.Scenes
             );
         }
         
+        private class DescendentsRequestData
+        {
+            public IClientAPI RemoteClient;
+            public UUID FolderID;
+            public UUID OwnerID;
+            public bool FetchFolders;
+            public bool FetchItems;
+            public int SortOrder;
+        }
+
+        private Queue<DescendentsRequestData> m_descendentsRequestQueue = new Queue<DescendentsRequestData>();
+        private Object m_descendentsRequestLock = new Object();
+        private bool m_descendentsRequestProcessing = false;
+
         /// <summary>
         /// Tell the client about the various child items and folders contained in the requested folder.
         /// </summary>
@@ -448,17 +488,38 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
-            // We're going to send the reply async, because there may be
-            // an enormous quantity of packets -- basically the entire inventory!
-            // We don't want to block the client thread while all that is happening.
-            SendInventoryDelegate d = SendInventoryAsync;
-            d.BeginInvoke(remoteClient, folderID, ownerID, fetchFolders, fetchItems, sortOrder, SendInventoryComplete, d);
+            lock (m_descendentsRequestLock)
+            {
+                if (!m_descendentsRequestProcessing)
+                {
+                    m_descendentsRequestProcessing = true;
+
+                    // We're going to send the reply async, because there may be
+                    // an enormous quantity of packets -- basically the entire inventory!
+                    // We don't want to block the client thread while all that is happening.
+                    SendInventoryDelegate d = SendInventoryAsync;
+                    d.BeginInvoke(remoteClient, folderID, ownerID, fetchFolders, fetchItems, sortOrder, SendInventoryComplete, d);
+
+                    return;
+                }
+
+                DescendentsRequestData req = new DescendentsRequestData();
+                req.RemoteClient = remoteClient;
+                req.FolderID = folderID;
+                req.OwnerID = ownerID;
+                req.FetchFolders = fetchFolders;
+                req.FetchItems = fetchItems;
+                req.SortOrder = sortOrder;
+
+                m_descendentsRequestQueue.Enqueue(req);
+            }
         }
 
         delegate void SendInventoryDelegate(IClientAPI remoteClient, UUID folderID, UUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder);
 
         void SendInventoryAsync(IClientAPI remoteClient, UUID folderID, UUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder)
         {
+            Thread.Sleep(20);
             SendInventoryUpdate(remoteClient, new InventoryFolderBase(folderID), fetchFolders, fetchItems);
         }
 
@@ -466,6 +527,21 @@ namespace OpenSim.Region.Framework.Scenes
         {
             SendInventoryDelegate d = (SendInventoryDelegate)iar.AsyncState;
             d.EndInvoke(iar);
+
+            lock (m_descendentsRequestLock)
+            {
+                if (m_descendentsRequestQueue.Count > 0)
+                {
+                    DescendentsRequestData req = m_descendentsRequestQueue.Dequeue();
+
+                    d = SendInventoryAsync;
+                    d.BeginInvoke(req.RemoteClient, req.FolderID, req.OwnerID, req.FetchFolders, req.FetchItems, req.SortOrder, SendInventoryComplete, d);
+
+                    return;
+                }
+
+                m_descendentsRequestProcessing = false;
+            }
         }
         
         /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 9b17b7f..1a1c3d2 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -226,8 +226,8 @@ namespace OpenSim.Region.Framework.Scenes
         // TODO: need to figure out how allow client agents but deny
         // root agents when ACL denies access to root agent
         public bool m_strictAccessControl = true;
-
-        public int MaxUndoCount { get; set; }
+        public bool m_seeIntoBannedRegion = false;
+        public int MaxUndoCount = 5;
 
         // Using this for RegionReady module to prevent LoginsDisabled from changing under our feet;
         public bool LoginLock = false;
@@ -243,11 +243,13 @@ namespace OpenSim.Region.Framework.Scenes
 
         protected int m_splitRegionID;
         protected Timer m_restartWaitTimer = new Timer();
+        protected Timer m_timerWatchdog = new Timer();
         protected List<RegionInfo> m_regionRestartNotifyList = new List<RegionInfo>();
         protected List<RegionInfo> m_neighbours = new List<RegionInfo>();
         protected string m_simulatorVersion = "OpenSimulator Server";
         protected AgentCircuitManager m_authenticateHandler;
         protected SceneCommunicationService m_sceneGridService;
+        protected ISnmpModule m_snmpService = null;
 
         protected ISimulationDataService m_SimulationDataService;
         protected IEstateDataService m_EstateDataService;
@@ -310,8 +312,8 @@ namespace OpenSim.Region.Framework.Scenes
         private int m_update_presences = 1; // Update scene presence movements
         private int m_update_events = 1;
         private int m_update_backup = 200;
-        private int m_update_terrain = 50;
-//        private int m_update_land = 1;
+        private int m_update_terrain = 1000;
+        private int m_update_land = 10;
         private int m_update_coarse_locations = 50;
 
         private int agentMS;
@@ -324,13 +326,13 @@ namespace OpenSim.Region.Framework.Scenes
         private int backupMS;
         private int terrainMS;
         private int landMS;
-        private int spareMS;
 
         /// <summary>
         /// Tick at which the last frame was processed.
         /// </summary>
         private int m_lastFrameTick;
 
+        public bool CombineRegions = false;
         /// <summary>
         /// Tick at which the last maintenance run occurred.
         /// </summary>
@@ -350,7 +352,7 @@ namespace OpenSim.Region.Framework.Scenes
         private readonly Timer m_restartTimer = new Timer(15000); // Wait before firing
         private volatile bool m_backingup;
         private Dictionary<UUID, ReturnInfo> m_returns = new Dictionary<UUID, ReturnInfo>();
-        private Dictionary<UUID, SceneObjectGroup> m_groupsWithTargets = new Dictionary<UUID, SceneObjectGroup>();
+        private Dictionary<UUID, int> m_groupsWithTargets = new Dictionary<UUID, int>();
 
         private string m_defaultScriptEngine;
 
@@ -359,6 +361,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         private int m_LastLogin;
 
+        private int m_lastIncoming;
+        private int m_lastOutgoing;
+        private int m_hbRestarts = 0;
+
+
         /// <summary>
         /// Thread that runs the scene loop.
         /// </summary>
@@ -399,7 +406,7 @@ namespace OpenSim.Region.Framework.Scenes
         private volatile bool m_active;
 
 //        private int m_lastUpdate;
-//        private bool m_firstHeartbeat = true;
+        private bool m_firstHeartbeat = true;
         
         private UpdatePrioritizationSchemes m_priorityScheme = UpdatePrioritizationSchemes.Time;
         private bool m_reprioritizationEnabled = true;
@@ -443,6 +450,19 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_sceneGridService; }
         }
 
+        public ISnmpModule SnmpService
+        {
+            get
+            {
+                if (m_snmpService == null)
+                {
+                    m_snmpService = RequestModuleInterface<ISnmpModule>();
+                }
+
+                return m_snmpService;
+            }
+        }
+
         public ISimulationDataService SimulationDataService
         {
             get
@@ -735,6 +755,8 @@ namespace OpenSim.Region.Framework.Scenes
             m_SimulationDataService = simDataService;
             m_EstateDataService = estateDataService;
             m_regionHandle = RegionInfo.RegionHandle;
+            m_lastIncoming = 0;
+            m_lastOutgoing = 0;
 
             m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this);
             m_asyncSceneObjectDeleter.Enabled = true;
@@ -828,7 +850,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 StartDisabled = startupConfig.GetBoolean("StartDisabled", false);
 
-                m_defaultDrawDistance = startupConfig.GetFloat("DefaultDrawDistance", m_defaultDrawDistance);
+                m_defaultDrawDistance = startupConfig.GetFloat("DefaultDrawDistance",m_defaultDrawDistance);
                 UseBackup = startupConfig.GetBoolean("UseSceneBackup", UseBackup);
                 if (!UseBackup)
                     m_log.InfoFormat("[SCENE]: Backup has been disabled for {0}", RegionInfo.RegionName);
@@ -836,10 +858,8 @@ namespace OpenSim.Region.Framework.Scenes
                 //Animation states
                 m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false);
 
-                MaxUndoCount = startupConfig.GetInt("MaxPrimUndos", 20);
-
-                PhysicalPrims = startupConfig.GetBoolean("physical_prim", PhysicalPrims);
-                CollidablePrims = startupConfig.GetBoolean("collidable_prim", CollidablePrims);
+                PhysicalPrims = startupConfig.GetBoolean("physical_prim", true);
+                CollidablePrims = startupConfig.GetBoolean("collidable_prim", true);
 
                 m_minNonphys = startupConfig.GetFloat("NonPhysicalPrimMin", m_minNonphys);
                 if (RegionInfo.NonphysPrimMin > 0)
@@ -860,11 +880,21 @@ namespace OpenSim.Region.Framework.Scenes
                 }
 
                 m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", m_maxPhys);
+
                 if (RegionInfo.PhysPrimMax > 0)
                 {
                     m_maxPhys = RegionInfo.PhysPrimMax;
                 }
 
+                m_linksetCapacity = startupConfig.GetInt("LinksetPrims", m_linksetCapacity);
+                if (RegionInfo.LinksetCapacity > 0)
+                {
+                    m_linksetCapacity = RegionInfo.LinksetCapacity;
+                }
+
+                SpawnPointRouting = startupConfig.GetString("SpawnPointRouting", "closest");
+                TelehubAllowLandmarks = startupConfig.GetBoolean("TelehubAllowLandmark", false);
+
                 // Here, if clamping is requested in either global or
                 // local config, it will be used
                 //
@@ -874,13 +904,7 @@ namespace OpenSim.Region.Framework.Scenes
                     m_clampPrimSize = true;
                 }
 
-                m_linksetCapacity = startupConfig.GetInt("LinksetPrims", m_linksetCapacity);
-                if (RegionInfo.LinksetCapacity > 0)
-                {
-                    m_linksetCapacity = RegionInfo.LinksetCapacity;
-                }
-
-                m_useTrashOnDelete = startupConfig.GetBoolean("UseTrashOnDelete", m_useTrashOnDelete);
+                m_useTrashOnDelete = startupConfig.GetBoolean("UseTrashOnDelete",m_useTrashOnDelete);
                 m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries);
                 m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings);
                 m_dontPersistBefore =
@@ -891,11 +915,11 @@ namespace OpenSim.Region.Framework.Scenes
                 m_persistAfter *= 10000000;
 
                 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine");
-
-                SpawnPointRouting = startupConfig.GetString("SpawnPointRouting", "closest");
-                TelehubAllowLandmarks = startupConfig.GetBoolean("TelehubAllowLandmark", false);
+                m_log.InfoFormat("[SCENE]: Default script engine {0}", m_defaultScriptEngine);
 
                 m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl);
+                m_seeIntoBannedRegion = startupConfig.GetBoolean("SeeIntoBannedRegion", m_seeIntoBannedRegion);
+                CombineRegions = startupConfig.GetBoolean("CombineContiguousRegions", false);
 
                 m_generateMaptiles = startupConfig.GetBoolean("GenerateMaptiles", true);
                 if (m_generateMaptiles)
@@ -928,7 +952,7 @@ namespace OpenSim.Region.Framework.Scenes
                 string grant = startupConfig.GetString("AllowedClients", String.Empty);
                 if (grant.Length > 0)
                 {
-                    foreach (string viewer in grant.Split('|'))
+                    foreach (string viewer in grant.Split(','))
                     {
                         m_AllowedViewers.Add(viewer.Trim().ToLower());
                     }
@@ -937,7 +961,7 @@ namespace OpenSim.Region.Framework.Scenes
                 grant = startupConfig.GetString("BannedClients", String.Empty);
                 if (grant.Length > 0)
                 {
-                    foreach (string viewer in grant.Split('|'))
+                    foreach (string viewer in grant.Split(','))
                     {
                         m_BannedViewers.Add(viewer.Trim().ToLower());
                     }
@@ -997,6 +1021,8 @@ namespace OpenSim.Region.Framework.Scenes
             StatsReporter = new SimStatsReporter(this);
             StatsReporter.OnSendStatsResult += SendSimStatsPackets;
             StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats;
+
+            MainConsole.Instance.Commands.AddCommand("scene", false, "gc collect", "gc collect", "gc collect", "Cause the garbage collector to make a single pass", HandleGcCollect);
         }
 
         public Scene(RegionInfo regInfo) : base(regInfo)
@@ -1292,8 +1318,11 @@ namespace OpenSim.Region.Framework.Scenes
             // Stop all client threads.
             ForEachScenePresence(delegate(ScenePresence avatar) { avatar.ControllingClient.Close(); });
 
-            m_log.Debug("[SCENE]: Persisting changed objects");
+            m_log.Debug("[SCENE]: TriggerSceneShuttingDown");
             EventManager.TriggerSceneShuttingDown(this);
+
+            m_log.Debug("[SCENE]: Persisting changed objects");
+
             Backup(false);
             m_sceneGraph.Close();
 
@@ -1307,6 +1336,7 @@ namespace OpenSim.Region.Framework.Scenes
             // attempt to reference a null or disposed physics scene.
             if (PhysicsScene != null)
             {
+                m_log.Debug("[SCENE]: Dispose Physics");
                 PhysicsScene phys = PhysicsScene;
                 // remove the physics engine from both Scene and SceneGraph
                 PhysicsScene = null;
@@ -1329,11 +1359,29 @@ namespace OpenSim.Region.Framework.Scenes
             //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat);
             if (m_heartbeatThread != null)
             {
+                m_hbRestarts++;
+                if(m_hbRestarts > 10)
+                    Environment.Exit(1);
+                m_log.ErrorFormat("[SCENE]: Restarting heartbeat thread because it hasn't reported in in region {0}", RegionInfo.RegionName);
+
+//int pid = System.Diagnostics.Process.GetCurrentProcess().Id;
+//System.Diagnostics.Process proc = new System.Diagnostics.Process();
+//proc.EnableRaisingEvents=false; 
+//proc.StartInfo.FileName = "/bin/kill";
+//proc.StartInfo.Arguments = "-QUIT " + pid.ToString();
+//proc.Start();
+//proc.WaitForExit();
+//Thread.Sleep(1000);
+//Environment.Exit(1);
                 m_heartbeatThread.Abort();
+                Watchdog.AbortThread(m_heartbeatThread.ManagedThreadId);
                 m_heartbeatThread = null;
             }
 //            m_lastUpdate = Util.EnvironmentTickCount();
 
+//            m_sceneGraph.PreparePhysicsSimulation();
+
+
             m_heartbeatThread
                 = Watchdog.StartThread(
                     Heartbeat, string.Format("Heartbeat ({0})", RegionInfo.RegionName), ThreadPriority.Normal, false, false);
@@ -1476,16 +1524,20 @@ namespace OpenSim.Region.Framework.Scenes
                 endFrame = Frame + frames;
 
             float physicsFPS = 0f;
-            int previousFrameTick, tmpMS;
-            int maintc = Util.EnvironmentTickCount();
+            int tmpMS;
+            int previousFrameTick;
+            int maintc;
+            int sleepMS;
+            int framestart;
 
             while (!m_shuttingDown && ((endFrame == null && Active) || Frame < endFrame))
             {
+                framestart = Util.EnvironmentTickCount();
                 ++Frame;
 
 //            m_log.DebugFormat("[SCENE]: Processing frame {0} in {1}", Frame, RegionInfo.RegionName);
 
-                agentMS = tempOnRezMS = eventMS = backupMS = terrainMS = landMS = spareMS = 0;
+                agentMS = tempOnRezMS = eventMS = backupMS = terrainMS = landMS = 0;
 
                 try
                 {
@@ -1537,6 +1589,7 @@ namespace OpenSim.Region.Framework.Scenes
                         m_sceneGraph.UpdatePresences();
     
                     agentMS += Util.EnvironmentTickCountSubtract(tmpMS);
+
     
                     // Delete temp-on-rez stuff
                     if (Frame % m_update_temp_cleaning == 0 && !m_cleaningTemps)
@@ -1618,34 +1671,37 @@ namespace OpenSim.Region.Framework.Scenes
 
                 Watchdog.UpdateThread();
 
+                otherMS = tempOnRezMS + eventMS + backupMS + terrainMS + landMS;
+
+                StatsReporter.AddPhysicsFPS(physicsFPS);
+                StatsReporter.AddTimeDilation(TimeDilation);
+                StatsReporter.AddFPS(1);
+
+                StatsReporter.addAgentMS(agentMS);
+                StatsReporter.addPhysicsMS(physicsMS + physicsMS2);
+                StatsReporter.addOtherMS(otherMS);
+                StatsReporter.addScriptLines(m_sceneGraph.GetScriptLPS());
+
                 previousFrameTick = m_lastFrameTick;
                 m_lastFrameTick = Util.EnvironmentTickCount();
-                tmpMS = Util.EnvironmentTickCountSubtract(m_lastFrameTick, maintc);
+                tmpMS = Util.EnvironmentTickCountSubtract(m_lastFrameTick, framestart);
                 tmpMS = (int)(MinFrameTime * 1000) - tmpMS;
 
+                m_firstHeartbeat = false;
+
+                sleepMS = Util.EnvironmentTickCount();
+
                 if (tmpMS > 0)
-                {
                     Thread.Sleep(tmpMS);
-                    spareMS += tmpMS;
-                }
-
-                frameMS = Util.EnvironmentTickCountSubtract(maintc);
-                maintc = Util.EnvironmentTickCount();
 
-                otherMS = tempOnRezMS + eventMS + backupMS + terrainMS + landMS;
+                sleepMS = Util.EnvironmentTickCountSubtract(sleepMS);
+                frameMS = Util.EnvironmentTickCountSubtract(framestart);
+                StatsReporter.addSleepMS(sleepMS);
+                StatsReporter.addFrameMS(frameMS);
 
                 // if (Frame%m_update_avatars == 0)
                 //   UpdateInWorldTime();
-                StatsReporter.AddPhysicsFPS(physicsFPS);
-                StatsReporter.AddTimeDilation(TimeDilation);
-                StatsReporter.AddFPS(1);
 
-                StatsReporter.addFrameMS(frameMS);
-                StatsReporter.addAgentMS(agentMS);
-                StatsReporter.addPhysicsMS(physicsMS + physicsMS2);
-                StatsReporter.addOtherMS(otherMS);
-                StatsReporter.AddSpareMS(spareMS);
-                StatsReporter.addScriptLines(m_sceneGraph.GetScriptLPS());
 
                // Optionally warn if a frame takes double the amount of time that it should.
                 if (DebugUpdates
@@ -1662,7 +1718,7 @@ namespace OpenSim.Region.Framework.Scenes
         public void AddGroupTarget(SceneObjectGroup grp)
         {
             lock (m_groupsWithTargets)
-                m_groupsWithTargets[grp.UUID] = grp;
+                m_groupsWithTargets[grp.UUID] = 0;
         }
 
         public void RemoveGroupTarget(SceneObjectGroup grp)
@@ -1673,18 +1729,24 @@ namespace OpenSim.Region.Framework.Scenes
 
         private void CheckAtTargets()
         {
-            List<SceneObjectGroup> objs = null;
+            List<UUID> objs = null;
 
             lock (m_groupsWithTargets)
             {
                 if (m_groupsWithTargets.Count != 0)
-                    objs = new List<SceneObjectGroup>(m_groupsWithTargets.Values);
+                    objs = new List<UUID>(m_groupsWithTargets.Keys);
             }
 
             if (objs != null)
             {
-                foreach (SceneObjectGroup entry in objs)
-                    entry.checkAtTargets();
+                foreach (UUID entry in objs)
+                {
+                    SceneObjectGroup grp = GetSceneObjectGroup(entry);
+                    if (grp == null)
+                        m_groupsWithTargets.Remove(entry);
+                    else
+                        grp.checkAtTargets();
+                }
             }
         }
 
@@ -1763,7 +1825,7 @@ namespace OpenSim.Region.Framework.Scenes
                     msg.fromAgentName = "Server";
                     msg.dialog = (byte)19; // Object msg
                     msg.fromGroup = false;
-                    msg.offline = (byte)0;
+                    msg.offline = (byte)1;
                     msg.ParentEstateID = RegionInfo.EstateSettings.ParentEstateID;
                     msg.Position = Vector3.Zero;
                     msg.RegionID = RegionInfo.RegionID.Guid;
@@ -1992,7 +2054,7 @@ namespace OpenSim.Region.Framework.Scenes
             return PhysicsScene.SupportsRaycastWorldFiltered();
         }
 
-        public object RayCastFiltered(Vector3 position, Vector3 direction, float length, int Count, RayFilterFlags filter)
+        public object RayCastFiltered(Vector3 position, Vector3 direction, float length, int Count, RayFilterFlags filter)      
         {
             if (PhysicsScene == null)
                 return null;
@@ -2014,14 +2076,24 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns></returns>
         public Vector3 GetNewRezLocation(Vector3 RayStart, Vector3 RayEnd, UUID RayTargetID, Quaternion rot, byte bypassRayCast, byte RayEndIsIntersection, bool frontFacesOnly, Vector3 scale, bool FaceCenter)
         {
+        
+            float wheight = (float)RegionInfo.RegionSettings.WaterHeight;
+            Vector3 wpos = Vector3.Zero;
+            // Check for water surface intersection from above
+            if ( (RayStart.Z > wheight) && (RayEnd.Z < wheight) )
+            {
+                float ratio = (RayStart.Z - wheight) / (RayStart.Z - RayEnd.Z);
+                wpos.X = RayStart.X - (ratio * (RayStart.X - RayEnd.X));
+                wpos.Y = RayStart.Y - (ratio * (RayStart.Y - RayEnd.Y));
+                wpos.Z = wheight;
+            }                
+        
             Vector3 pos = Vector3.Zero;
             if (RayEndIsIntersection == (byte)1)
             {
                 pos = RayEnd;
-                return pos;
             }
-
-            if (RayTargetID != UUID.Zero)
+            else if (RayTargetID != UUID.Zero)
             {
                 SceneObjectPart target = GetSceneObjectPart(RayTargetID);
 
@@ -2043,7 +2115,7 @@ namespace OpenSim.Region.Framework.Scenes
                     EntityIntersection ei = target.TestIntersectionOBB(NewRay, Quaternion.Identity, frontFacesOnly, FaceCenter);
 
                     // Un-comment out the following line to Get Raytrace results printed to the console.
-                   // m_log.Info("[RAYTRACERESULTS]: Hit:" + ei.HitTF.ToString() + " Point: " + ei.ipoint.ToString() + " Normal: " + ei.normal.ToString());
+                    // m_log.Info("[RAYTRACERESULTS]: Hit:" + ei.HitTF.ToString() + " Point: " + ei.ipoint.ToString() + " Normal: " + ei.normal.ToString());
                     float ScaleOffset = 0.5f;
 
                     // If we hit something
@@ -2066,13 +2138,10 @@ namespace OpenSim.Region.Framework.Scenes
                         //pos.Z -= 0.25F; 
                        
                     }
-
-                    return pos;
                 }
                 else
                 {
                     // We don't have a target here, so we're going to raytrace all the objects in the scene.
-
                     EntityIntersection ei = m_sceneGraph.GetClosestIntersectingPrim(new Ray(AXOrigin, AXdirection), true, false);
 
                     // Un-comment the following line to print the raytrace results to the console.
@@ -2081,13 +2150,12 @@ namespace OpenSim.Region.Framework.Scenes
                     if (ei.HitTF)
                     {
                         pos = new Vector3(ei.ipoint.X, ei.ipoint.Y, ei.ipoint.Z);
-                    } else
+                    } 
+                    else
                     {
                         // fall back to our stupid functionality
                         pos = RayEnd;
                     }
-
-                    return pos;
                 }
             }
             else
@@ -2098,8 +2166,12 @@ namespace OpenSim.Region.Framework.Scenes
                 //increase height so its above the ground.
                 //should be getting the normal of the ground at the rez point and using that?
                 pos.Z += scale.Z / 2f;
-                return pos;
+//                return pos;
             }
+            
+            // check against posible water intercept
+            if (wpos.Z > pos.Z) pos = wpos;
+            return pos;
         }
 
 
@@ -2190,12 +2262,12 @@ namespace OpenSim.Region.Framework.Scenes
         {
             if (m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, sendClientUpdates))
             {
+                sceneObject.IsDeleted = false;
                 EventManager.TriggerObjectAddedToScene(sceneObject);
                 return true;
             }
 
             return false;
-
         }
         
         /// <summary>
@@ -2287,6 +2359,15 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void DeleteAllSceneObjects()
         {
+            DeleteAllSceneObjects(false);
+        }
+
+        /// <summary>
+        /// Delete every object from the scene.  This does not include attachments worn by avatars.
+        /// </summary>
+        public void DeleteAllSceneObjects(bool exceptNoCopy)
+        {
+            List<SceneObjectGroup> toReturn = new List<SceneObjectGroup>();
             lock (Entities)
             {
                 EntityBase[] entities = Entities.GetEntities();
@@ -2295,11 +2376,24 @@ namespace OpenSim.Region.Framework.Scenes
                     if (e is SceneObjectGroup)
                     {
                         SceneObjectGroup sog = (SceneObjectGroup)e;
-                        if (!sog.IsAttachment)
-                            DeleteSceneObject((SceneObjectGroup)e, false);
+                        if (sog != null && !sog.IsAttachment)
+                        {
+                            if (!exceptNoCopy || ((sog.GetEffectivePermissions() & (uint)PermissionMask.Copy) != 0))
+                            {
+                                DeleteSceneObject((SceneObjectGroup)e, false);
+                            }
+                            else
+                            {
+                                toReturn.Add((SceneObjectGroup)e);   
+                            }
+                        }
                     }
                 }
             }
+            if (toReturn.Count > 0)
+            {
+                returnObjects(toReturn.ToArray(), UUID.Zero);
+            }
         }
 
         /// <summary>
@@ -2334,6 +2428,12 @@ namespace OpenSim.Region.Framework.Scenes
 
             foreach (SceneObjectPart part in partList)
             {
+                if (part.KeyframeMotion != null)
+                {
+                    part.KeyframeMotion.Delete();
+                    part.KeyframeMotion = null;
+                }
+
                 if (part.IsJoint() && ((part.Flags & PrimFlags.Physics) != 0))
                 {
                     PhysicsScene.RequestJointDeletion(part.Name); // FIXME: what if the name changed?
@@ -2351,6 +2451,8 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             group.DeleteGroupFromScene(silent);
+            if (!silent)
+                SendKillObject(new List<uint>() { group.LocalId });
 
 //            m_log.DebugFormat("[SCENE]: Exit DeleteSceneObject() for {0} {1}", group.Name, group.UUID);            
         }
@@ -2641,7 +2743,7 @@ namespace OpenSim.Region.Framework.Scenes
             // If the user is banned, we won't let any of their objects
             // enter. Period.
             //
-            if (RegionInfo.EstateSettings.IsBanned(newObject.OwnerID))
+            if (RegionInfo.EstateSettings.IsBanned(newObject.OwnerID, 36))
             {
                 m_log.InfoFormat("[INTERREGION]: Denied prim crossing for banned avatar {0}", newObject.OwnerID);
                 return false;
@@ -2649,6 +2751,8 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (newPosition != Vector3.Zero)
                 newObject.RootPart.GroupPosition = newPosition;
+            if (newObject.RootPart.KeyframeMotion != null)
+                newObject.RootPart.KeyframeMotion.UpdateSceneObject(newObject);
 
             if (!AddSceneObject(newObject))
             {
@@ -2693,6 +2797,23 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns>True if the SceneObjectGroup was added, False if it was not</returns>
         public bool AddSceneObject(SceneObjectGroup sceneObject)
         {
+            if (sceneObject.OwnerID == UUID.Zero)
+            {
+                m_log.ErrorFormat("[SCENE]: Owner ID for {0} was zero", sceneObject.UUID);
+                return false;
+            }
+
+            // If the user is banned, we won't let any of their objects
+            // enter. Period.
+            //
+            int flags = GetUserFlags(sceneObject.OwnerID);
+            if (RegionInfo.EstateSettings.IsBanned(sceneObject.OwnerID, flags))
+            {
+                m_log.InfoFormat("[INTERREGION]: Denied prim crossing for banned avatar {0}", sceneObject.OwnerID);
+
+                return false;
+            }
+
             // Force allocation of new LocalId
             //
             SceneObjectPart[] parts = sceneObject.Parts;
@@ -2726,16 +2847,27 @@ namespace OpenSim.Region.Framework.Scenes
                     RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
                     
                     if (AttachmentsModule != null)
-                        AttachmentsModule.AttachObject(sp, grp, 0, false, false);
+                        AttachmentsModule.AttachObject(sp, grp, 0, false, false, false);
                 }
                 else
                 {
+                    m_log.DebugFormat("[SCENE]: Attachment {0} arrived and scene presence was not found, setting to temp", sceneObject.UUID);
                     RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
                     RootPrim.AddFlag(PrimFlags.TemporaryOnRez);
                 }
+                if (sceneObject.OwnerID == UUID.Zero)
+                {
+                    m_log.ErrorFormat("[SCENE]: Owner ID for {0} was zero after attachment processing. BUG!", sceneObject.UUID);
+                    return false;
+                }
             }
             else
             {
+                if (sceneObject.OwnerID == UUID.Zero)
+                {
+                    m_log.ErrorFormat("[SCENE]: Owner ID for non-attachment {0} was zero", sceneObject.UUID);
+                    return false;
+                }
                 AddRestoredSceneObject(sceneObject, true, false);
             }
 
@@ -2752,6 +2884,24 @@ namespace OpenSim.Region.Framework.Scenes
             return 2; // StateSource.PrimCrossing
         }
 
+        public int GetUserFlags(UUID user)
+        {
+            //Unfortunately the SP approach means that the value is cached until region is restarted
+            /*
+            ScenePresence sp;
+            if (TryGetScenePresence(user, out sp))
+            {
+                return sp.UserFlags;
+            }
+            else
+            {
+             */
+                UserAccount uac = UserAccountService.GetUserAccount(RegionInfo.ScopeID, user);
+                if (uac == null)
+                    return 0;
+                return uac.UserFlags;
+            //}
+        }
         #endregion
 
         #region Add/Remove Avatar Methods
@@ -2784,7 +2934,7 @@ namespace OpenSim.Region.Framework.Scenes
                     = (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0
                         || (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0;
     
-    //            CheckHeartbeat();
+                CheckHeartbeat();
     
                 sp = GetScenePresence(client.AgentId);
 
@@ -2802,6 +2952,13 @@ namespace OpenSim.Region.Framework.Scenes
                     SubscribeToClientEvents(client);
     
                     sp = m_sceneGraph.CreateAndAddChildScenePresence(client, aCircuit.Appearance, type);
+                    InventoryFolderBase cof = InventoryService.GetFolderForType(client.AgentId, (AssetType)46);
+                    if (cof == null)
+                        sp.COF = UUID.Zero;
+                    else
+                        sp.COF = cof.ID;
+
+                    m_log.DebugFormat("[SCENE]: COF for {0} is {1}", client.AgentId, sp.COF);
                     m_eventManager.TriggerOnNewPresence(sp);
     
                     sp.TeleportFlags = (TPFlags)aCircuit.teleportFlags;
@@ -2815,6 +2972,7 @@ namespace OpenSim.Region.Framework.Scenes
                         // start the scripts again (since this is done in RezAttachments()).
                         // XXX: This is convoluted.
                         sp.IsChildAgent = false;
+                        sp.IsLoggingIn = true;
     
                         if (AttachmentsModule != null)
                             Util.FireAndForget(delegate(object o) { AttachmentsModule.RezAttachments(sp); });
@@ -2928,19 +3086,14 @@ namespace OpenSim.Region.Framework.Scenes
                     // and the scene presence and the client, if they exist
                     try
                     {
-                        // We need to wait for the client to make UDP contact first.
-                        // It's the UDP contact that creates the scene presence
-                        ScenePresence sp = WaitGetScenePresence(agentID);
+                        ScenePresence sp = GetScenePresence(agentID);
+
                         if (sp != null)
                         {
                             PresenceService.LogoutAgent(sp.ControllingClient.SessionId);
-
                             sp.ControllingClient.Close();
                         }
-                        else
-                        {
-                            m_log.WarnFormat("[SCENE]: Could not find scene presence for {0}", agentID);
-                        }
+
                         // BANG! SLASH!
                         m_authenticateHandler.RemoveCircuit(agentID);
 
@@ -2985,6 +3138,8 @@ namespace OpenSim.Region.Framework.Scenes
             client.OnUpdatePrimGroupPosition += m_sceneGraph.UpdatePrimGroupPosition;
             client.OnUpdatePrimSinglePosition += m_sceneGraph.UpdatePrimSinglePosition;
 
+            client.onClientChangeObject += m_sceneGraph.ClientChangeObject;
+
             client.OnUpdatePrimGroupRotation += m_sceneGraph.UpdatePrimGroupRotation;
             client.OnUpdatePrimGroupMouseRotation += m_sceneGraph.UpdatePrimGroupRotation;
             client.OnUpdatePrimSingleRotation += m_sceneGraph.UpdatePrimSingleRotation;
@@ -3041,6 +3196,7 @@ namespace OpenSim.Region.Framework.Scenes
             client.OnFetchInventory += m_asyncInventorySender.HandleFetchInventory;
             client.OnUpdateInventoryItem += UpdateInventoryItemAsset;
             client.OnCopyInventoryItem += CopyInventoryItem;
+            client.OnMoveItemsAndLeaveCopy += MoveInventoryItemsLeaveCopy;
             client.OnMoveInventoryItem += MoveInventoryItem;
             client.OnRemoveInventoryItem += RemoveInventoryItem;
             client.OnRemoveInventoryFolder += RemoveInventoryFolder;
@@ -3112,6 +3268,8 @@ namespace OpenSim.Region.Framework.Scenes
             client.OnUpdatePrimGroupPosition -= m_sceneGraph.UpdatePrimGroupPosition;
             client.OnUpdatePrimSinglePosition -= m_sceneGraph.UpdatePrimSinglePosition;
 
+            client.onClientChangeObject -= m_sceneGraph.ClientChangeObject;
+
             client.OnUpdatePrimGroupRotation -= m_sceneGraph.UpdatePrimGroupRotation;
             client.OnUpdatePrimGroupMouseRotation -= m_sceneGraph.UpdatePrimGroupRotation;
             client.OnUpdatePrimSingleRotation -= m_sceneGraph.UpdatePrimSingleRotation;
@@ -3214,7 +3372,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="agentId">The avatar's Unique ID</param>
         /// <param name="client">The IClientAPI for the client</param>
-        public virtual void TeleportClientHome(UUID agentId, IClientAPI client)
+        public virtual bool TeleportClientHome(UUID agentId, IClientAPI client)
         {
             if (EntityTransferModule != null)
             {
@@ -3225,6 +3383,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_log.DebugFormat("[SCENE]: Unable to teleport user home: no AgentTransferModule is active");
                 client.SendTeleportFailed("Unable to perform teleports on this simulator.");
             }
+            return false;
         }
 
         /// <summary>
@@ -3334,6 +3493,16 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="flags"></param>
         public virtual void SetHomeRezPoint(IClientAPI remoteClient, ulong regionHandle, Vector3 position, Vector3 lookAt, uint flags)
         {
+            //Add half the avatar's height so that the user doesn't fall through prims
+            ScenePresence presence;
+            if (TryGetScenePresence(remoteClient.AgentId, out presence))
+            {
+                if (presence.Appearance != null)
+                {
+                    position.Z = position.Z + (presence.Appearance.AvatarHeight / 2);
+                }
+            }
+
             if (GridUserService != null && GridUserService.SetHome(remoteClient.AgentId.ToString(), RegionInfo.RegionID, position, lookAt))
                 // FUBAR ALERT: this needs to be "Home position set." so the viewer saves a home-screenshot.
                 m_dialogModule.SendAlertToUser(remoteClient, "Home position set.");
@@ -3471,6 +3640,7 @@ namespace OpenSim.Region.Framework.Scenes
                     // It's possible for child agents to have transactions if changes are being made cross-border.
                     if (AgentTransactionsModule != null)
                         AgentTransactionsModule.RemoveAgentAssetTransactions(agentID);
+                    m_log.Debug("[Scene] The avatar has left the building");
                 }
                 catch (Exception e)
                 {
@@ -3663,38 +3833,39 @@ namespace OpenSim.Region.Framework.Scenes
                     agent.firstname, agent.lastname, agent.Viewer);
                 reason = "Access denied, your viewer is banned by the region owner";
                 return false;
-            }
+            }           
+
+
+            ScenePresence sp = GetScenePresence(agent.AgentID);
 
-            ILandObject land;
+            if (sp != null && !sp.IsChildAgent)
+            {
+                // We have a zombie from a crashed session. 
+                // Or the same user is trying to be root twice here, won't work.
+                // Kill it.
+                m_log.WarnFormat(
+                    "[SCENE]: Existing root scene presence detected for {0} {1} in {2} when connecting.  Removing existing presence.",
+                    sp.Name, sp.UUID, RegionInfo.RegionName);
+
+                sp.ControllingClient.Close(true, true);
+                sp = null;
+            }
 
             lock (agent)
             {
-                ScenePresence sp = GetScenePresence(agent.AgentID);
-    
-                if (sp != null && !sp.IsChildAgent)
-                {
-                    // We have a zombie from a crashed session. 
-                    // Or the same user is trying to be root twice here, won't work.
-                    // Kill it.
-                    m_log.WarnFormat(
-                        "[SCENE]: Existing root scene presence detected for {0} {1} in {2} when connecting.  Removing existing presence.",
-                        sp.Name, sp.UUID, RegionInfo.RegionName);
-    
-                    sp.ControllingClient.Close(true);
-                    sp = null;
-                }
-    
-                land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
-    
                 //On login test land permisions
                 if (vialogin)
                 {
-                    if (land != null && !TestLandRestrictions(agent, land, out reason))
+                    IUserAccountCacheModule cache = RequestModuleInterface<IUserAccountCacheModule>();
+                    if (cache != null)
+                        cache.Remove(agent.firstname + " " + agent.lastname);
+                    if (!TestLandRestrictions(agent.AgentID, out reason, ref agent.startpos.X, ref agent.startpos.Y))
                     {
+                        m_log.DebugFormat("[CONNECTION BEGIN]: Denying access to {0} due to no land access", agent.AgentID.ToString());
                         return false;
                     }
                 }
-    
+
                 if (sp == null) // We don't have an [child] agent here already
                 {
                     if (requirePresenceLookup)
@@ -3703,34 +3874,36 @@ namespace OpenSim.Region.Framework.Scenes
                         {
                             if (!VerifyUserPresence(agent, out reason))
                                 return false;
-                        }
-                        catch (Exception e)
+                        } catch (Exception e)
                         {
                             m_log.ErrorFormat(
                                 "[SCENE]: Exception verifying presence {0}{1}", e.Message, e.StackTrace);
-
                             return false;
                         }
                     }
-    
+
                     try
                     {
-                        if (!AuthorizeUser(agent, out reason))
-                            return false;
+                        // Always check estate if this is a login. Always
+                        // check if banned regions are to be blacked out.
+                        if (vialogin || (!m_seeIntoBannedRegion))
+                        {
+                            if (!AuthorizeUser(agent, out reason))
+                                return false;
+                        }
                     }
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
                             "[SCENE]: Exception authorizing user {0}{1}", e.Message, e.StackTrace);
-
                         return false;
                     }
-    
+
                     m_log.InfoFormat(
                         "[SCENE]: Region {0} authenticated and authorized incoming {1} agent {2} {3} {4} (circuit code {5})",
                         RegionInfo.RegionName, (agent.child ? "child" : "root"), agent.firstname, agent.lastname,
                         agent.AgentID, agent.circuitcode);
-    
+
                     if (CapsModule != null)
                     {
                         CapsModule.SetAgentCapsSeeds(agent);
@@ -3742,15 +3915,15 @@ namespace OpenSim.Region.Framework.Scenes
                     // Let the SP know how we got here. This has a lot of interesting
                     // uses down the line.
                     sp.TeleportFlags = (TPFlags)teleportFlags;
-    
+
                     if (sp.IsChildAgent)
                     {
                         m_log.DebugFormat(
                             "[SCENE]: Adjusting known seeds for existing agent {0} in {1}",
                             agent.AgentID, RegionInfo.RegionName);
-    
+
                         sp.AdjustKnownSeeds();
-                        
+
                         if (CapsModule != null)
                             CapsModule.SetAgentCapsSeeds(agent);
                     }
@@ -3852,6 +4025,8 @@ namespace OpenSim.Region.Framework.Scenes
                 }
 
                 // Honor parcel landing type and position.
+                /*
+                ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
                 if (land != null)
                 {
                     if (land.LandData.LandingType == (byte)1 && land.LandData.UserLocation != Vector3.Zero)
@@ -3859,25 +4034,43 @@ namespace OpenSim.Region.Framework.Scenes
                         agent.startpos = land.LandData.UserLocation;
                     }
                 }
+                */// This is now handled properly in ScenePresence.MakeRootAgent
             }
 
             return true;
         }
 
-        private bool TestLandRestrictions(AgentCircuitData agent, ILandObject land,  out string reason)
+        public bool TestLandRestrictions(UUID agentID, out string reason, ref float posX, ref float posY)
         {
-            bool banned = land.IsBannedFromLand(agent.AgentID);
-            bool restricted = land.IsRestrictedFromLand(agent.AgentID);
+            if (posX < 0)
+                posX = 0;
+            else if (posX >= 256)
+                posX = 255.999f;
+            if (posY < 0)
+                posY = 0;
+            else if (posY >= 256)
+                posY = 255.999f;
+
+            reason = String.Empty;
+            if (Permissions.IsGod(agentID))
+                return true;
+
+            ILandObject land = LandChannel.GetLandObject(posX, posY);
+            if (land == null)
+                return false;
+
+            bool banned = land.IsBannedFromLand(agentID);
+            bool restricted = land.IsRestrictedFromLand(agentID);
 
             if (banned || restricted)
             {
-                ILandObject nearestParcel = GetNearestAllowedParcel(agent.AgentID, agent.startpos.X, agent.startpos.Y);
+                ILandObject nearestParcel = GetNearestAllowedParcel(agentID, posX, posY);
                 if (nearestParcel != null)
                 {
                     //Move agent to nearest allowed
                     Vector3 newPosition = GetParcelCenterAtGround(nearestParcel);
-                    agent.startpos.X = newPosition.X;
-                    agent.startpos.Y = newPosition.Y;
+                    posX = newPosition.X;
+                    posY = newPosition.Y;
                 }
                 else
                 {
@@ -3939,7 +4132,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (!m_strictAccessControl) return true;
             if (Permissions.IsGod(agent.AgentID)) return true;
-                      
+
             if (AuthorizationService != null)
             {
                 if (!AuthorizationService.IsAuthorizedForRegion(
@@ -3954,7 +4147,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (RegionInfo.EstateSettings != null)
             {
-                if (RegionInfo.EstateSettings.IsBanned(agent.AgentID))
+                if (RegionInfo.EstateSettings.IsBanned(agent.AgentID, 0))
                 {
                     m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist",
                                      agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName);
@@ -4144,6 +4337,15 @@ namespace OpenSim.Region.Framework.Scenes
 
             // XPTO: if this agent is not allowed here as root, always return false
 
+            // We have to wait until the viewer contacts this region after receiving EAC.
+            // That calls AddNewClient, which finally creates the ScenePresence
+            int flags = GetUserFlags(cAgentData.AgentID);
+            if (RegionInfo.EstateSettings.IsBanned(cAgentData.AgentID, flags))
+            {
+                m_log.DebugFormat("[SCENE]: Denying root agent entry to {0}: banned", cAgentData.AgentID);
+                return false;
+            }
+
             // TODO: This check should probably be in QueryAccess().
             ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2);
             if (nearestParcel == null)
@@ -4208,7 +4410,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name='agentID'></param>
         protected virtual ScenePresence WaitGetScenePresence(UUID agentID)
         {
-            int ntimes = 10;
+            int ntimes = 30;
             ScenePresence sp = null;
             while ((sp = GetScenePresence(agentID)) == null && (ntimes-- > 0))
                 Thread.Sleep(1000);
@@ -4238,6 +4440,16 @@ namespace OpenSim.Region.Framework.Scenes
             return false;
         }
 
+        public bool IncomingCloseAgent(UUID agentID)
+        {
+            return IncomingCloseAgent(agentID, false);
+        }
+
+        public bool IncomingCloseChildAgent(UUID agentID)
+        {
+            return IncomingCloseAgent(agentID, true);
+        }
+
         /// <summary>
         /// Tell a single agent to disconnect from the region.
         /// </summary>
@@ -4253,7 +4465,7 @@ namespace OpenSim.Region.Framework.Scenes
             ScenePresence presence = m_sceneGraph.GetScenePresence(agentID);
             if (presence != null)
             {
-                presence.ControllingClient.Close(force);
+                presence.ControllingClient.Close(force, force);
                 return true;
             }
 
@@ -4886,7 +5098,7 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         if ((grp.RootPart.Flags & PrimFlags.TemporaryOnRez) != 0)
                         {
-                            if (grp.RootPart.Expires <= DateTime.Now)
+                            if (grp.GetSittingAvatarsCount() == 0 && grp.RootPart.Expires <= DateTime.Now)
                                 DeleteSceneObject(grp, false);
                         }
                     }
@@ -4900,35 +5112,81 @@ namespace OpenSim.Region.Framework.Scenes
             SimulationDataService.RemoveObject(uuid, RegionInfo.RegionID);
         }
 
-        public int GetHealth()
+        public int GetHealth(out int flags, out string message)
         {
             // Returns:
             // 1 = sim is up and accepting http requests. The heartbeat has
             // stopped and the sim is probably locked up, but a remote
             // admin restart may succeed
-            //
+            // 
             // 2 = Sim is up and the heartbeat is running. The sim is likely
-            // usable for people within and logins _may_ work
+            // usable for people within
+            //
+            // 3 = Sim is up and one packet thread is running. Sim is
+            // unstable and will not accept new logins
             //
-            // 3 = We have seen a new user enter within the past 4 minutes
+            // 4 = Sim is up and both packet threads are running. Sim is
+            // likely usable
+            //
+            // 5 = We have seen a new user enter within the past 4 minutes
             // which can be seen as positive confirmation of sim health
             //
+
+            flags = 0;
+            message = String.Empty;
+
+            CheckHeartbeat();
+
+            if (m_firstHeartbeat || (m_lastIncoming == 0 && m_lastOutgoing == 0))
+            {
+                // We're still starting
+                // 0 means "in startup", it can't happen another way, since
+                // to get here, we must be able to accept http connections
+                return 0;
+            }
+
             int health=1; // Start at 1, means we're up
 
             if ((Util.EnvironmentTickCountSubtract(m_lastFrameTick)) < 1000)
-                health += 1;
+            {
+                health+=1;
+                flags |= 1;
+            }
+
+            if (Util.EnvironmentTickCountSubtract(m_lastIncoming) < 1000)
+            {
+                health+=1;
+                flags |= 2;
+            }
+
+            if (Util.EnvironmentTickCountSubtract(m_lastOutgoing) < 1000)
+            {
+                health+=1;
+                flags |= 4;
+            }
             else
+            {
+int pid = System.Diagnostics.Process.GetCurrentProcess().Id;
+System.Diagnostics.Process proc = new System.Diagnostics.Process();
+proc.EnableRaisingEvents=false; 
+proc.StartInfo.FileName = "/bin/kill";
+proc.StartInfo.Arguments = "-QUIT " + pid.ToString();
+proc.Start();
+proc.WaitForExit();
+Thread.Sleep(1000);
+Environment.Exit(1);
+            }
+
+            if (flags != 7)
                 return health;
 
             // A login in the last 4 mins? We can't be doing too badly
             //
-            if ((Util.EnvironmentTickCountSubtract(m_LastLogin)) < 240000)
+            if (Util.EnvironmentTickCountSubtract(m_LastLogin) < 240000)
                 health++;
             else
                 return health;
 
-//            CheckHeartbeat();
-
             return health;
         }
 
@@ -5016,7 +5274,7 @@ namespace OpenSim.Region.Framework.Scenes
             bool wasUsingPhysics = ((jointProxyObject.Flags & PrimFlags.Physics) != 0);
             if (wasUsingPhysics)
             {
-                jointProxyObject.UpdatePrimFlags(false, false, true, false); // FIXME: possible deadlock here; check to make sure all the scene alterations set into motion here won't deadlock
+                jointProxyObject.UpdatePrimFlags(false, false, true, false,false); // FIXME: possible deadlock here; check to make sure all the scene alterations set into motion here won't deadlock
             }
         }
 
@@ -5115,14 +5373,14 @@ namespace OpenSim.Region.Framework.Scenes
             return (((vsn.X * xdiff) + (vsn.Y * ydiff)) / (-1 * vsn.Z)) + p0.Z;
         }
 
-//        private void CheckHeartbeat()
-//        {
-//            if (m_firstHeartbeat)
-//                return;
-//
-//            if (Util.EnvironmentTickCountSubtract(m_lastFrameTick) > 2000)
-//                StartTimer();
-//        }
+        private void CheckHeartbeat()
+        {
+            if (m_firstHeartbeat)
+                return;
+
+            if ((Util.EnvironmentTickCountSubtract(m_lastFrameTick)) > 5000)
+                Start();
+        }
 
         public override ISceneObject DeserializeObject(string representation)
         {
@@ -5134,9 +5392,14 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_allowScriptCrossings; }
         }
 
-        public Vector3? GetNearestAllowedPosition(ScenePresence avatar)
+        public Vector3 GetNearestAllowedPosition(ScenePresence avatar)
+        {
+            return GetNearestAllowedPosition(avatar, null);
+        }
+
+        public Vector3 GetNearestAllowedPosition(ScenePresence avatar, ILandObject excludeParcel)
         {
-            ILandObject nearestParcel = GetNearestAllowedParcel(avatar.UUID, avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
+            ILandObject nearestParcel = GetNearestAllowedParcel(avatar.UUID, avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, excludeParcel);
 
             if (nearestParcel != null)
             {
@@ -5145,10 +5408,7 @@ namespace OpenSim.Region.Framework.Scenes
                 Vector3? nearestPoint = GetNearestPointInParcelAlongDirectionFromPoint(avatar.AbsolutePosition, dir, nearestParcel);
                 if (nearestPoint != null)
                 {
-//                    m_log.DebugFormat(
-//                        "[SCENE]: Found a sane previous position based on velocity for {0}, sending them to {1} in {2}",
-//                        avatar.Name, nearestPoint, nearestParcel.LandData.Name);
-
+                    Debug.WriteLine("Found a sane previous position based on velocity, sending them to: " + nearestPoint.ToString());
                     return nearestPoint.Value;
                 }
 
@@ -5158,17 +5418,20 @@ namespace OpenSim.Region.Framework.Scenes
                 nearestPoint = GetNearestPointInParcelAlongDirectionFromPoint(avatar.AbsolutePosition, dir, nearestParcel);
                 if (nearestPoint != null)
                 {
-//                    m_log.DebugFormat(
-//                        "[SCENE]: {0} had a zero velocity, sending them to {1}", avatar.Name, nearestPoint);
-
+                    Debug.WriteLine("They had a zero velocity, sending them to: " + nearestPoint.ToString());
                     return nearestPoint.Value;
                 }
 
-                //Ultimate backup if we have no idea where they are
-//                m_log.DebugFormat(
-//                    "[SCENE]: No idea where {0} is, sending them to {1}", avatar.Name, avatar.lastKnownAllowedPosition);
+                ILandObject dest = LandChannel.GetLandObject(avatar.lastKnownAllowedPosition.X, avatar.lastKnownAllowedPosition.Y);
+                if (dest !=  excludeParcel)
+                {
+                    // Ultimate backup if we have no idea where they are and
+                    // the last allowed position was in another parcel
+                    Debug.WriteLine("Have no idea where they are, sending them to: " + avatar.lastKnownAllowedPosition.ToString());
+                    return avatar.lastKnownAllowedPosition;
+                }
 
-                return avatar.lastKnownAllowedPosition;
+                // else fall through to region edge
             }
 
             //Go to the edge, this happens in teleporting to a region with no available parcels
@@ -5202,13 +5465,18 @@ namespace OpenSim.Region.Framework.Scenes
 
         public ILandObject GetNearestAllowedParcel(UUID avatarId, float x, float y)
         {
+            return GetNearestAllowedParcel(avatarId, x, y, null);
+        }
+
+        public ILandObject GetNearestAllowedParcel(UUID avatarId, float x, float y, ILandObject excludeParcel)
+        {
             List<ILandObject> all = AllParcels();
             float minParcelDistance = float.MaxValue;
             ILandObject nearestParcel = null;
 
             foreach (var parcel in all)
             {
-                if (!parcel.IsEitherBannedOrRestricted(avatarId))
+                if (!parcel.IsEitherBannedOrRestricted(avatarId) && parcel != excludeParcel)
                 {
                     float parcelDistance = GetParcelDistancefromPoint(parcel, x, y);
                     if (parcelDistance < minParcelDistance)
@@ -5424,7 +5692,55 @@ namespace OpenSim.Region.Framework.Scenes
                 mapModule.GenerateMaptile();
         }
 
-        private void RegenerateMaptileAndReregister(object sender, ElapsedEventArgs e)
+//        public void CleanDroppedAttachments()
+//        {
+//            List<SceneObjectGroup> objectsToDelete =
+//                    new List<SceneObjectGroup>();
+//
+//            lock (m_cleaningAttachments)
+//            {
+//                ForEachSOG(delegate (SceneObjectGroup grp)
+//                        {
+//                            if (grp.RootPart.Shape.PCode == 0 && grp.RootPart.Shape.State != 0 && (!objectsToDelete.Contains(grp)))
+//                            {
+//                                UUID agentID = grp.OwnerID;
+//                                if (agentID == UUID.Zero)
+//                                {
+//                                    objectsToDelete.Add(grp);
+//                                    return;
+//                                }
+//
+//                                ScenePresence sp = GetScenePresence(agentID);
+//                                if (sp == null)
+//                                {
+//                                    objectsToDelete.Add(grp);
+//                                    return;
+//                                }
+//                            }
+//                        });
+//            }
+//
+//            foreach (SceneObjectGroup grp in objectsToDelete)
+//            {
+//                m_log.InfoFormat("[SCENE]: Deleting dropped attachment {0} of user {1}", grp.UUID, grp.OwnerID);
+//                DeleteSceneObject(grp, true);
+//            }
+//        }
+
+        public void ThreadAlive(int threadCode)
+        {
+            switch(threadCode)
+            {
+                case 1: // Incoming
+                    m_lastIncoming = Util.EnvironmentTickCount();
+                    break;
+                case 2: // Incoming
+                    m_lastOutgoing = Util.EnvironmentTickCount();
+                    break;
+            }
+        }
+
+        public void RegenerateMaptileAndReregister(object sender, ElapsedEventArgs e)
         {
             RegenerateMaptile();
 
@@ -5452,6 +5768,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns></returns>
         public bool QueryAccess(UUID agentID, Vector3 position, out string reason)
         {
+            reason = "You are banned from the region";
+
             if (EntityTransferModule.IsInTransit(agentID))
             {
                 reason = "Agent is still in transit from this region";
@@ -5463,6 +5781,12 @@ namespace OpenSim.Region.Framework.Scenes
                 return false;
             }
 
+            if (Permissions.IsGod(agentID))
+            {
+                reason = String.Empty;
+                return true;
+            }
+
             // FIXME: Root agent count is currently known to be inaccurate.  This forces a recount before we check.
             // However, the long term fix is to make sure root agent count is always accurate.
             m_sceneGraph.RecalculateStats();
@@ -5483,6 +5807,41 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
+            ScenePresence presence = GetScenePresence(agentID);
+            IClientAPI client = null;
+            AgentCircuitData aCircuit = null;
+
+            if (presence != null)
+            {
+                client = presence.ControllingClient;
+                if (client != null)
+                    aCircuit = client.RequestClientInfo();
+            }
+
+            // We may be called before there is a presence or a client.
+            // Fake AgentCircuitData to keep IAuthorizationModule smiling
+            if (client == null)
+            {
+                aCircuit = new AgentCircuitData();
+                aCircuit.AgentID = agentID;
+                aCircuit.firstname = String.Empty;
+                aCircuit.lastname = String.Empty;
+            }
+
+            try
+            {
+                if (!AuthorizeUser(aCircuit, out reason))
+                {
+                    // m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID);
+                    return false;
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[SCENE]: Exception authorizing agent: {0} "+ e.StackTrace, e.Message);
+                return false;
+            }
+
             if (position == Vector3.Zero) // Teleport
             {
                 if (!RegionInfo.EstateSettings.AllowDirectTeleport)
@@ -5516,13 +5875,46 @@ namespace OpenSim.Region.Framework.Scenes
                         }
                     }
                 }
+
+                float posX = 128.0f;
+                float posY = 128.0f;
+
+                if (!TestLandRestrictions(agentID, out reason, ref posX, ref posY))
+                {
+                    // m_log.DebugFormat("[SCENE]: Denying {0} because they are banned on all parcels", agentID);
+                    return false;
+                }
+            }
+            else // Walking
+            {
+                ILandObject land = LandChannel.GetLandObject(position.X, position.Y);
+                if (land == null)
+                    return false;
+
+                bool banned = land.IsBannedFromLand(agentID);
+                bool restricted = land.IsRestrictedFromLand(agentID);
+
+                if (banned || restricted)
+                    return false;
             }
 
             reason = String.Empty;
             return true;
         }
 
-        /// <summary>
+                public void StartTimerWatchdog()
+        {
+            m_timerWatchdog.Interval = 1000;
+            m_timerWatchdog.Elapsed += TimerWatchdog;
+            m_timerWatchdog.AutoReset = true;
+            m_timerWatchdog.Start();
+        }
+
+        public void TimerWatchdog(object sender, ElapsedEventArgs e)
+        {
+            CheckHeartbeat();
+                }
+
         /// This method deals with movement when an avatar is automatically moving (but this is distinct from the
         /// autopilot that moves an avatar to a sit target!.
         /// </summary>
@@ -5601,6 +5993,11 @@ namespace OpenSim.Region.Framework.Scenes
             return m_SpawnPoint - 1;
         }
 
+        private void HandleGcCollect(string module, string[] args)
+        {
+            GC.Collect();
+        }
+
         /// <summary>
         /// Wrappers to get physics modules retrieve assets. 
         /// </summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index d3e968e..74c9582 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -143,7 +143,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         protected ulong m_regionHandle;
         protected string m_regionName;
-        protected RegionInfo m_regInfo;
 
         public ITerrainChannel Heightmap;
 
@@ -168,6 +167,8 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_permissions; }
         }
 
+        protected string m_datastore;
+
          /* Used by the loadbalancer plugin on GForge */
         protected RegionStatus m_regStatus;
         public RegionStatus RegionStatus
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 305f8a4..775a4c2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -194,10 +194,13 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        public delegate void SendCloseChildAgentDelegate(UUID agentID, ulong regionHandle);
+
         /// <summary>
-        /// Closes a child agent on a given region
+        /// This Closes child agents on neighboring regions
+        /// Calls an asynchronous method to do so..  so it doesn't lag the sim.
         /// </summary>
-        protected void SendCloseChildAgent(UUID agentID, ulong regionHandle)
+        protected void SendCloseChildAgentAsync(UUID agentID, ulong regionHandle)
         {
             // let's do our best, but there's not much we can do if the neighbour doesn't accept.
 
@@ -206,30 +209,29 @@ namespace OpenSim.Region.Framework.Scenes
             Utils.LongToUInts(regionHandle, out x, out y);
 
             GridRegion destination = m_scene.GridService.GetRegionByPosition(m_regionInfo.ScopeID, (int)x, (int)y);
+            m_scene.SimulationService.CloseChildAgent(destination, agentID);
+        }
 
-            m_log.DebugFormat(
-                "[SCENE COMMUNICATION SERVICE]: Sending close agent ID {0} to {1}", agentID, destination.RegionName);
-
-            m_scene.SimulationService.CloseAgent(destination, agentID);
+        private void SendCloseChildAgentCompleted(IAsyncResult iar)
+        {
+            SendCloseChildAgentDelegate icon = (SendCloseChildAgentDelegate)iar.AsyncState;
+            icon.EndInvoke(iar);
         }
 
-        /// <summary>
-        /// Closes a child agents in a collection of regions. Does so asynchronously 
-        /// so that the caller doesn't wait.
-        /// </summary>
-        /// <param name="agentID"></param>
-        /// <param name="regionslst"></param>
         public void SendCloseChildAgentConnections(UUID agentID, List<ulong> regionslst)
         {
             foreach (ulong handle in regionslst)
             {
-                SendCloseChildAgent(agentID, handle);
+                SendCloseChildAgentDelegate d = SendCloseChildAgentAsync;
+                d.BeginInvoke(agentID, handle,
+                              SendCloseChildAgentCompleted,
+                              d);
             }
         }
-       
+
         public List<GridRegion> RequestNamedRegions(string name, int maxNumber)
         {
             return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index a84f6d3..e599e90 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -41,6 +41,12 @@ namespace OpenSim.Region.Framework.Scenes
 {
     public delegate void PhysicsCrash();
 
+    public delegate void AttachToBackupDelegate(SceneObjectGroup sog);
+
+    public delegate void DetachFromBackupDelegate(SceneObjectGroup sog);
+
+    public delegate void ChangedBackupDelegate(SceneObjectGroup sog);
+
     /// <summary>
     /// This class used to be called InnerScene and may not yet truly be a SceneGraph.  The non scene graph components
     /// should be migrated out over time.
@@ -54,11 +60,15 @@ namespace OpenSim.Region.Framework.Scenes
         protected internal event PhysicsCrash UnRecoverableError;
         private PhysicsCrash handlerPhysicsCrash = null;
 
+        public event AttachToBackupDelegate OnAttachToBackup;
+        public event DetachFromBackupDelegate OnDetachFromBackup;
+        public event ChangedBackupDelegate OnChangeBackup;
+
         #endregion
 
         #region Fields
 
-        protected object m_presenceLock = new object();
+        protected OpenMetaverse.ReaderWriterLockSlim m_scenePresencesLock = new OpenMetaverse.ReaderWriterLockSlim();
         protected Dictionary<UUID, ScenePresence> m_scenePresenceMap = new Dictionary<UUID, ScenePresence>();
         protected List<ScenePresence> m_scenePresenceArray = new List<ScenePresence>();
 
@@ -127,13 +137,18 @@ namespace OpenSim.Region.Framework.Scenes
 
         protected internal void Close()
         {
-            lock (m_presenceLock)
+            m_scenePresencesLock.EnterWriteLock();
+            try
             {
                 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>();
                 List<ScenePresence> newlist = new List<ScenePresence>();
                 m_scenePresenceMap = newmap;
                 m_scenePresenceArray = newlist;
             }
+            finally
+            {
+                m_scenePresencesLock.ExitWriteLock();
+            }
 
             lock (SceneObjectGroupsByFullID)
                 SceneObjectGroupsByFullID.Clear();
@@ -254,6 +269,33 @@ namespace OpenSim.Region.Framework.Scenes
         protected internal bool AddRestoredSceneObject(
             SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates)
         {
+            if (!m_parentScene.CombineRegions)
+            {
+                // KF: Check for out-of-region, move inside and make static.
+                Vector3 npos = new Vector3(sceneObject.RootPart.GroupPosition.X,
+                                           sceneObject.RootPart.GroupPosition.Y,
+                                           sceneObject.RootPart.GroupPosition.Z);
+                if (!(((sceneObject.RootPart.Shape.PCode == (byte)PCode.Prim) && (sceneObject.RootPart.Shape.State != 0))) && (npos.X < 0.0 || npos.Y < 0.0 || npos.Z < 0.0 ||
+                    npos.X > Constants.RegionSize ||
+                    npos.Y > Constants.RegionSize))
+                {
+                    if (npos.X < 0.0) npos.X = 1.0f;
+                    if (npos.Y < 0.0) npos.Y = 1.0f;
+                    if (npos.Z < 0.0) npos.Z = 0.0f;
+                    if (npos.X > Constants.RegionSize) npos.X = Constants.RegionSize - 1.0f;
+                    if (npos.Y > Constants.RegionSize) npos.Y = Constants.RegionSize - 1.0f;
+     
+                    foreach (SceneObjectPart part in sceneObject.Parts)
+                    {
+                        part.GroupPosition = npos;
+                    }
+                    sceneObject.RootPart.Velocity = Vector3.Zero;
+                    sceneObject.RootPart.AngularVelocity = Vector3.Zero;
+                    sceneObject.RootPart.Acceleration = Vector3.Zero;
+                    sceneObject.RootPart.Velocity = Vector3.Zero;
+                }
+            }
+
             if (attachToBackup && (!alreadyPersisted))
             {
                 sceneObject.ForceInventoryPersistence();
@@ -317,9 +359,8 @@ namespace OpenSim.Region.Framework.Scenes
             if (pa != null && pa.IsPhysical && vel != Vector3.Zero)
             {
                 sceneObject.RootPart.ApplyImpulse((vel * sceneObject.GetMass()), false);
-                sceneObject.Velocity = vel;
             }
-        
+
             return true;
         }
 
@@ -344,6 +385,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// </returns>
         protected bool AddSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates)
         {
+            if (sceneObject == null)
+            {
+                m_log.ErrorFormat("[SCENEGRAPH]: Tried to add null scene object");
+                return false;
+            }
             if (sceneObject.UUID == UUID.Zero)
             {
                 m_log.ErrorFormat(
@@ -475,6 +521,30 @@ namespace OpenSim.Region.Framework.Scenes
                 m_updateList[obj.UUID] = obj;
         }
 
+        public void FireAttachToBackup(SceneObjectGroup obj)
+        {
+            if (OnAttachToBackup != null)
+            {
+                OnAttachToBackup(obj);
+            }
+        }
+
+        public void FireDetachFromBackup(SceneObjectGroup obj)
+        {
+            if (OnDetachFromBackup != null)
+            {
+                OnDetachFromBackup(obj);
+            }
+        }
+
+        public void FireChangeBackup(SceneObjectGroup obj)
+        {
+            if (OnChangeBackup != null)
+            {
+                OnChangeBackup(obj);
+            }
+        }
+
         /// <summary>
         /// Process all pending updates
         /// </summary>
@@ -519,12 +589,12 @@ namespace OpenSim.Region.Framework.Scenes
 
         protected internal void AddPhysicalPrim(int number)
         {
-            m_physicalPrim++;
+            m_physicalPrim += number;
         }
 
         protected internal void RemovePhysicalPrim(int number)
         {
-            m_physicalPrim--;
+            m_physicalPrim -= number;
         }
 
         protected internal void AddToScriptLPS(int number)
@@ -592,7 +662,8 @@ namespace OpenSim.Region.Framework.Scenes
 
             Entities[presence.UUID] = presence;
 
-            lock (m_presenceLock)
+            m_scenePresencesLock.EnterWriteLock();
+            try
             {
                 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(m_scenePresenceMap);
                 List<ScenePresence> newlist = new List<ScenePresence>(m_scenePresenceArray);
@@ -616,6 +687,10 @@ namespace OpenSim.Region.Framework.Scenes
                 m_scenePresenceMap = newmap;
                 m_scenePresenceArray = newlist;
             }
+            finally
+            {
+                m_scenePresencesLock.ExitWriteLock();
+            }
         }
 
         /// <summary>
@@ -630,7 +705,8 @@ namespace OpenSim.Region.Framework.Scenes
                     agentID);
             }
 
-            lock (m_presenceLock)
+            m_scenePresencesLock.EnterWriteLock();
+            try
             {
                 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(m_scenePresenceMap);
                 List<ScenePresence> newlist = new List<ScenePresence>(m_scenePresenceArray);
@@ -652,6 +728,10 @@ namespace OpenSim.Region.Framework.Scenes
                     m_log.WarnFormat("[SCENE GRAPH]: Tried to remove non-existent scene presence with agent ID {0} from scene ScenePresences list", agentID);
                 }
             }
+            finally
+            {
+                m_scenePresencesLock.ExitWriteLock();
+            }
         }
 
         protected internal void SwapRootChildAgent(bool direction_RC_CR_T_F)
@@ -1205,6 +1285,52 @@ namespace OpenSim.Region.Framework.Scenes
 
         #region Client Event handlers
 
+        protected internal void ClientChangeObject(uint localID, object odata, IClientAPI remoteClient)
+        {
+            SceneObjectPart part = GetSceneObjectPart(localID);
+            ObjectChangeData data = (ObjectChangeData)odata;
+
+            if (part != null)
+            {
+                SceneObjectGroup grp = part.ParentGroup;
+                if (grp != null)
+                {
+                    if (m_parentScene.Permissions.CanEditObject(grp.UUID, remoteClient.AgentId))
+                    {
+                        // These two are exceptions SL makes in the interpretation
+                        // of the change flags. Must check them here because otherwise
+                        // the group flag (see below) would be lost
+                        if (data.change == ObjectChangeType.groupS)
+                            data.change = ObjectChangeType.primS;
+                        if (data.change == ObjectChangeType.groupPS)
+                            data.change = ObjectChangeType.primPS;
+                        part.StoreUndoState(data.change); // lets test only saving what we changed
+                        grp.doChangeObject(part, (ObjectChangeData)data);
+                    }
+                    else
+                    {
+                        // Is this any kind of group operation?
+                        if ((data.change & ObjectChangeType.Group) != 0)
+                        {
+                            // Is a move and/or rotation requested?
+                            if ((data.change & (ObjectChangeType.Position | ObjectChangeType.Rotation)) != 0)
+                            {
+                                // Are we allowed to move it?
+                                if (m_parentScene.Permissions.CanMoveObject(grp.UUID, remoteClient.AgentId))
+                                {
+                                    // Strip all but move and rotation from request
+                                    data.change &= (ObjectChangeType.Group | ObjectChangeType.Position | ObjectChangeType.Rotation);
+
+                                    part.StoreUndoState(data.change);
+                                    grp.doChangeObject(part, (ObjectChangeData)data);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
         /// <summary>
         /// Update the scale of an individual prim.
         /// </summary>
@@ -1219,7 +1345,17 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (m_parentScene.Permissions.CanEditObject(part.ParentGroup.UUID, remoteClient.AgentId))
                 {
+                    bool physbuild = false;
+                    if (part.ParentGroup.RootPart.PhysActor != null)
+                    {
+                        part.ParentGroup.RootPart.PhysActor.Building = true;
+                        physbuild = true;
+                    }
+
                     part.Resize(scale);
+
+                    if (physbuild)
+                        part.ParentGroup.RootPart.PhysActor.Building = false;
                 }
             }
         }
@@ -1231,7 +1367,17 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId))
                 {
+                    bool physbuild = false;
+                    if (group.RootPart.PhysActor != null)
+                    {
+                        group.RootPart.PhysActor.Building = true;
+                        physbuild = true;
+                    }
+
                     group.GroupResize(scale);
+
+                    if (physbuild)
+                        group.RootPart.PhysActor.Building = false;
                 }
             }
         }
@@ -1359,8 +1505,13 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (group.IsAttachment || (group.RootPart.Shape.PCode == 9 && group.RootPart.Shape.State != 0))
                 {
-                    if (m_parentScene.AttachmentsModule != null)
-                        m_parentScene.AttachmentsModule.UpdateAttachmentPosition(group, pos);
+                    // Set the new attachment point data in the object
+                    byte attachmentPoint = group.GetAttachmentPoint();
+                    group.UpdateGroupPosition(pos);
+                    group.IsAttachment = false;
+                    group.AbsolutePosition = group.RootPart.AttachedPos;
+                    group.AttachmentPoint = attachmentPoint;
+                    group.HasGroupChanged = true;
                 }
                 else
                 {
@@ -1581,6 +1732,7 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         part.Material = Convert.ToByte(material);
                         group.HasGroupChanged = true;
+                        remoteClient.SendPartPhysicsProprieties(part);
                     }
                 }
             }
@@ -1645,6 +1797,12 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="childPrims"></param>
         protected internal void LinkObjects(SceneObjectPart root, List<SceneObjectPart> children)
         {
+            if (root.KeyframeMotion != null)
+            {
+                root.KeyframeMotion.Stop();
+                root.KeyframeMotion = null;
+            }
+
             SceneObjectGroup parentGroup = root.ParentGroup;
             if (parentGroup == null) return;
 
@@ -1653,8 +1811,10 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
 
             Monitor.Enter(m_updateLock);
+
             try
             {
+
                 List<SceneObjectGroup> childGroups = new List<SceneObjectGroup>();
 
                 // We do this in reverse to get the link order of the prims correct
@@ -1669,9 +1829,13 @@ namespace OpenSim.Region.Framework.Scenes
                     // Make sure no child prim is set for sale
                     // So that, on delink, no prims are unwittingly
                     // left for sale and sold off
-                    child.RootPart.ObjectSaleType = 0;
-                    child.RootPart.SalePrice = 10;
-                    childGroups.Add(child);
+                   
+                    if (child != null)
+                    {
+                        child.RootPart.ObjectSaleType = 0;
+                        child.RootPart.SalePrice = 10;
+                        childGroups.Add(child);
+                    }
                 }
 
                 foreach (SceneObjectGroup child in childGroups)
@@ -1700,6 +1864,16 @@ namespace OpenSim.Region.Framework.Scenes
             }
             finally
             {
+                lock (SceneObjectGroupsByLocalPartID)
+                {
+                    foreach (SceneObjectPart part in parentGroup.Parts)
+                        SceneObjectGroupsByLocalPartID[part.LocalId] = parentGroup;
+                }
+
+                parentGroup.AdjustChildPrimPermissions();
+                parentGroup.HasGroupChanged = true;
+                parentGroup.ProcessBackup(m_parentScene.SimulationDataService, true);
+                parentGroup.ScheduleGroupForFullUpdate();
                 Monitor.Exit(m_updateLock);
             }
         }
@@ -1722,6 +1896,11 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     if (part != null)
                     {
+                        if (part.KeyframeMotion != null)
+                        {
+                            part.KeyframeMotion.Stop();
+                            part.KeyframeMotion = null;
+                        }
                         if (part.ParentGroup.PrimCount != 1) // Skip single
                         {
                             if (part.LinkNum < 2) // Root
@@ -1736,21 +1915,23 @@ namespace OpenSim.Region.Framework.Scenes
 
                             SceneObjectGroup group = part.ParentGroup;
                             if (!affectedGroups.Contains(group))
+                            {
                                 affectedGroups.Add(group);
+                            }
                         }
                     }
                 }
 
-                foreach (SceneObjectPart child in childParts)
+                if (childParts.Count > 0)
                 {
-                    // Unlink all child parts from their groups
-                    //
-                    child.ParentGroup.DelinkFromGroup(child, true);
-
-                    // These are not in affected groups and will not be
-                    // handled further. Do the honors here.
-                    child.ParentGroup.HasGroupChanged = true;
-                    child.ParentGroup.ScheduleGroupForFullUpdate();
+                    foreach (SceneObjectPart child in childParts)
+                    {
+                        // Unlink all child parts from their groups
+                        //
+                        child.ParentGroup.DelinkFromGroup(child, true);
+                        child.ParentGroup.HasGroupChanged = true;
+                        child.ParentGroup.ScheduleGroupForFullUpdate();
+                    }
                 }
 
                 foreach (SceneObjectPart root in rootParts)
@@ -1764,52 +1945,61 @@ namespace OpenSim.Region.Framework.Scenes
                     List<SceneObjectPart> newSet = new List<SceneObjectPart>(group.Parts);
                     int numChildren = newSet.Count;
 
+                    if (numChildren == 1)
+                        break;
+
                     // If there are prims left in a link set, but the root is
                     // slated for unlink, we need to do this
+                    // Unlink the remaining set
                     //
-                    if (numChildren != 1)
-                    {
-                        // Unlink the remaining set
-                        //
-                        bool sendEventsToRemainder = true;
-                        if (numChildren > 1)
-                            sendEventsToRemainder = false;
+                    bool sendEventsToRemainder = true;
+                    if (numChildren > 1)
+                        sendEventsToRemainder = false;
 
-                        foreach (SceneObjectPart p in newSet)
+                    foreach (SceneObjectPart p in newSet)
+                    {
+                        if (p != group.RootPart)
                         {
-                            if (p != group.RootPart)
-                                group.DelinkFromGroup(p, sendEventsToRemainder);
+                            group.DelinkFromGroup(p, sendEventsToRemainder);
+                            if (numChildren > 2)
+                            {
+                            }
+                            else
+                            {
+                                p.ParentGroup.HasGroupChanged = true;
+                                p.ParentGroup.ScheduleGroupForFullUpdate();
+                            }
                         }
+                    }
+
+                    // If there is more than one prim remaining, we
+                    // need to re-link
+                    //
+                    if (numChildren > 2)
+                    {
+                        // Remove old root
+                        //
+                        if (newSet.Contains(root))
+                            newSet.Remove(root);
 
-                        // If there is more than one prim remaining, we
-                        // need to re-link
+                        // Preserve link ordering
                         //
-                        if (numChildren > 2)
+                        newSet.Sort(delegate (SceneObjectPart a, SceneObjectPart b)
                         {
-                            // Remove old root
-                            //
-                            if (newSet.Contains(root))
-                                newSet.Remove(root);
-
-                            // Preserve link ordering
-                            //
-                            newSet.Sort(delegate (SceneObjectPart a, SceneObjectPart b)
-                            {
-                                return a.LinkNum.CompareTo(b.LinkNum);
-                            });
+                            return a.LinkNum.CompareTo(b.LinkNum);
+                        });
 
-                            // Determine new root
-                            //
-                            SceneObjectPart newRoot = newSet[0];
-                            newSet.RemoveAt(0);
+                        // Determine new root
+                        //
+                        SceneObjectPart newRoot = newSet[0];
+                        newSet.RemoveAt(0);
 
                             foreach (SceneObjectPart newChild in newSet)
                                 newChild.ClearUpdateSchedule();
 
-                            LinkObjects(newRoot, newSet);
-                            if (!affectedGroups.Contains(newRoot.ParentGroup))
-                                affectedGroups.Add(newRoot.ParentGroup);
-                        }
+                        LinkObjects(newRoot, newSet);
+                        if (!affectedGroups.Contains(newRoot.ParentGroup))
+                            affectedGroups.Add(newRoot.ParentGroup);
                     }
                 }
 
@@ -1817,6 +2007,12 @@ namespace OpenSim.Region.Framework.Scenes
                 //
                 foreach (SceneObjectGroup g in affectedGroups)
                 {
+                    // Child prims that have been unlinked and deleted will
+                    // return unless the root is deleted. This will remove them
+                    // from the database. They will be rewritten immediately,
+                    // minus the rows for the unlinked child prims.
+                    g.AdjustChildPrimPermissions();
+                    m_parentScene.SimulationDataService.RemoveObject(g.UUID, m_parentScene.RegionInfo.RegionID);
                     g.TriggerScriptChangedEvent(Changed.LINK);
                     g.HasGroupChanged = true; // Persist
                     g.ScheduleGroupForFullUpdate();
@@ -1890,108 +2086,96 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="GroupID"></param>
         /// <param name="rot"></param>
         /// <returns>null if duplication fails, otherwise the duplicated object</returns>
-        public SceneObjectGroup DuplicateObject(
-            uint originalPrimID, Vector3 offset, uint flags, UUID AgentID, UUID GroupID, Quaternion rot)
+        /// <summary>
+        public SceneObjectGroup DuplicateObject(uint originalPrimID, Vector3 offset, uint flags, UUID AgentID, UUID GroupID, Quaternion rot)
         {
-            Monitor.Enter(m_updateLock);
+//            m_log.DebugFormat(
+//                "[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}", 
+//                originalPrimID, offset, AgentID);
 
-            try
+            SceneObjectGroup original = GetGroupByPrim(originalPrimID);
+            if (original != null)
             {
-    //            m_log.DebugFormat(
-    //                "[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}",
-    //                originalPrimID, offset, AgentID);
-
-                SceneObjectGroup original = GetGroupByPrim(originalPrimID);
-                if (original == null)
+                if (m_parentScene.Permissions.CanDuplicateObject(
+                    original.PrimCount, original.UUID, AgentID, original.AbsolutePosition))
                 {
-                    m_log.WarnFormat(
-                        "[SCENEGRAPH]: Attempt to duplicate nonexistant prim id {0} by {1}", originalPrimID, AgentID);
+                    SceneObjectGroup copy = original.Copy(true);
+                    copy.AbsolutePosition = copy.AbsolutePosition + offset;
 
-                    return null;
-                }
+                    if (original.OwnerID != AgentID)
+                    {
+                        copy.SetOwnerId(AgentID);
+                        copy.SetRootPartOwner(copy.RootPart, AgentID, GroupID);
 
-                if (!m_parentScene.Permissions.CanDuplicateObject(
-                    original.PrimCount, original.UUID, AgentID, original.AbsolutePosition))
-                    return null;
+                        SceneObjectPart[] partList = copy.Parts;
+
+                        if (m_parentScene.Permissions.PropagatePermissions())
+                        {
+                            foreach (SceneObjectPart child in partList)
+                            {
+                                child.Inventory.ChangeInventoryOwner(AgentID);
+                                child.TriggerScriptChangedEvent(Changed.OWNER);
+                                child.ApplyNextOwnerPermissions();
+                            }
+                        }
+                    }
 
-                SceneObjectGroup copy = original.Copy(true);
-                copy.AbsolutePosition = copy.AbsolutePosition + offset;
+                    // FIXME: This section needs to be refactored so that it just calls AddSceneObject()
+                    Entities.Add(copy);
 
-                if (original.OwnerID != AgentID)
-                {
-                    copy.SetOwnerId(AgentID);
-                    copy.SetRootPartOwner(copy.RootPart, AgentID, GroupID);
+                    lock (SceneObjectGroupsByFullID)
+                        SceneObjectGroupsByFullID[copy.UUID] = copy;
 
-                    SceneObjectPart[] partList = copy.Parts;
+                    SceneObjectPart[] children = copy.Parts;
 
-                    if (m_parentScene.Permissions.PropagatePermissions())
+                    lock (SceneObjectGroupsByFullPartID)
                     {
-                        foreach (SceneObjectPart child in partList)
-                        {
-                            child.Inventory.ChangeInventoryOwner(AgentID);
-                            child.TriggerScriptChangedEvent(Changed.OWNER);
-                            child.ApplyNextOwnerPermissions();
-                        }
+                        SceneObjectGroupsByFullPartID[copy.UUID] = copy;
+                        foreach (SceneObjectPart part in children)
+                            SceneObjectGroupsByFullPartID[part.UUID] = copy;
                     }
 
-                    copy.RootPart.ObjectSaleType = 0;
-                    copy.RootPart.SalePrice = 10;
-                }
+                    lock (SceneObjectGroupsByLocalPartID)
+                    {
+                        SceneObjectGroupsByLocalPartID[copy.LocalId] = copy;
+                        foreach (SceneObjectPart part in children)
+                            SceneObjectGroupsByLocalPartID[part.LocalId] = copy;
+                    }
+                    // PROBABLE END OF FIXME
 
-                // FIXME: This section needs to be refactored so that it just calls AddSceneObject()
-                Entities.Add(copy);
-                
-                lock (SceneObjectGroupsByFullID)
-                    SceneObjectGroupsByFullID[copy.UUID] = copy;
-                
-                SceneObjectPart[] children = copy.Parts;
-                
-                lock (SceneObjectGroupsByFullPartID)
-                {
-                    SceneObjectGroupsByFullPartID[copy.UUID] = copy;
-                    foreach (SceneObjectPart part in children)
-                        SceneObjectGroupsByFullPartID[part.UUID] = copy;
-                }
-    
-                lock (SceneObjectGroupsByLocalPartID)
-                {
-                    SceneObjectGroupsByLocalPartID[copy.LocalId] = copy;
-                    foreach (SceneObjectPart part in children)
-                        SceneObjectGroupsByLocalPartID[part.LocalId] = copy;
-                }   
-                // PROBABLE END OF FIXME
-
-                // Since we copy from a source group that is in selected
-                // state, but the copy is shown deselected in the viewer,
-                // We need to clear the selection flag here, else that
-                // prim never gets persisted at all. The client doesn't
-                // think it's selected, so it will never send a deselect...
-                copy.IsSelected = false;
-
-                m_numPrim += copy.Parts.Length;
-
-                if (rot != Quaternion.Identity)
-                {
-                    copy.UpdateGroupRotationR(rot);
-                }
+                    // Since we copy from a source group that is in selected
+                    // state, but the copy is shown deselected in the viewer,
+                    // We need to clear the selection flag here, else that
+                    // prim never gets persisted at all. The client doesn't
+                    // think it's selected, so it will never send a deselect...
+                    copy.IsSelected = false;
+
+                    m_numPrim += copy.Parts.Length;
+
+                    if (rot != Quaternion.Identity)
+                    {
+                        copy.UpdateGroupRotationR(rot);
+                    }
 
-                copy.CreateScriptInstances(0, false, m_parentScene.DefaultScriptEngine, 1);
-                copy.HasGroupChanged = true;
-                copy.ScheduleGroupForFullUpdate();
-                copy.ResumeScripts();
+                    copy.CreateScriptInstances(0, false, m_parentScene.DefaultScriptEngine, 1);
+                    copy.HasGroupChanged = true;
+                    copy.ScheduleGroupForFullUpdate();
+                    copy.ResumeScripts();
 
-                // required for physics to update it's position
-                copy.AbsolutePosition = copy.AbsolutePosition;
+                    // required for physics to update it's position
+                    copy.AbsolutePosition = copy.AbsolutePosition;
 
-                return copy;
+                    return copy;
+                }
             }
-            finally
+            else
             {
-                Monitor.Exit(m_updateLock);
+                m_log.WarnFormat("[SCENE]: Attempted to duplicate nonexistant prim id {0}", GroupID);
             }
+
+            return null;
         }
-        
-        /// <summary>
+
         /// Calculates the distance between two Vector3s
         /// </summary>
         /// <param name="v1"></param>
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index 1e2e973..0e0b6c3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -99,11 +99,12 @@ namespace OpenSim.Region.Framework.Scenes
             } 
         }
 
-        private readonly List<Scene> m_localScenes = new List<Scene>();
+        private readonly DoubleDictionary<UUID, string, Scene> m_localScenes = new DoubleDictionary<UUID, string, Scene>();
+        private Scene m_currentScene = null;
 
         public List<Scene> Scenes
         {
-            get { return new List<Scene>(m_localScenes); }
+            get { return new List<Scene>(m_localScenes.FindAll(delegate(Scene s) { return true; })); }
         }
 
         /// <summary>
@@ -120,13 +121,10 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (CurrentScene == null)
                 {
-                    lock (m_localScenes)
-                    {
-                        if (m_localScenes.Count > 0)
-                            return m_localScenes[0];
-                        else
-                            return null;
-                    }
+                    List<Scene> sceneList = Scenes;
+                    if (sceneList.Count == 0)
+                        return null;
+                    return sceneList[0];
                 }
                 else
                 {
@@ -138,41 +136,35 @@ namespace OpenSim.Region.Framework.Scenes
         public SceneManager()
         {
             m_instance = this;
-            m_localScenes = new List<Scene>();
+            m_localScenes = new DoubleDictionary<UUID, string, Scene>();
         }
 
         public void Close()
         {
+            List<Scene> localScenes = null;
+
             lock (m_localScenes)
             {
-                for (int i = 0; i < m_localScenes.Count; i++)
-                {
-                    m_localScenes[i].Close();
-                }
+                localScenes = Scenes;
+            }
+
+            for (int i = 0; i < localScenes.Count; i++)
+            {
+                localScenes[i].Close();
             }
         }
 
         public void Close(Scene cscene)
         {
-            lock (m_localScenes)
-            {
-                if (m_localScenes.Contains(cscene))
-                {
-                    for (int i = 0; i < m_localScenes.Count; i++)
-                    {
-                        if (m_localScenes[i].Equals(cscene))
-                        {
-                            m_localScenes[i].Close();
-                        }
-                    }
-                }
-            }
+            if (!m_localScenes.ContainsKey(cscene.RegionInfo.RegionID))
+                return;
+            cscene.Close();
         }
 
         public void Add(Scene scene)
         {
             lock (m_localScenes)
-                m_localScenes.Add(scene);
+                m_localScenes.Add(scene.RegionInfo.RegionID, scene.RegionInfo.RegionName, scene);
 
             scene.OnRestart += HandleRestart;
             scene.EventManager.OnRegionReadyStatusChange += HandleRegionReadyStatusChange;
@@ -184,15 +176,8 @@ namespace OpenSim.Region.Framework.Scenes
 
             lock (m_localScenes)
             {
-                for (int i = 0; i < m_localScenes.Count; i++)
-                {
-                    if (rdata.RegionName == m_localScenes[i].RegionInfo.RegionName)
-                    {
-                        restartedScene = m_localScenes[i];
-                        m_localScenes.RemoveAt(i);
-                        break;
-                    }
-                }
+                m_localScenes.TryGetValue(rdata.RegionID, out restartedScene);
+                m_localScenes.Remove(rdata.RegionID);
             }
 
             // If the currently selected scene has been restarted, then we can't reselect here since we the scene
@@ -207,39 +192,36 @@ namespace OpenSim.Region.Framework.Scenes
         private void HandleRegionReadyStatusChange(IScene scene)
         {
             lock (m_localScenes)
-                AllRegionsReady = m_localScenes.TrueForAll(s => s.Ready);
+                AllRegionsReady = m_localScenes.FindAll(s => !s.Ready).Count == 0;
         }
 
         public void SendSimOnlineNotification(ulong regionHandle)
         {
             RegionInfo Result = null;
 
-            lock (m_localScenes)
-            {
-                for (int i = 0; i < m_localScenes.Count; i++)
-                {
-                    if (m_localScenes[i].RegionInfo.RegionHandle == regionHandle)
+            Scene s = m_localScenes.FindValue(delegate(Scene x)
                     {
-                        // Inform other regions to tell their avatar about me
-                        Result = m_localScenes[i].RegionInfo;
-                    }
-                }
+                        if (x.RegionInfo.RegionHandle == regionHandle)
+                            return true;
+                        return false;
+                    });
+
+            if (s != null)
+            {
+                List<Scene> sceneList = Scenes;
 
-                if (Result != null)
+                for (int i = 0; i < sceneList.Count; i++)
                 {
-                    for (int i = 0; i < m_localScenes.Count; i++)
+                    if (sceneList[i]!= s)
                     {
-                        if (m_localScenes[i].RegionInfo.RegionHandle != regionHandle)
-                        {
-                            // Inform other regions to tell their avatar about me
-                            //m_localScenes[i].OtherRegionUp(Result);
-                        }
+                        // Inform other regions to tell their avatar about me
+                        //sceneList[i].OtherRegionUp(Result);
                     }
                 }
-                else
-                {
-                    m_log.Error("[REGION]: Unable to notify Other regions of this Region coming up");
-                }
+            }
+            else
+            {
+                m_log.Error("[REGION]: Unable to notify Other regions of this Region coming up");
             }
         }
 
@@ -343,8 +325,8 @@ namespace OpenSim.Region.Framework.Scenes
         {
             if (CurrentScene == null)
             {
-                lock (m_localScenes)
-                    m_localScenes.ForEach(func);
+                List<Scene> sceneList = Scenes;
+                sceneList.ForEach(func);
             }
             else
             {
@@ -373,16 +355,12 @@ namespace OpenSim.Region.Framework.Scenes
             }
             else
             {
-                lock (m_localScenes)
+                Scene s;
+
+                if (m_localScenes.TryGetValue(regionName, out s))
                 {
-                    foreach (Scene scene in m_localScenes)
-                    {
-                        if (String.Compare(scene.RegionInfo.RegionName, regionName, true) == 0)
-                        {
-                            CurrentScene = scene;
-                            return true;
-                        }
-                    }
+                    m_currentScene = s;
+                    return true;
                 }
 
                 return false;
@@ -391,18 +369,14 @@ namespace OpenSim.Region.Framework.Scenes
 
         public bool TrySetCurrentScene(UUID regionID)
         {
-            m_log.Debug("Searching for Region: '" + regionID + "'");
+//            m_log.Debug("Searching for Region: '" + regionID + "'");
 
-            lock (m_localScenes)
+            Scene s;
+
+            if (m_localScenes.TryGetValue(regionID, out s))
             {
-                foreach (Scene scene in m_localScenes)
-                {
-                    if (scene.RegionInfo.RegionID == regionID)
-                    {
-                        CurrentScene = scene;
-                        return true;
-                    }
-                }
+                m_currentScene = s;
+                return true;
             }
 
             return false;
@@ -410,52 +384,24 @@ namespace OpenSim.Region.Framework.Scenes
 
         public bool TryGetScene(string regionName, out Scene scene)
         {
-            lock (m_localScenes)
-            {
-                foreach (Scene mscene in m_localScenes)
-                {
-                    if (String.Compare(mscene.RegionInfo.RegionName, regionName, true) == 0)
-                    {
-                        scene = mscene;
-                        return true;
-                    }
-                }
-            }
-
-            scene = null;
-            return false;
+            return m_localScenes.TryGetValue(regionName, out scene);
         }
 
         public bool TryGetScene(UUID regionID, out Scene scene)
         {
-            lock (m_localScenes)
-            {
-                foreach (Scene mscene in m_localScenes)
-                {
-                    if (mscene.RegionInfo.RegionID == regionID)
-                    {
-                        scene = mscene;
-                        return true;
-                    }
-                }
-            }
-            
-            scene = null;
-            return false;
+            return m_localScenes.TryGetValue(regionID, out scene);
         }
 
         public bool TryGetScene(uint locX, uint locY, out Scene scene)
         {
-            lock (m_localScenes)
+            List<Scene> sceneList = Scenes;
+            foreach (Scene mscene in sceneList)
             {
-                foreach (Scene mscene in m_localScenes)
+                if (mscene.RegionInfo.RegionLocX == locX &&
+                    mscene.RegionInfo.RegionLocY == locY)
                 {
-                    if (mscene.RegionInfo.RegionLocX == locX &&
-                        mscene.RegionInfo.RegionLocY == locY)
-                    {
-                        scene = mscene;
-                        return true;
-                    }
+                    scene = mscene;
+                    return true;
                 }
             }
             
@@ -465,16 +411,14 @@ namespace OpenSim.Region.Framework.Scenes
 
         public bool TryGetScene(IPEndPoint ipEndPoint, out Scene scene)
         {
-            lock (m_localScenes)
+            List<Scene> sceneList = Scenes;
+            foreach (Scene mscene in sceneList)
             {
-                foreach (Scene mscene in m_localScenes)
+                if ((mscene.RegionInfo.InternalEndPoint.Equals(ipEndPoint.Address)) &&
+                    (mscene.RegionInfo.InternalEndPoint.Port == ipEndPoint.Port))
                 {
-                    if ((mscene.RegionInfo.InternalEndPoint.Equals(ipEndPoint.Address)) &&
-                        (mscene.RegionInfo.InternalEndPoint.Port == ipEndPoint.Port))
-                    {
-                        scene = mscene;
-                        return true;
-                    }
+                    scene = mscene;
+                    return true;
                 }
             }
             
@@ -539,15 +483,10 @@ namespace OpenSim.Region.Framework.Scenes
 
         public RegionInfo GetRegionInfo(UUID regionID)
         {
-            lock (m_localScenes)
+            Scene s;
+            if (m_localScenes.TryGetValue(regionID, out s))
             {
-                foreach (Scene scene in m_localScenes)
-                {
-                    if (scene.RegionInfo.RegionID == regionID)
-                    {
-                        return scene.RegionInfo;
-                    }
-                }
+                return s.RegionInfo;
             }
 
             return null;
@@ -565,14 +504,12 @@ namespace OpenSim.Region.Framework.Scenes
 
         public bool TryGetScenePresence(UUID avatarId, out ScenePresence avatar)
         {
-            lock (m_localScenes)
+            List<Scene> sceneList = Scenes;
+            foreach (Scene scene in sceneList)
             {
-                foreach (Scene scene in m_localScenes)
+                if (scene.TryGetScenePresence(avatarId, out avatar))
                 {
-                    if (scene.TryGetScenePresence(avatarId, out avatar))
-                    {
-                        return true;
-                    }
+                    return true;
                 }
             }
 
@@ -582,15 +519,13 @@ namespace OpenSim.Region.Framework.Scenes
 
         public bool TryGetRootScenePresence(UUID avatarId, out ScenePresence avatar)
         {
-            lock (m_localScenes)
+            List<Scene> sceneList = Scenes;
+            foreach (Scene scene in sceneList)
             {
-                foreach (Scene scene in m_localScenes)
-                {
-                    avatar = scene.GetScenePresence(avatarId);
+                avatar = scene.GetScenePresence(avatarId);
 
-                    if (avatar != null && !avatar.IsChildAgent)
-                        return true;
-                }
+                if (avatar != null && !avatar.IsChildAgent)
+                    return true;
             }
 
             avatar = null;
@@ -600,21 +535,19 @@ namespace OpenSim.Region.Framework.Scenes
         public void CloseScene(Scene scene)
         {
             lock (m_localScenes)
-                m_localScenes.Remove(scene);
+                m_localScenes.Remove(scene.RegionInfo.RegionID);
 
             scene.Close();
         }
 
         public bool TryGetAvatarByName(string avatarName, out ScenePresence avatar)
         {
-            lock (m_localScenes)
+            List<Scene> sceneList = Scenes;
+            foreach (Scene scene in sceneList)
             {
-                foreach (Scene scene in m_localScenes)
+                if (scene.TryGetAvatarByName(avatarName, out avatar))
                 {
-                    if (scene.TryGetAvatarByName(avatarName, out avatar))
-                    {
-                        return true;
-                    }
+                    return true;
                 }
             }
 
@@ -624,14 +557,12 @@ namespace OpenSim.Region.Framework.Scenes
 
         public bool TryGetRootScenePresenceByName(string firstName, string lastName, out ScenePresence sp)
         {
-            lock (m_localScenes)
+            List<Scene> sceneList = Scenes;
+            foreach (Scene scene in sceneList)
             {
-                foreach (Scene scene in m_localScenes)
-                {
-                    sp = scene.GetScenePresence(firstName, lastName);
-                    if (sp != null && !sp.IsChildAgent)
-                        return true;
-                }
+                sp = scene.GetScenePresence(firstName, lastName);
+                if (sp != null && !sp.IsChildAgent)
+                    return true;
             }
 
             sp = null;
@@ -640,8 +571,8 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void ForEachScene(Action<Scene> action)
         {
-            lock (m_localScenes)
-                m_localScenes.ForEach(action);
+            List<Scene> sceneList = Scenes;
+            sceneList.ForEach(action);
         }
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index ddf5da0..26524fb 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -81,10 +81,6 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Stop and remove the scripts contained in all the prims in this group
         /// </summary>
-        /// <param name="sceneObjectBeingDeleted">
-        /// Should be true if these scripts are being removed because the scene
-        /// object is being deleted.  This will prevent spurious updates to the client.
-        /// </param>
         public void RemoveScriptInstances(bool sceneObjectBeingDeleted)
         {
             SceneObjectPart[] parts = m_parts.GetArray();
@@ -247,6 +243,11 @@ namespace OpenSim.Region.Framework.Scenes
 
         public uint GetEffectivePermissions()
         {
+            return GetEffectivePermissions(false);
+        }
+
+        public uint GetEffectivePermissions(bool useBase)
+        {
             uint perms=(uint)(PermissionMask.Modify |
                               PermissionMask.Copy |
                               PermissionMask.Move |
@@ -258,7 +259,10 @@ namespace OpenSim.Region.Framework.Scenes
             for (int i = 0; i < parts.Length; i++)
             {
                 SceneObjectPart part = parts[i];
-                ownerMask &= part.OwnerMask;
+                if (useBase)
+                    ownerMask &= part.BaseMask;
+                else
+                    ownerMask &= part.OwnerMask;
                 perms &= part.Inventory.MaskEffectivePermissions();
             }
 
@@ -400,6 +404,9 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void ResumeScripts()
         {
+            if (m_scene.RegionInfo.RegionSettings.DisableScripts)
+                return;
+
             SceneObjectPart[] parts = m_parts.GetArray();
             for (int i = 0; i < parts.Length; i++)
                 parts[i].Inventory.ResumeScripts();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 15795e5..0f5d116 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -24,12 +24,13 @@
  * (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.ComponentModel;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Xml;
@@ -43,6 +44,7 @@ using OpenSim.Region.Framework.Scenes.Serialization;
 
 namespace OpenSim.Region.Framework.Scenes
 {
+    
     [Flags]
     public enum scriptEvents
     {
@@ -77,14 +79,14 @@ namespace OpenSim.Region.Framework.Scenes
         object_rez = 4194304
     }
 
-    struct scriptPosTarget
+    public struct scriptPosTarget
     {
         public Vector3 targetPos;
         public float tolerance;
         public uint handle;
     }
 
-    struct scriptRotTarget
+    public struct scriptRotTarget
     {
         public Quaternion targetRot;
         public float tolerance;
@@ -115,8 +117,12 @@ namespace OpenSim.Region.Framework.Scenes
         /// since the group's last persistent backup
         /// </summary>
         private bool m_hasGroupChanged = false;
-        private long timeFirstChanged;
-        private long timeLastChanged;
+        private long timeFirstChanged = 0;
+        private long timeLastChanged = 0;
+        private long m_maxPersistTime = 0;
+        private long m_minPersistTime = 0;
+//        private Random m_rand;
+        private List<ScenePresence> m_linkedAvatars = new List<ScenePresence>();
 
         /// <summary>
         /// This indicates whether the object has changed such that it needs to be repersisted to permenant storage
@@ -133,9 +139,44 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (value)
                 {
+                    
+                    if (m_isBackedUp)
+                    {
+                        m_scene.SceneGraph.FireChangeBackup(this);
+                    }
                     timeLastChanged = DateTime.Now.Ticks;
                     if (!m_hasGroupChanged)
                         timeFirstChanged = DateTime.Now.Ticks;
+                    if (m_rootPart != null && m_rootPart.UUID != null && m_scene != null)
+                    {
+/*
+                        if (m_rand == null)
+                        {
+                            byte[] val = new byte[16];
+                            m_rootPart.UUID.ToBytes(val, 0);
+                            m_rand = new Random(BitConverter.ToInt32(val, 0));
+                        }
+ */
+                        if (m_scene.GetRootAgentCount() == 0)
+                        {
+                            //If the region is empty, this change has been made by an automated process
+                            //and thus we delay the persist time by a random amount between 1.5 and 2.5.
+
+//                            float factor = 1.5f + (float)(m_rand.NextDouble());
+                            float factor = 2.0f;
+                            m_maxPersistTime = (long)((float)m_scene.m_persistAfter * factor);
+                            m_minPersistTime = (long)((float)m_scene.m_dontPersistBefore * factor);
+                        }
+                        else
+                        {
+                            //If the region is not empty, we want to obey the minimum and maximum persist times
+                            //but add a random factor so we stagger the object persistance a little
+//                            m_maxPersistTime = (long)((float)m_scene.m_persistAfter * (1.0d - (m_rand.NextDouble() / 5.0d))); //Multiply by 1.0-1.5
+//                            m_minPersistTime = (long)((float)m_scene.m_dontPersistBefore * (1.0d + (m_rand.NextDouble() / 2.0d))); //Multiply by 0.8-1.0
+                            m_maxPersistTime = m_scene.m_persistAfter;
+                            m_minPersistTime = m_scene.m_dontPersistBefore;
+                        }
+                    }
                 }
                 m_hasGroupChanged = value;
                 
@@ -150,7 +191,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// Has the group changed due to an unlink operation?  We record this in order to optimize deletion, since
         /// an unlinked group currently has to be persisted to the database before we can perform an unlink operation.
         /// </summary>
-        public bool HasGroupChangedDueToDelink { get; private set; }
+        public bool HasGroupChangedDueToDelink { get; set; }
 
         private bool isTimeToPersist()
         {
@@ -160,8 +201,19 @@ namespace OpenSim.Region.Framework.Scenes
                 return false;
             if (m_scene.ShuttingDown)
                 return true;
+
+            if (m_minPersistTime == 0 || m_maxPersistTime == 0)
+            {
+                m_maxPersistTime = m_scene.m_persistAfter;
+                m_minPersistTime = m_scene.m_dontPersistBefore;
+            }
+                
             long currentTime = DateTime.Now.Ticks;
-            if (currentTime - timeLastChanged > m_scene.m_dontPersistBefore || currentTime - timeFirstChanged > m_scene.m_persistAfter)
+
+            if (timeLastChanged == 0) timeLastChanged = currentTime;
+            if (timeFirstChanged == 0) timeFirstChanged = currentTime;
+
+            if (currentTime - timeLastChanged > m_minPersistTime || currentTime - timeFirstChanged > m_maxPersistTime)
                 return true;
             return false;
         }
@@ -264,26 +316,38 @@ namespace OpenSim.Region.Framework.Scenes
             get { return RootPart.VolumeDetectActive; }
         }
 
-        private Vector3 lastPhysGroupPos;
-        private Quaternion lastPhysGroupRot;
-
         private bool m_isBackedUp;
 
+        public bool IsBackedUp
+        {
+            get { return m_isBackedUp; }
+        }
+
         protected MapAndArray<UUID, SceneObjectPart> m_parts = new MapAndArray<UUID, SceneObjectPart>();
 
         protected ulong m_regionHandle;
         protected SceneObjectPart m_rootPart;
         // private Dictionary<UUID, scriptEvents> m_scriptEvents = new Dictionary<UUID, scriptEvents>();
 
-        private Dictionary<uint, scriptPosTarget> m_targets = new Dictionary<uint, scriptPosTarget>();
-        private Dictionary<uint, scriptRotTarget> m_rotTargets = new Dictionary<uint, scriptRotTarget>();
+        private SortedDictionary<uint, scriptPosTarget> m_targets = new SortedDictionary<uint, scriptPosTarget>();
+        private SortedDictionary<uint, scriptRotTarget> m_rotTargets = new SortedDictionary<uint, scriptRotTarget>();
+
+        public SortedDictionary<uint, scriptPosTarget> AtTargets
+        {
+            get { return m_targets; }
+        }
+
+        public SortedDictionary<uint, scriptRotTarget> RotTargets
+        {
+            get { return m_rotTargets; }
+        }
 
         private bool m_scriptListens_atTarget;
         private bool m_scriptListens_notAtTarget;
-
         private bool m_scriptListens_atRotTarget;
         private bool m_scriptListens_notAtRotTarget;
 
+        public bool m_dupeInProgress = false;
         internal Dictionary<UUID, string> m_savedScriptState;
 
         #region Properties
@@ -320,6 +384,16 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_parts.Count; }
         }
 
+//        protected Quaternion m_rotation = Quaternion.Identity;
+//
+//        public virtual Quaternion Rotation
+//        {
+//            get { return m_rotation; }
+//            set {
+//                m_rotation = value; 
+//            }
+//        }
+
         public Quaternion GroupRotation
         {
             get { return m_rootPart.RotationOffset; }
@@ -426,7 +500,15 @@ namespace OpenSim.Region.Framework.Scenes
         {
             return (IsAttachment || (m_rootPart.Shape.PCode == 9 && m_rootPart.Shape.State != 0));
         }
-        
+
+
+
+        private struct avtocrossInfo
+        {
+            public ScenePresence av;
+            public uint ParentID;
+        }
+
         /// <summary>
         /// The absolute position of this scene object in the scene
         /// </summary>
@@ -454,10 +536,129 @@ namespace OpenSim.Region.Framework.Scenes
                             || Scene.TestBorderCross(val, Cardinals.S))
                         && !IsAttachmentCheckFull() && (!Scene.LoadingPrims))
                     {
-                        m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
+                        IEntityTransferModule entityTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
+                        uint x = 0;
+                        uint y = 0;
+                        string version = String.Empty;
+                        Vector3 newpos = Vector3.Zero;
+                        OpenSim.Services.Interfaces.GridRegion destination = null;
+
+                        if (m_rootPart.KeyframeMotion != null)
+                            m_rootPart.KeyframeMotion.StartCrossingCheck();
+
+                        bool canCross = true;
+                        foreach (ScenePresence av in m_linkedAvatars)
+                        {
+                            // We need to cross these agents. First, let's find
+                            // out if any of them can't cross for some reason.
+                            // We have to deny the crossing entirely if any
+                            // of them are banned. Alternatively, we could
+                            // unsit banned agents....
+
+
+                            // We set the avatar position as being the object
+                            // position to get the region to send to
+                            if ((destination = entityTransfer.GetDestination(m_scene, av.UUID, val, out x, out y, out version, out newpos)) == null)
+                            {
+                                canCross = false;
+                                break;
+                            }
+
+                            m_log.DebugFormat("[SCENE OBJECT]: Avatar {0} needs to be crossed to {1}", av.Name, destination.RegionName);
+                        }
+
+                        if (canCross)
+                        {
+                            // We unparent the SP quietly so that it won't
+                            // be made to stand up
+
+                            List<avtocrossInfo> avsToCross = new List<avtocrossInfo>();
+
+                            foreach (ScenePresence av in m_linkedAvatars)
+                            {
+                                avtocrossInfo avinfo = new avtocrossInfo();
+                                SceneObjectPart parentPart = m_scene.GetSceneObjectPart(av.ParentID);
+                                if (parentPart != null)
+                                    av.ParentUUID = parentPart.UUID;
+
+                                avinfo.av = av;
+                                avinfo.ParentID = av.ParentID;
+                                avsToCross.Add(avinfo);
+
+                                av.ParentID = 0;
+                            }
+
+                            //                            m_linkedAvatars.Clear();
+                            m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
+
+                            // Normalize
+                            if (val.X >= Constants.RegionSize)
+                                val.X -= Constants.RegionSize;
+                            if (val.Y >= Constants.RegionSize)
+                                val.Y -= Constants.RegionSize;
+                            if (val.X < 0)
+                                val.X += Constants.RegionSize;
+                            if (val.Y < 0)
+                                val.Y += Constants.RegionSize;
+
+                            // If it's deleted, crossing was successful
+                            if (IsDeleted)
+                            {
+                                //                                foreach (ScenePresence av in m_linkedAvatars)
+                                foreach (avtocrossInfo avinfo in avsToCross)
+                                {
+                                    ScenePresence av = avinfo.av;
+                                    if (!av.IsInTransit) // just in case...
+                                    {
+                                        m_log.DebugFormat("[SCENE OBJECT]: Crossing avatar {0} to {1}", av.Name, val);
+
+                                        av.IsInTransit = true;
+
+                                        CrossAgentToNewRegionDelegate d = entityTransfer.CrossAgentToNewRegionAsync;
+                                        d.BeginInvoke(av, val, destination, av.Flying, version, CrossAgentToNewRegionCompleted, d);
+                                    }
+                                    else
+                                        m_log.DebugFormat("[SCENE OBJECT]: Crossing avatar alreasy in transit {0} to {1}", av.Name, val);
+                                }
+                                avsToCross.Clear();
+                                return;
+                            }
+                            else // cross failed, put avas back ??
+                            {
+                                foreach (avtocrossInfo avinfo in avsToCross)
+                                {
+                                    ScenePresence av = avinfo.av;
+                                    av.ParentUUID = UUID.Zero;
+                                    av.ParentID = avinfo.ParentID;
+//                                    m_linkedAvatars.Add(av);
+                                }
+                            }
+                            avsToCross.Clear();
+
+                        }
+                        else
+                        {
+                            if (m_rootPart.KeyframeMotion != null)
+                                m_rootPart.KeyframeMotion.CrossingFailure();
+
+                            if (RootPart.PhysActor != null)
+                            {
+                                RootPart.PhysActor.CrossingFailure();
+                            }
+                        }
+                        Vector3 oldp = AbsolutePosition;
+                        val.X = Util.Clamp<float>(oldp.X, 0.5f, (float)Constants.RegionSize - 0.5f);
+                        val.Y = Util.Clamp<float>(oldp.Y, 0.5f, (float)Constants.RegionSize - 0.5f);
+                        val.Z = Util.Clamp<float>(oldp.Z, 0.5f, 4096.0f);
                     }
                 }
-                
+
+/* don't see the need but worse don't see where is restored to false if things stay in
+                foreach (SceneObjectPart part in m_parts.GetArray())
+                {
+                    part.IgnoreUndoUpdate = true;
+                }
+ */
                 if (RootPart.GetStatusSandbox())
                 {
                     if (Util.GetDistanceTo(RootPart.StatusSandboxPos, value) > 10)
@@ -475,9 +676,38 @@ namespace OpenSim.Region.Framework.Scenes
                 // Restuff the new GroupPosition into each SOP of the linkset.
                 //    This has the affect of resetting and tainting the physics actors.
                 SceneObjectPart[] parts = m_parts.GetArray();
-                for (int i = 0; i < parts.Length; i++)
-                    parts[i].GroupPosition = val;
+                bool triggerScriptEvent = m_rootPart.GroupPosition != val;
+                if (m_dupeInProgress)
+                    triggerScriptEvent = false;
+                foreach (SceneObjectPart part in parts)
+                {
+                    part.GroupPosition = val;
+                    if (triggerScriptEvent)
+                        part.TriggerScriptChangedEvent(Changed.POSITION);
+                }
 
+/*
+    This seems not needed and should not be needed:
+    sp absolute position depends on sit part absolute position fixed above.
+    sp ParentPosition is not used anywhere.
+    Since presence is sitting, viewer considers it 'linked' to root prim, so it will move/rotate it
+    Sending a extra packet with avatar position is not only bandwidth waste, but may cause jitter in viewers due to UPD nature.
+ 
+                if (!m_dupeInProgress)
+                {
+                    foreach (ScenePresence av in m_linkedAvatars)
+                    {
+                        SceneObjectPart p = m_scene.GetSceneObjectPart(av.ParentID);
+                        if (p != null && m_parts.TryGetValue(p.UUID, out p))
+                        {
+                            Vector3 offset = p.GetWorldPosition() - av.ParentPosition;
+                            av.AbsolutePosition += offset;
+//                            av.ParentPosition = p.GetWorldPosition(); //ParentPosition gets cleared by AbsolutePosition
+                            av.SendAvatarDataToAllAgents();
+                        }
+                    }
+                }
+*/
                 //if (m_rootPart.PhysActor != null)
                 //{
                 //m_rootPart.PhysActor.Position =
@@ -491,6 +721,40 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        public override Vector3 Velocity
+        {
+            get { return RootPart.Velocity; }
+            set { RootPart.Velocity = value; }
+        }
+
+        private void CrossAgentToNewRegionCompleted(IAsyncResult iar)
+        {
+            CrossAgentToNewRegionDelegate icon = (CrossAgentToNewRegionDelegate)iar.AsyncState;
+            ScenePresence agent = icon.EndInvoke(iar);
+
+            //// If the cross was successful, this agent is a child agent
+            if (agent.IsChildAgent)
+            {
+                if (agent.ParentUUID != UUID.Zero)
+                {
+                    agent.ParentPart = null;
+//                    agent.ParentPosition = Vector3.Zero;
+//                    agent.ParentUUID = UUID.Zero;
+                }
+            }
+
+            agent.ParentUUID = UUID.Zero;
+
+//                agent.Reset();
+//            else // Not successful
+//                agent.RestoreInCurrentScene();
+
+            // In any case
+            agent.IsInTransit = false;
+
+            m_log.DebugFormat("[SCENE OBJECT]: Crossing agent {0} {1} completed.", agent.Firstname, agent.Lastname);
+        }
+
         public override uint LocalId
         {
             get { return m_rootPart.LocalId; }
@@ -561,6 +825,11 @@ namespace OpenSim.Region.Framework.Scenes
                 m_isSelected = value;
                 // Tell physics engine that group is selected
 
+                // this is not right
+                // but ode engines should only really need to know about root part
+                // so they can put entire object simulation on hold and not colliding
+                // keep as was for now
+                
                 PhysicsActor pa = m_rootPart.PhysActor;
                 if (pa != null)
                 {
@@ -577,6 +846,42 @@ namespace OpenSim.Region.Framework.Scenes
                             childPa.Selected = value;
                     }
                 }
+                if (RootPart.KeyframeMotion != null)
+                    RootPart.KeyframeMotion.Selected = value;
+            }
+        }
+
+        public void PartSelectChanged(bool partSelect)
+        {
+            // any part selected makes group selected
+            if (m_isSelected == partSelect)
+                return;
+
+            if (partSelect)
+            {
+                IsSelected = partSelect;
+//                if (!IsAttachment)
+//                    ScheduleGroupForFullUpdate();
+            }
+            else
+            {
+                // bad bad bad 2 heavy for large linksets
+                // since viewer does send lot of (un)selects
+                // this needs to be replaced by a specific list or count ?
+                // but that will require extra code in several places
+
+                SceneObjectPart[] parts = m_parts.GetArray();
+                for (int i = 0; i < parts.Length; i++)
+                {
+                    SceneObjectPart part = parts[i];
+                    if (part.IsSelected)
+                        return;
+                }
+                IsSelected = partSelect;
+                if (!IsAttachment)
+                {
+                    ScheduleGroupForFullUpdate();
+                }
             }
         }
 
@@ -674,6 +979,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public SceneObjectGroup()
         {
+            
         }
 
         /// <summary>
@@ -691,8 +997,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// Constructor.  This object is added to the scene later via AttachToScene()
         /// </summary>
         public SceneObjectGroup(UUID ownerID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape)
-            :this(new SceneObjectPart(ownerID, shape, pos, rot, Vector3.Zero))
-        { 
+        {
+            SetRootPart(new SceneObjectPart(ownerID, shape, pos, rot, Vector3.Zero));
         }
 
         /// <summary>
@@ -727,6 +1033,9 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public virtual void AttachToBackup()
         {
+            if (IsAttachment) return;
+            m_scene.SceneGraph.FireAttachToBackup(this);
+
             if (InSceneBackup)
             {
                 //m_log.DebugFormat(
@@ -769,6 +1078,13 @@ namespace OpenSim.Region.Framework.Scenes
 
             ApplyPhysics();
 
+            if (RootPart.PhysActor != null)
+                RootPart.Force = RootPart.Force;
+            if (RootPart.PhysActor != null)
+                RootPart.Torque = RootPart.Torque;
+            if (RootPart.PhysActor != null)
+                RootPart.Buoyancy = RootPart.Buoyancy;
+
             // Don't trigger the update here - otherwise some client issues occur when multiple updates are scheduled
             // for the same object with very different properties.  The caller must schedule the update.
             //ScheduleGroupForFullUpdate();
@@ -784,6 +1100,10 @@ namespace OpenSim.Region.Framework.Scenes
             EntityIntersection result = new EntityIntersection();
 
             SceneObjectPart[] parts = m_parts.GetArray();
+
+            // Find closest hit here
+            float idist = float.MaxValue;
+
             for (int i = 0; i < parts.Length; i++)
             {
                 SceneObjectPart part = parts[i];
@@ -798,11 +1118,6 @@ namespace OpenSim.Region.Framework.Scenes
 
                 EntityIntersection inter = part.TestIntersectionOBB(hRay, parentrotation, frontFacesOnly, faceCenters);
 
-                // This may need to be updated to the maximum draw distance possible..
-                // We might (and probably will) be checking for prim creation from other sims
-                // when the camera crosses the border.
-                float idist = Constants.RegionSize;
-
                 if (inter.HitTF)
                 {
                     // We need to find the closest prim to return to the testcaller along the ray
@@ -813,10 +1128,11 @@ namespace OpenSim.Region.Framework.Scenes
                         result.obj = part;
                         result.normal = inter.normal;
                         result.distance = inter.distance;
+
+                        idist = inter.distance;
                     }
                 }
             }
-
             return result;
         }
 
@@ -828,25 +1144,27 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns></returns>
         public void GetAxisAlignedBoundingBoxRaw(out float minX, out float maxX, out float minY, out float maxY, out float minZ, out float maxZ)
         {
-            maxX = -256f;
-            maxY = -256f;
-            maxZ = -256f;
-            minX = 256f;
-            minY = 256f;
-            minZ = 8192f;
+            maxX = float.MinValue;
+            maxY = float.MinValue;
+            maxZ = float.MinValue;
+            minX = float.MaxValue;
+            minY = float.MaxValue;
+            minZ = float.MaxValue;
 
             SceneObjectPart[] parts = m_parts.GetArray();
-            for (int i = 0; i < parts.Length; i++)
+            foreach (SceneObjectPart part in parts)
             {
-                SceneObjectPart part = parts[i];
-
                 Vector3 worldPos = part.GetWorldPosition();
                 Vector3 offset = worldPos - AbsolutePosition;
                 Quaternion worldRot;
                 if (part.ParentID == 0)
+                {
                     worldRot = part.RotationOffset;
+                }
                 else
+                {
                     worldRot = part.GetWorldRotation();
+                }
 
                 Vector3 frontTopLeft;
                 Vector3 frontTopRight;
@@ -858,6 +1176,8 @@ namespace OpenSim.Region.Framework.Scenes
                 Vector3 backBottomLeft;
                 Vector3 backBottomRight;
 
+               // Vector3[] corners = new Vector3[8];
+
                 Vector3 orig = Vector3.Zero;
 
                 frontTopLeft.X = orig.X - (part.Scale.X / 2);
@@ -892,6 +1212,38 @@ namespace OpenSim.Region.Framework.Scenes
                 backBottomRight.Y = orig.Y + (part.Scale.Y / 2);
                 backBottomRight.Z = orig.Z - (part.Scale.Z / 2);
 
+                
+
+                //m_log.InfoFormat("pre corner 1 is {0} {1} {2}", frontTopLeft.X, frontTopLeft.Y, frontTopLeft.Z);
+                //m_log.InfoFormat("pre corner 2 is {0} {1} {2}", frontTopRight.X, frontTopRight.Y, frontTopRight.Z);
+                //m_log.InfoFormat("pre corner 3 is {0} {1} {2}", frontBottomRight.X, frontBottomRight.Y, frontBottomRight.Z);
+                //m_log.InfoFormat("pre corner 4 is {0} {1} {2}", frontBottomLeft.X, frontBottomLeft.Y, frontBottomLeft.Z);
+                //m_log.InfoFormat("pre corner 5 is {0} {1} {2}", backTopLeft.X, backTopLeft.Y, backTopLeft.Z);
+                //m_log.InfoFormat("pre corner 6 is {0} {1} {2}", backTopRight.X, backTopRight.Y, backTopRight.Z);
+                //m_log.InfoFormat("pre corner 7 is {0} {1} {2}", backBottomRight.X, backBottomRight.Y, backBottomRight.Z);
+                //m_log.InfoFormat("pre corner 8 is {0} {1} {2}", backBottomLeft.X, backBottomLeft.Y, backBottomLeft.Z);
+
+                //for (int i = 0; i < 8; i++)
+                //{
+                //    corners[i] = corners[i] * worldRot;
+                //    corners[i] += offset;
+
+                //    if (corners[i].X > maxX)
+                //        maxX = corners[i].X;
+                //    if (corners[i].X < minX)
+                //        minX = corners[i].X;
+
+                //    if (corners[i].Y > maxY)
+                //        maxY = corners[i].Y;
+                //    if (corners[i].Y < minY)
+                //        minY = corners[i].Y;
+
+                //    if (corners[i].Z > maxZ)
+                //        maxZ = corners[i].Y;
+                //    if (corners[i].Z < minZ)
+                //        minZ = corners[i].Z;
+                //}
+
                 frontTopLeft = frontTopLeft * worldRot;
                 frontTopRight = frontTopRight * worldRot;
                 frontBottomLeft = frontBottomLeft * worldRot;
@@ -913,6 +1265,15 @@ namespace OpenSim.Region.Framework.Scenes
                 backTopLeft += offset;
                 backTopRight += offset;
 
+                //m_log.InfoFormat("corner 1 is {0} {1} {2}", frontTopLeft.X, frontTopLeft.Y, frontTopLeft.Z);
+                //m_log.InfoFormat("corner 2 is {0} {1} {2}", frontTopRight.X, frontTopRight.Y, frontTopRight.Z);
+                //m_log.InfoFormat("corner 3 is {0} {1} {2}", frontBottomRight.X, frontBottomRight.Y, frontBottomRight.Z);
+                //m_log.InfoFormat("corner 4 is {0} {1} {2}", frontBottomLeft.X, frontBottomLeft.Y, frontBottomLeft.Z);
+                //m_log.InfoFormat("corner 5 is {0} {1} {2}", backTopLeft.X, backTopLeft.Y, backTopLeft.Z);
+                //m_log.InfoFormat("corner 6 is {0} {1} {2}", backTopRight.X, backTopRight.Y, backTopRight.Z);
+                //m_log.InfoFormat("corner 7 is {0} {1} {2}", backBottomRight.X, backBottomRight.Y, backBottomRight.Z);
+                //m_log.InfoFormat("corner 8 is {0} {1} {2}", backBottomLeft.X, backBottomLeft.Y, backBottomLeft.Z);
+
                 if (frontTopRight.X > maxX)
                     maxX = frontTopRight.X;
                 if (frontTopLeft.X > maxX)
@@ -1056,17 +1417,118 @@ namespace OpenSim.Region.Framework.Scenes
 
         #endregion
 
+        public void GetResourcesCosts(SceneObjectPart apart,
+            out float linksetResCost, out float linksetPhysCost, out float partCost, out float partPhysCost)
+        {
+            // this information may need to be cached
+
+            float cost;
+            float tmpcost;
+
+            bool ComplexCost = false;
+
+            SceneObjectPart p;
+            SceneObjectPart[] parts;
+
+            lock (m_parts)
+            {
+                parts = m_parts.GetArray();
+            }
+
+            int nparts = parts.Length;
+          
+
+            for (int i = 0; i < nparts; i++)
+            {
+                p = parts[i];
+
+                if (p.UsesComplexCost)
+                {
+                    ComplexCost = true;
+                    break;
+                }
+            }
+
+            if (ComplexCost)
+            {
+                linksetResCost = 0;
+                linksetPhysCost = 0;
+                partCost = 0; 
+                partPhysCost = 0;
+
+                for (int i = 0; i < nparts; i++)
+                {
+                    p = parts[i];
+
+                    cost = p.StreamingCost;
+                    tmpcost = p.SimulationCost;
+                    if (tmpcost > cost)
+                        cost = tmpcost;
+                    tmpcost = p.PhysicsCost;
+                    if (tmpcost > cost)
+                        cost = tmpcost;
+
+                    linksetPhysCost += tmpcost;
+                    linksetResCost += cost;
+
+                    if (p == apart)
+                    {
+                        partCost = cost;
+                        partPhysCost = tmpcost;
+                    }
+                }
+            }
+            else
+            {
+                partPhysCost = 1.0f;
+                partCost = 1.0f;
+                linksetResCost = (float)nparts;
+                linksetPhysCost = linksetResCost;
+            }
+        }
+
+        public void GetSelectedCosts(out float PhysCost, out float StreamCost, out float SimulCost)
+        {
+            SceneObjectPart p;
+            SceneObjectPart[] parts;
+
+            lock (m_parts)
+            {
+                parts = m_parts.GetArray();
+            }
+
+            int nparts = parts.Length;
+
+            PhysCost = 0;
+            StreamCost = 0;
+            SimulCost = 0;
+
+            for (int i = 0; i < nparts; i++)
+            {
+                p = parts[i];
+
+                StreamCost += p.StreamingCost;
+                SimulCost += p.SimulationCost;
+                PhysCost += p.PhysicsCost;
+            }
+        }
+
         public void SaveScriptedState(XmlTextWriter writer)
         {
+            SaveScriptedState(writer, false);
+        }
+
+        public void SaveScriptedState(XmlTextWriter writer, bool oldIDs)
+        {
             XmlDocument doc = new XmlDocument();
             Dictionary<UUID,string> states = new Dictionary<UUID,string>();
 
             SceneObjectPart[] parts = m_parts.GetArray();
             for (int i = 0; i < parts.Length; i++)
             {
-                Dictionary<UUID, string> pstates = parts[i].Inventory.GetScriptStates();
+                Dictionary<UUID, string> pstates = parts[i].Inventory.GetScriptStates(oldIDs);
                 foreach (KeyValuePair<UUID, string> kvp in pstates)
-                    states.Add(kvp.Key, kvp.Value);
+                    states[kvp.Key] = kvp.Value;
             }
 
             if (states.Count > 0)
@@ -1086,6 +1548,169 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
+        /// Add the avatar to this linkset (avatar is sat).
+        /// </summary>
+        /// <param name="agentID"></param>
+        public void AddAvatar(UUID agentID)
+        {
+            ScenePresence presence;
+            if (m_scene.TryGetScenePresence(agentID, out presence))
+            {
+                if (!m_linkedAvatars.Contains(presence))
+                {
+                    m_linkedAvatars.Add(presence);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Delete the avatar from this linkset (avatar is unsat).
+        /// </summary>
+        /// <param name="agentID"></param>
+        public void DeleteAvatar(UUID agentID)
+        {
+            ScenePresence presence;
+            if (m_scene.TryGetScenePresence(agentID, out presence))
+            {
+                if (m_linkedAvatars.Contains(presence))
+                {
+                    m_linkedAvatars.Remove(presence);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns the list of linked presences (avatars sat on this group)
+        /// </summary>
+        /// <param name="agentID"></param>
+        public List<ScenePresence> GetLinkedAvatars()
+        {
+            return m_linkedAvatars;
+        }
+
+        /// <summary>
+        /// Attach this scene object to the given avatar.
+        /// </summary>
+        /// <param name="agentID"></param>
+        /// <param name="attachmentpoint"></param>
+        /// <param name="AttachOffset"></param>
+        private void AttachToAgent(
+            ScenePresence avatar, SceneObjectGroup so, uint attachmentpoint, Vector3 attachOffset, bool silent)
+        {
+            if (avatar != null)
+            {
+                // don't attach attachments to child agents
+                if (avatar.IsChildAgent) return;
+
+                // Remove from database and parcel prim count
+                m_scene.DeleteFromStorage(so.UUID);
+                m_scene.EventManager.TriggerParcelPrimCountTainted();
+
+                so.AttachedAvatar = avatar.UUID;
+
+                if (so.RootPart.PhysActor != null)
+                {
+                    m_scene.PhysicsScene.RemovePrim(so.RootPart.PhysActor);
+                    so.RootPart.PhysActor = null;
+                }
+
+                so.AbsolutePosition = attachOffset;
+                so.RootPart.AttachedPos = attachOffset;
+                so.IsAttachment = true;
+                so.RootPart.SetParentLocalId(avatar.LocalId);
+                so.AttachmentPoint = attachmentpoint;
+
+                avatar.AddAttachment(this);
+
+                if (!silent)
+                {
+                    // Killing it here will cause the client to deselect it
+                    // It then reappears on the avatar, deselected
+                    // through the full update below
+                    //
+                    if (IsSelected)
+                    {
+                        m_scene.SendKillObject(new List<uint> { m_rootPart.LocalId });
+                    }
+
+                    IsSelected = false; // fudge....
+                    ScheduleGroupForFullUpdate();
+                }
+            }
+            else
+            {
+                m_log.WarnFormat(
+                    "[SOG]: Tried to add attachment {0} to avatar with UUID {1} in region {2} but the avatar is not present", 
+                    UUID, avatar.ControllingClient.AgentId, Scene.RegionInfo.RegionName);
+            }
+        }
+
+        public byte GetAttachmentPoint()
+        {
+            return m_rootPart.Shape.State;
+        }
+
+        public void DetachToGround()
+        {
+            ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar);
+            if (avatar == null)
+                return;
+
+            avatar.RemoveAttachment(this);
+
+            Vector3 detachedpos = new Vector3(127f,127f,127f);
+            if (avatar == null)
+                return;
+
+            detachedpos = avatar.AbsolutePosition;
+            FromItemID = UUID.Zero;
+
+            AbsolutePosition = detachedpos;
+            AttachedAvatar = UUID.Zero;
+
+            //SceneObjectPart[] parts = m_parts.GetArray();
+            //for (int i = 0; i < parts.Length; i++)
+            //    parts[i].AttachedAvatar = UUID.Zero;
+
+            m_rootPart.SetParentLocalId(0);
+            AttachmentPoint = (byte)0;
+            // must check if buildind should be true or false here
+            m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive,false);
+            HasGroupChanged = true;
+            RootPart.Rezzed = DateTime.Now;
+            RootPart.RemFlag(PrimFlags.TemporaryOnRez);
+            AttachToBackup();
+            m_scene.EventManager.TriggerParcelPrimCountTainted();
+            m_rootPart.ScheduleFullUpdate();
+            m_rootPart.ClearUndoState();
+        }
+
+        public void DetachToInventoryPrep()
+        {
+            ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar);
+            //Vector3 detachedpos = new Vector3(127f, 127f, 127f);
+            if (avatar != null)
+            {
+                //detachedpos = avatar.AbsolutePosition;
+                avatar.RemoveAttachment(this);
+            }
+
+            AttachedAvatar = UUID.Zero;
+
+            /*SceneObjectPart[] parts = m_parts.GetArray();
+            for (int i = 0; i < parts.Length; i++)
+                parts[i].AttachedAvatar = UUID.Zero;*/
+
+            m_rootPart.SetParentLocalId(0);
+            //m_rootPart.SetAttachmentPoint((byte)0);
+            IsAttachment = false;
+            AbsolutePosition = m_rootPart.AttachedPos;
+            //m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_scene.m_physicalPrim);
+            //AttachToBackup();
+            //m_rootPart.ScheduleFullUpdate();
+        }
+
+        /// <summary>
         ///
         /// </summary>
         /// <param name="part"></param>
@@ -1125,7 +1750,10 @@ namespace OpenSim.Region.Framework.Scenes
         public void AddPart(SceneObjectPart part)
         {
             part.SetParent(this);
-            part.LinkNum = m_parts.Add(part.UUID, part);
+            m_parts.Add(part.UUID, part);
+
+            part.LinkNum = m_parts.Count;
+
             if (part.LinkNum == 2)
                 RootPart.LinkNum = 1;
         }
@@ -1151,6 +1779,14 @@ namespace OpenSim.Region.Framework.Scenes
                 parts[i].UUID = UUID.Random();
         }
 
+        // helper provided for parts.
+        public int GetSceneMaxUndo()
+        {
+            if (m_scene != null)
+                return m_scene.MaxUndoCount;
+            return 5;
+        }
+
         // justincc: I don't believe this hack is needed any longer, especially since the physics
         // parts of set AbsolutePosition were already commented out.  By changing HasGroupChanged to false
         // this method was preventing proper reload of scene objects.
@@ -1208,7 +1844,7 @@ namespace OpenSim.Region.Framework.Scenes
 //                "[SCENE OBJECT GROUP]: Processing OnGrabPart for {0} on {1} {2}, offsetPos {3}",
 //                remoteClient.Name, part.Name, part.LocalId, offsetPos);
 
-            part.StoreUndoState();
+//            part.StoreUndoState();
             part.OnGrab(offsetPos, remoteClient);
         }
 
@@ -1228,6 +1864,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="silent">If true then deletion is not broadcast to clients</param>
         public void DeleteGroupFromScene(bool silent)
         {
+            // We need to keep track of this state in case this group is still queued for backup.
+            IsDeleted = true;
+
+            DetachFromBackup();
+
             SceneObjectPart[] parts = m_parts.GetArray();
             for (int i = 0; i < parts.Length; i++)
             {
@@ -1251,6 +1892,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 });
             }
+
         }
 
         public void AddScriptLPS(int count)
@@ -1320,28 +1962,43 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void ApplyPhysics()
         {
-            // Apply physics to the root prim
-            m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive);
-            
-            // Apply physics to child prims
             SceneObjectPart[] parts = m_parts.GetArray();
             if (parts.Length > 1)
             {
+                ResetChildPrimPhysicsPositions();
+
+                // Apply physics to the root prim
+                m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, true);
+
+
                 for (int i = 0; i < parts.Length; i++)
                 {
                     SceneObjectPart part = parts[i];
                     if (part.LocalId != m_rootPart.LocalId)
-                        part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), part.VolumeDetectActive);
+                        part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), part.VolumeDetectActive, true);
                 }
-
                 // Hack to get the physics scene geometries in the right spot
-                ResetChildPrimPhysicsPositions();
+//                ResetChildPrimPhysicsPositions();
+                if (m_rootPart.PhysActor != null)
+                {
+                    m_rootPart.PhysActor.Building = false;
+                }
+                        }
+                        else
+                        {
+                // Apply physics to the root prim
+                m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, false);
             }
         }
 
         public void SetOwnerId(UUID userId)
         {
-            ForEachPart(delegate(SceneObjectPart part) { part.OwnerID = userId; });
+                ForEachPart(delegate(SceneObjectPart part) 
+                {
+                    
+                    part.OwnerID = userId;
+                    
+                });
         }
 
         public void ForEachPart(Action<SceneObjectPart> whatToDo)
@@ -1373,11 +2030,17 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
             }
 
+            if ((RootPart.Flags & PrimFlags.TemporaryOnRez) != 0)
+                return;
+
             // Since this is the top of the section of call stack for backing up a particular scene object, don't let
             // any exception propogate upwards.
             try
             {
-                if (!m_scene.ShuttingDown) // if shutting down then there will be nothing to handle the return so leave till next restart
+                if (!m_scene.ShuttingDown || // if shutting down then there will be nothing to handle the return so leave till next restart
+                        !m_scene.LoginsEnabled || // We're starting up or doing maintenance, don't mess with things
+                        m_scene.LoadingPrims) // Land may not be valid yet
+                
                 {
                     ILandObject parcel = m_scene.LandChannel.GetLandObject(
                             m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y);
@@ -1404,6 +2067,7 @@ namespace OpenSim.Region.Framework.Scenes
                             }
                         }
                     }
+
                 }
 
                 if (m_scene.UseBackup && HasGroupChanged)
@@ -1411,10 +2075,30 @@ namespace OpenSim.Region.Framework.Scenes
                     // don't backup while it's selected or you're asking for changes mid stream.
                     if (isTimeToPersist() || forcedBackup)
                     {
+                        if (m_rootPart.PhysActor != null &&
+                            (!m_rootPart.PhysActor.IsPhysical))
+                        {
+                            // Possible ghost prim
+                            if (m_rootPart.PhysActor.Position != m_rootPart.GroupPosition)
+                            {
+                                foreach (SceneObjectPart part in m_parts.GetArray())
+                                {
+                                    // Re-set physics actor positions and
+                                    // orientations
+                                    part.GroupPosition = m_rootPart.GroupPosition;
+                                }
+                            }
+                        }
 //                        m_log.DebugFormat(
 //                            "[SCENE]: Storing {0}, {1} in {2}",
 //                            Name, UUID, m_scene.RegionInfo.RegionName);
 
+                        if (RootPart.Shape.PCode == 9 && RootPart.Shape.State != 0)
+                        {
+                            RootPart.Shape.State = 0;
+                            ScheduleGroupForFullUpdate();
+                        }
+
                         SceneObjectGroup backup_group = Copy(false);
                         backup_group.RootPart.Velocity = RootPart.Velocity;
                         backup_group.RootPart.Acceleration = RootPart.Acceleration;
@@ -1424,6 +2108,16 @@ namespace OpenSim.Region.Framework.Scenes
                         HasGroupChangedDueToDelink = false;
 
                         m_scene.EventManager.TriggerOnSceneObjectPreSave(backup_group, this);
+/*
+                        backup_group.ForEachPart(delegate(SceneObjectPart part) 
+                        { 
+                            if (part.KeyframeMotion != null)
+                            {
+                                part.KeyframeMotion = KeyframeMotion.FromData(backup_group, part.KeyframeMotion.Serialize());
+//                                part.KeyframeMotion.UpdateSceneObject(this);
+                            }
+                        });
+*/
                         datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID);
 
                         backup_group.ForEachPart(delegate(SceneObjectPart part) 
@@ -1480,10 +2174,14 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns></returns>
         public SceneObjectGroup Copy(bool userExposed)
         {
+            m_dupeInProgress = true;
             SceneObjectGroup dupe = (SceneObjectGroup)MemberwiseClone();
             dupe.m_isBackedUp = false;
             dupe.m_parts = new MapAndArray<OpenMetaverse.UUID, SceneObjectPart>();
 
+            // new group as no sitting avatars            
+            dupe.m_linkedAvatars = new List<ScenePresence>();
+
             // Warning, The following code related to previousAttachmentStatus is needed so that clones of 
             // attachments do not bordercross while they're being duplicated.  This is hacktastic!
             // Normally, setting AbsolutePosition will bordercross a prim if it's outside the region!
@@ -1494,7 +2192,7 @@ namespace OpenSim.Region.Framework.Scenes
             // This is only necessary when userExposed is false!
 
             bool previousAttachmentStatus = dupe.IsAttachment;
-            
+
             if (!userExposed)
                 dupe.IsAttachment = true;
 
@@ -1507,16 +2205,17 @@ namespace OpenSim.Region.Framework.Scenes
 
             dupe.CopyRootPart(m_rootPart, OwnerID, GroupID, userExposed);
             dupe.m_rootPart.LinkNum = m_rootPart.LinkNum;
+            
 
             if (userExposed)
                 dupe.m_rootPart.TrimPermissions();
 
             List<SceneObjectPart> partList = new List<SceneObjectPart>(m_parts.GetArray());
-            
+
             partList.Sort(delegate(SceneObjectPart p1, SceneObjectPart p2)
-                {
-                    return p1.LinkNum.CompareTo(p2.LinkNum);
-                }
+            {
+                return p1.LinkNum.CompareTo(p2.LinkNum);
+            }
             );
 
             foreach (SceneObjectPart part in partList)
@@ -1526,41 +2225,56 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     newPart = dupe.CopyPart(part, OwnerID, GroupID, userExposed);
                     newPart.LinkNum = part.LinkNum;
-                }
+                    if (userExposed)
+                        newPart.ParentID = dupe.m_rootPart.LocalId;
+                 }
                 else
                 {
                     newPart = dupe.m_rootPart;
                 }
+/*
+                bool isphys = ((newPart.Flags & PrimFlags.Physics) != 0);
+                bool isphan = ((newPart.Flags & PrimFlags.Phantom) != 0);
 
                 // Need to duplicate the physics actor as well
-                PhysicsActor originalPartPa = part.PhysActor;
-                if (originalPartPa != null && userExposed)
+                if (userExposed && (isphys || !isphan || newPart.VolumeDetectActive))
                 {
                     PrimitiveBaseShape pbs = newPart.Shape;
-    
                     newPart.PhysActor
                         = m_scene.PhysicsScene.AddPrimShape(
                             string.Format("{0}/{1}", newPart.Name, newPart.UUID),
                             pbs,
                             newPart.AbsolutePosition,
                             newPart.Scale,
-                            newPart.RotationOffset,
-                            originalPartPa.IsPhysical,
+                            newPart.GetWorldRotation(),
+                            isphys,
+                            isphan,
                             newPart.LocalId);
-    
-                    newPart.DoPhysicsPropertyUpdate(originalPartPa.IsPhysical, true);
-                }
+
+                    newPart.DoPhysicsPropertyUpdate(isphys, true);
+ */
+                if (userExposed)
+                    newPart.ApplyPhysics((uint)newPart.Flags,newPart.VolumeDetectActive,true);
+//                }
+                // copy keyframemotion
+                if (part.KeyframeMotion != null)
+                    newPart.KeyframeMotion = part.KeyframeMotion.Copy(dupe);
             }
-            
+
             if (userExposed)
             {
-                dupe.UpdateParentIDs();
+// done above                dupe.UpdateParentIDs();
+
+                if (dupe.m_rootPart.PhysActor != null)
+                    dupe.m_rootPart.PhysActor.Building = false; // tell physics to finish building
+
                 dupe.HasGroupChanged = true;
                 dupe.AttachToBackup();
 
                 ScheduleGroupForFullUpdate();
             }
 
+            m_dupeInProgress = false;
             return dupe;
         }
 
@@ -1572,11 +2286,24 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="cGroupID"></param>
         public void CopyRootPart(SceneObjectPart part, UUID cAgentID, UUID cGroupID, bool userExposed)
         {
-            SetRootPart(part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, 0, userExposed));
+            //            SetRootPart(part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, 0, userExposed));
+            // give newpart a new local ID lettng old part keep same
+            SceneObjectPart newpart = part.Copy(part.LocalId, OwnerID, GroupID, 0, userExposed);
+            newpart.LocalId = m_scene.AllocateLocalId();
+
+            SetRootPart(newpart);
+            if (userExposed)
+                RootPart.Velocity = Vector3.Zero; // In case source is moving
         }
 
         public void ScriptSetPhysicsStatus(bool usePhysics)
         {
+            if (usePhysics)
+            {
+                if (RootPart.KeyframeMotion != null)
+                    RootPart.KeyframeMotion.Stop();
+                RootPart.KeyframeMotion = null;
+            }
             UpdatePrimFlags(RootPart.LocalId, usePhysics, IsTemporary, IsPhantom, IsVolumeDetect);
         }
 
@@ -1624,13 +2351,14 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if (pa != null)
                 {
-                    pa.AddForce(impulse, true);
+                    // false to be applied as a impulse 
+                    pa.AddForce(impulse, false);
                     m_scene.PhysicsScene.AddPhysicsActorTaint(pa);
                 }
             }
         }
 
-        public void applyAngularImpulse(Vector3 impulse)
+        public void ApplyAngularImpulse(Vector3 impulse)
         {
             PhysicsActor pa = RootPart.PhysActor;
 
@@ -1638,21 +2366,8 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (!IsAttachment)
                 {
-                    pa.AddAngularForce(impulse, true);
-                    m_scene.PhysicsScene.AddPhysicsActorTaint(pa);
-                }
-            }
-        }
-
-        public void setAngularImpulse(Vector3 impulse)
-        {
-            PhysicsActor pa = RootPart.PhysActor;
-
-            if (pa != null)
-            {
-                if (!IsAttachment)
-                {
-                    pa.Torque = impulse;
+                    // false to be applied as a impulse
+                    pa.AddAngularForce(impulse, false);
                     m_scene.PhysicsScene.AddPhysicsActorTaint(pa);
                 }
             }
@@ -1660,20 +2375,10 @@ namespace OpenSim.Region.Framework.Scenes
 
         public Vector3 GetTorque()
         {
-            PhysicsActor pa = RootPart.PhysActor;
-
-            if (pa != null)
-            {
-                if (!IsAttachment)
-                {
-                    Vector3 torque = pa.Torque;
-                    return torque;
-                }
-            }
-
-            return Vector3.Zero;
+            return RootPart.Torque;
         }
 
+         // This is used by both Double-Click Auto-Pilot and llMoveToTarget() in an attached object
         public void moveToTarget(Vector3 target, float tau)
         {
             if (IsAttachment)
@@ -1703,8 +2408,50 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (pa != null)
                 pa.PIDActive = false;
+
+            RootPart.ScheduleTerseUpdate(); // send a stop information
         }
         
+        public void rotLookAt(Quaternion target, float strength, float damping)
+        {
+            SceneObjectPart rootpart = m_rootPart;
+            if (rootpart != null)
+            {
+                if (IsAttachment)
+                {
+                /*
+                    ScenePresence avatar = m_scene.GetScenePresence(rootpart.AttachedAvatar);
+                    if (avatar != null)
+                    {
+                    Rotate the Av?
+                    } */
+                }
+                else
+                {
+                    if (rootpart.PhysActor != null)
+                    {                                                                   // APID must be implemented in your physics system for this to function.
+                        rootpart.PhysActor.APIDTarget = new Quaternion(target.X, target.Y, target.Z, target.W);
+                        rootpart.PhysActor.APIDStrength = strength;
+                        rootpart.PhysActor.APIDDamping = damping;
+                        rootpart.PhysActor.APIDActive = true;
+                    }
+                }
+            }
+        }
+
+        public void stopLookAt()
+        {
+            SceneObjectPart rootpart = m_rootPart;
+            if (rootpart != null)
+            {
+                if (rootpart.PhysActor != null)
+                {                                                       // APID must be implemented in your physics system for this to function.
+                    rootpart.PhysActor.APIDActive = false;
+                }
+            }
+        
+        }
+
         /// <summary>
         /// Uses a PID to attempt to clamp the object on the Z axis at the given height over tau seconds.
         /// </summary>
@@ -1721,7 +2468,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     pa.PIDHoverHeight = height;
                     pa.PIDHoverType = hoverType;
-                    pa.PIDTau = tau;
+                    pa.PIDHoverTau = tau;
                     pa.PIDHoverActive = true;
                 }
                 else
@@ -1761,7 +2508,12 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="cGroupID"></param>
         public SceneObjectPart CopyPart(SceneObjectPart part, UUID cAgentID, UUID cGroupID, bool userExposed)
         {
-            SceneObjectPart newPart = part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, m_parts.Count, userExposed);
+            // give new ID to the new part, letting old keep original
+            //            SceneObjectPart newPart = part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, m_parts.Count, userExposed);
+            SceneObjectPart newPart = part.Copy(part.LocalId, OwnerID, GroupID, m_parts.Count, userExposed);
+            newPart.LocalId = m_scene.AllocateLocalId();
+            newPart.SetParent(this);
+
             AddPart(newPart);
 
             SetPartAsNonRoot(newPart);
@@ -1811,6 +2563,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         #endregion
 
+
         public override void Update()
         {
             // Check that the group was not deleted before the scheduled update
@@ -1829,19 +2582,8 @@ namespace OpenSim.Region.Framework.Scenes
             // check to see if the physical position or rotation warrant an update. 
             if (m_rootPart.UpdateFlag == UpdateRequired.NONE)
             {
-                bool UsePhysics = ((RootPart.Flags & PrimFlags.Physics) != 0);
-
-                if (UsePhysics && !AbsolutePosition.ApproxEquals(lastPhysGroupPos, 0.02f))
-                {
-                    m_rootPart.UpdateFlag = UpdateRequired.TERSE;
-                    lastPhysGroupPos = AbsolutePosition;
-                }
-
-                if (UsePhysics && !GroupRotation.ApproxEquals(lastPhysGroupRot, 0.1f))
-                {
-                    m_rootPart.UpdateFlag = UpdateRequired.TERSE;
-                    lastPhysGroupRot = GroupRotation;
-                }
+                // rootpart SendScheduledUpdates will check if a update is needed
+                m_rootPart.UpdateFlag = UpdateRequired.TERSE;
             }
 
             SceneObjectPart[] parts = m_parts.GetArray();
@@ -1900,11 +2642,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// Immediately send a full update for this scene object.
         /// </summary>
         public void SendGroupFullUpdate()
-        {
+        {                       
             if (IsDeleted)
                 return;
 
-//            m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID);
+//            m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID);            
             
             RootPart.SendFullUpdateToAllClients();
 
@@ -2060,6 +2802,11 @@ namespace OpenSim.Region.Framework.Scenes
             // 'linkPart' == the root of the group being linked into this group
             SceneObjectPart linkPart = objectGroup.m_rootPart;
 
+            if (m_rootPart.PhysActor != null)
+                m_rootPart.PhysActor.Building = true;
+            if (linkPart.PhysActor != null)
+                linkPart.PhysActor.Building = true;
+
             // physics flags from group to be applied to linked parts
             bool grpusephys = UsesPhysics;
             bool grptemporary = IsTemporary;
@@ -2085,12 +2832,12 @@ namespace OpenSim.Region.Framework.Scenes
             Vector3 axPos = linkPart.OffsetPosition;
             // Rotate the linking root SOP's position to be relative to the new root prim
             Quaternion parentRot = m_rootPart.RotationOffset;
-            axPos *= Quaternion.Inverse(parentRot);
+            axPos *= Quaternion.Conjugate(parentRot);
             linkPart.OffsetPosition = axPos;
 
             // Make the linking root SOP's rotation relative to the new root prim
             Quaternion oldRot = linkPart.RotationOffset;
-            Quaternion newRot = Quaternion.Inverse(parentRot) * oldRot;
+            Quaternion newRot = Quaternion.Conjugate(parentRot) * oldRot;
             linkPart.RotationOffset = newRot;
 
             // If there is only one SOP in a SOG, the LinkNum is zero. I.e., not a linkset.
@@ -2124,7 +2871,7 @@ namespace OpenSim.Region.Framework.Scenes
                 linkPart.CreateSelected = true;
 
                 // let physics know preserve part volume dtc messy since UpdatePrimFlags doesn't look to parent changes for now
-                linkPart.UpdatePrimFlags(grpusephys, grptemporary, (IsPhantom || (linkPart.Flags & PrimFlags.Phantom) != 0), linkPart.VolumeDetectActive);
+                linkPart.UpdatePrimFlags(grpusephys, grptemporary, (IsPhantom || (linkPart.Flags & PrimFlags.Phantom) != 0), linkPart.VolumeDetectActive, true);
 
                 // If the added SOP is physical, also tell the physics engine about the link relationship.
                 if (linkPart.PhysActor != null && m_rootPart.PhysActor != null && m_rootPart.PhysActor.IsPhysical)
@@ -2134,6 +2881,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
 
                 linkPart.LinkNum = linkNum++;
+                linkPart.UpdatePrimFlags(UsesPhysics, IsTemporary, IsPhantom, IsVolumeDetect, false);
 
                 // Get a list of the SOP's in the old group in order of their linknum's.
                 SceneObjectPart[] ogParts = objectGroup.Parts;
@@ -2152,7 +2900,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                         // Update the physics flags for the newly added SOP
                         // (Is this necessary? LinkNonRootPart() has already called UpdatePrimFlags but with different flags!??)
-                        part.UpdatePrimFlags(grpusephys, grptemporary, (IsPhantom || (part.Flags & PrimFlags.Phantom) != 0), part.VolumeDetectActive);
+                        part.UpdatePrimFlags(grpusephys, grptemporary, (IsPhantom || (part.Flags & PrimFlags.Phantom) != 0), part.VolumeDetectActive, true);
 
                         // If the added SOP is physical, also tell the physics engine about the link relationship.
                         if (part.PhysActor != null && m_rootPart.PhysActor != null && m_rootPart.PhysActor.IsPhysical)
@@ -2170,7 +2918,7 @@ namespace OpenSim.Region.Framework.Scenes
             objectGroup.IsDeleted = true;
 
             objectGroup.m_parts.Clear();
-
+            
             // Can't do this yet since backup still makes use of the root part without any synchronization
 //            objectGroup.m_rootPart = null;
 
@@ -2184,6 +2932,9 @@ namespace OpenSim.Region.Framework.Scenes
             // unmoved prims!
             ResetChildPrimPhysicsPositions();
 
+            if (m_rootPart.PhysActor != null)
+                m_rootPart.PhysActor.Building = false;
+
             //HasGroupChanged = true;
             //ScheduleGroupForFullUpdate();
         }
@@ -2251,7 +3002,10 @@ namespace OpenSim.Region.Framework.Scenes
 //                m_log.DebugFormat(
 //                    "[SCENE OBJECT GROUP]: Delinking part {0}, {1} from group with root part {2}, {3}",
 //                    linkPart.Name, linkPart.UUID, RootPart.Name, RootPart.UUID);
-            
+
+            if (m_rootPart.PhysActor != null)
+                m_rootPart.PhysActor.Building = true;
+
             linkPart.ClearUndoState();
 
             Vector3 worldPos = linkPart.GetWorldPosition();
@@ -2322,6 +3076,14 @@ namespace OpenSim.Region.Framework.Scenes
 
             // When we delete a group, we currently have to force persist to the database if the object id has changed
             // (since delete works by deleting all rows which have a given object id)
+
+            // this is as it seems to be in sl now
+            if(linkPart.PhysicsShapeType == (byte)PhysShapeType.none)
+                linkPart.PhysicsShapeType = linkPart.DefaultPhysicsShapeType(); // root prims can't have type none for now
+
+            if (m_rootPart.PhysActor != null)
+                m_rootPart.PhysActor.Building = false;
+
             objectGroup.HasGroupChangedDueToDelink = true;
 
             return objectGroup;
@@ -2333,6 +3095,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="objectGroup"></param>
         public virtual void DetachFromBackup()
         {
+            if (m_scene != null)
+                m_scene.SceneGraph.FireDetachFromBackup(this);
             if (m_isBackedUp && Scene != null)
                 m_scene.EventManager.OnBackup -= ProcessBackup;
             
@@ -2353,7 +3117,8 @@ namespace OpenSim.Region.Framework.Scenes
             Vector3 axPos = part.OffsetPosition;
             axPos *= parentRot;
             part.OffsetPosition = axPos;
-            part.GroupPosition = oldGroupPosition + part.OffsetPosition;
+            Vector3 newPos = oldGroupPosition + part.OffsetPosition;
+            part.GroupPosition = newPos;
             part.OffsetPosition = Vector3.Zero;
 
             // Compution our rotation to be not relative to the old parent
@@ -2368,7 +3133,7 @@ namespace OpenSim.Region.Framework.Scenes
             part.LinkNum = linkNum;
 
             // Compute the new position of this SOP relative to the group position
-            part.OffsetPosition = part.GroupPosition - AbsolutePosition;
+            part.OffsetPosition = newPos - AbsolutePosition;
 
             // (radams1 20120711: I don't know why part.OffsetPosition is set multiple times.
             //   It would have the affect of setting the physics engine position multiple 
@@ -2378,18 +3143,19 @@ namespace OpenSim.Region.Framework.Scenes
             // Rotate the relative position by the rotation of the group
             Quaternion rootRotation = m_rootPart.RotationOffset;
             Vector3 pos = part.OffsetPosition;
-            pos *= Quaternion.Inverse(rootRotation);
+            pos *= Quaternion.Conjugate(rootRotation);
             part.OffsetPosition = pos;
 
             // Compute the SOP's rotation relative to the rotation of the group.
             parentRot = m_rootPart.RotationOffset;
             oldRot = part.RotationOffset;
-            Quaternion newRot = Quaternion.Inverse(parentRot) * oldRot;
+            Quaternion newRot = Quaternion.Conjugate(parentRot) * worldRot;
             part.RotationOffset = newRot;
 
             // Since this SOP's state has changed, push those changes into the physics engine
             //    and the simulator.
-            part.UpdatePrimFlags(UsesPhysics, IsTemporary, IsPhantom, IsVolumeDetect);
+            // done on caller
+//            part.UpdatePrimFlags(UsesPhysics, IsTemporary, IsPhantom, IsVolumeDetect, false);
         }
 
         /// <summary>
@@ -2411,10 +3177,14 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         if (!m_rootPart.BlockGrab)
                         {
-                            Vector3 llmoveforce = pos - AbsolutePosition;
+/*                            Vector3 llmoveforce = pos - AbsolutePosition;
                             Vector3 grabforce = llmoveforce;
                             grabforce = (grabforce / 10) * pa.Mass;
-                            pa.AddForce(grabforce, true);
+ */
+                            // empirically convert distance diference to a impulse
+                            Vector3 grabforce = pos - AbsolutePosition;
+                            grabforce = grabforce * (pa.Mass/ 10.0f);
+                            pa.AddForce(grabforce, false);
                             m_scene.PhysicsScene.AddPhysicsActorTaint(pa);
                         }
                     }
@@ -2610,6 +3380,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="SetVolumeDetect"></param>
         public void UpdatePrimFlags(uint localID, bool UsePhysics, bool SetTemporary, bool SetPhantom, bool SetVolumeDetect)
         {
+            HasGroupChanged = true;
+
             SceneObjectPart selectionPart = GetPart(localID);
 
             if (SetTemporary && Scene != null)
@@ -2640,8 +3412,22 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
 
-                for (int i = 0; i < parts.Length; i++)
-                    parts[i].UpdatePrimFlags(UsePhysics, SetTemporary, SetPhantom, SetVolumeDetect);
+                if (parts.Length > 1)
+                {
+                    m_rootPart.UpdatePrimFlags(UsePhysics, SetTemporary, SetPhantom, SetVolumeDetect, true);
+
+                    for (int i = 0; i < parts.Length; i++)
+                    {
+
+                        if (parts[i].UUID != m_rootPart.UUID)
+                            parts[i].UpdatePrimFlags(UsePhysics, SetTemporary, SetPhantom, SetVolumeDetect, true);
+                    }
+
+                    if (m_rootPart.PhysActor != null)
+                        m_rootPart.PhysActor.Building = false;
+                }
+                else
+                    m_rootPart.UpdatePrimFlags(UsePhysics, SetTemporary, SetPhantom, SetVolumeDetect, false);
             }
         }
 
@@ -2654,6 +3440,17 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+
+
+        /// <summary>
+        /// Gets the number of parts
+        /// </summary>
+        /// <returns></returns>
+        public int GetPartCount()
+        {
+            return Parts.Count();
+        }
+
         /// <summary>
         /// Update the texture entry for this part
         /// </summary>
@@ -2670,11 +3467,20 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void AdjustChildPrimPermissions()
         {
+            uint newOwnerMask = (uint)PermissionMask.All & 0xfffffff8; // Mask folded bits
+            uint foldedPerms = RootPart.OwnerMask & 3;
+
             ForEachPart(part =>
             {
+                newOwnerMask &= part.BaseMask;
                 if (part != RootPart)
                     part.ClonePermissions(RootPart);
             });
+
+            uint lockMask = ~(uint)PermissionMask.Move;
+            uint lockBit = RootPart.OwnerMask & (uint)PermissionMask.Move;
+            RootPart.OwnerMask = (RootPart.OwnerMask & lockBit) | ((newOwnerMask | foldedPerms) & lockMask);
+            RootPart.ScheduleFullUpdate();
         }
 
         public void UpdatePermissions(UUID AgentID, byte field, uint localID,
@@ -2682,8 +3488,24 @@ namespace OpenSim.Region.Framework.Scenes
         {
             RootPart.UpdatePermissions(AgentID, field, localID, mask, addRemTF);
 
+            bool god = Scene.Permissions.IsGod(AgentID);
+
+            if (field == 1 && god)
+            {
+                ForEachPart(part =>
+                {
+                    part.BaseMask = RootPart.BaseMask;
+                });
+            }
+
             AdjustChildPrimPermissions();
 
+            if (field == 1 && god) // Base mask was set. Update all child part inventories
+            {
+                foreach (SceneObjectPart part in Parts)
+                    part.Inventory.ApplyGodPermissions(RootPart.BaseMask);
+            }
+
             HasGroupChanged = true;
 
             // Send the group's properties to all clients once all parts are updated
@@ -2729,8 +3551,6 @@ namespace OpenSim.Region.Framework.Scenes
 
             PhysicsActor pa = m_rootPart.PhysActor;
 
-            RootPart.StoreUndoState(true);
-
             if (Scene != null)
             {
                 scale.X = Math.Max(Scene.m_minNonphys, Math.Min(Scene.m_maxNonphys, scale.X));
@@ -2758,7 +3578,6 @@ namespace OpenSim.Region.Framework.Scenes
                     SceneObjectPart obPart = parts[i];
                     if (obPart.UUID != m_rootPart.UUID)
                     {
-//                        obPart.IgnoreUndoUpdate = true;
                         Vector3 oldSize = new Vector3(obPart.Scale);
 
                         float f = 1.0f;
@@ -2870,8 +3689,6 @@ namespace OpenSim.Region.Framework.Scenes
                                 z *= a;
                             }
                         }
-
-//                        obPart.IgnoreUndoUpdate = false;
                     }
                 }
             }
@@ -2881,9 +3698,7 @@ namespace OpenSim.Region.Framework.Scenes
             prevScale.Y *= y;
             prevScale.Z *= z;
 
-//            RootPart.IgnoreUndoUpdate = true;
             RootPart.Resize(prevScale);
-//            RootPart.IgnoreUndoUpdate = false;
 
             for (int i = 0; i < parts.Length; i++)
             {
@@ -2891,8 +3706,6 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if (obPart.UUID != m_rootPart.UUID)
                 {
-                    obPart.IgnoreUndoUpdate = true;
-
                     Vector3 currentpos = new Vector3(obPart.OffsetPosition);
                     currentpos.X *= x;
                     currentpos.Y *= y;
@@ -2905,16 +3718,12 @@ namespace OpenSim.Region.Framework.Scenes
 
                     obPart.Resize(newSize);
                     obPart.UpdateOffSet(currentpos);
-
-                    obPart.IgnoreUndoUpdate = false;                    
                 }
 
-//                obPart.IgnoreUndoUpdate = false;
-//                obPart.StoreUndoState();
+                HasGroupChanged = true;
+                m_rootPart.TriggerScriptChangedEvent(Changed.SCALE);
+                ScheduleGroupForTerseUpdate();
             }
-
-//            m_log.DebugFormat(
-//                "[SCENE OBJECT GROUP]: Finished group resizing {0} {1} to {2}", Name, LocalId, RootPart.Scale);
         }
 
         #endregion
@@ -2927,14 +3736,6 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="pos"></param>
         public void UpdateGroupPosition(Vector3 pos)
         {
-//            m_log.DebugFormat("[SCENE OBJECT GROUP]: Updating group position on {0} {1} to {2}", Name, LocalId, pos);
-
-            RootPart.StoreUndoState(true);
-
-//            SceneObjectPart[] parts = m_parts.GetArray();
-//            for (int i = 0; i < parts.Length; i++)
-//                parts[i].StoreUndoState();
-
             if (m_scene.EventManager.TriggerGroupMove(UUID, pos))
             {
                 if (IsAttachment)
@@ -2967,21 +3768,17 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="pos"></param>
         /// <param name="localID"></param>
+        /// 
+
         public void UpdateSinglePosition(Vector3 pos, uint localID)
         {
             SceneObjectPart part = GetPart(localID);
 
-//            SceneObjectPart[] parts = m_parts.GetArray();
-//            for (int i = 0; i < parts.Length; i++)
-//                parts[i].StoreUndoState();
-
             if (part != null)
             {
-//                m_log.DebugFormat(
-//                    "[SCENE OBJECT GROUP]: Updating single position of {0} {1} to {2}", part.Name, part.LocalId, pos);
-
-                part.StoreUndoState(false);
-                part.IgnoreUndoUpdate = true;
+// unlock parts position change
+                if (m_rootPart.PhysActor != null)
+                    m_rootPart.PhysActor.Building = true;
 
                 if (part.UUID == m_rootPart.UUID)
                 {
@@ -2992,8 +3789,10 @@ namespace OpenSim.Region.Framework.Scenes
                     part.UpdateOffSet(pos);
                 }
 
+                if (m_rootPart.PhysActor != null)
+                    m_rootPart.PhysActor.Building = false;
+
                 HasGroupChanged = true;
-                part.IgnoreUndoUpdate = false;
             }
         }
 
@@ -3003,13 +3802,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="pos"></param>
         public void UpdateRootPosition(Vector3 pos)
         {
-//            m_log.DebugFormat(
-//                "[SCENE OBJECT GROUP]: Updating root position of {0} {1} to {2}", Name, LocalId, pos);
-
-//            SceneObjectPart[] parts = m_parts.GetArray();
-//            for (int i = 0; i < parts.Length; i++)
-//                parts[i].StoreUndoState();
-
+            // needs to be called with phys building true
             Vector3 newPos = new Vector3(pos.X, pos.Y, pos.Z);
             Vector3 oldPos =
                 new Vector3(AbsolutePosition.X + m_rootPart.OffsetPosition.X,
@@ -3032,7 +3825,14 @@ namespace OpenSim.Region.Framework.Scenes
             AbsolutePosition = newPos;
 
             HasGroupChanged = true;
-            ScheduleGroupForTerseUpdate();
+            if (m_rootPart.Undoing)
+            {
+                ScheduleGroupForFullUpdate();
+            }
+            else
+            {
+                ScheduleGroupForTerseUpdate();
+            }
         }
 
         #endregion
@@ -3045,24 +3845,16 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="rot"></param>
         public void UpdateGroupRotationR(Quaternion rot)
         {
-//            m_log.DebugFormat(
-//                "[SCENE OBJECT GROUP]: Updating group rotation R of {0} {1} to {2}", Name, LocalId, rot);
-
-//            SceneObjectPart[] parts = m_parts.GetArray();
-//            for (int i = 0; i < parts.Length; i++)
-//                parts[i].StoreUndoState();
-
-            m_rootPart.StoreUndoState(true);
-
             m_rootPart.UpdateRotation(rot);
-
+        
+/* this is done by rootpart RotationOffset set called by UpdateRotation
             PhysicsActor actor = m_rootPart.PhysActor;
             if (actor != null)
             {
                 actor.Orientation = m_rootPart.RotationOffset;
                 m_scene.PhysicsScene.AddPhysicsActorTaint(actor);
             }
-
+*/
             HasGroupChanged = true;
             ScheduleGroupForTerseUpdate();
         }
@@ -3074,16 +3866,6 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="rot"></param>
         public void UpdateGroupRotationPR(Vector3 pos, Quaternion rot)
         {
-//            m_log.DebugFormat(
-//                "[SCENE OBJECT GROUP]: Updating group rotation PR of {0} {1} to {2}", Name, LocalId, rot);
-
-//            SceneObjectPart[] parts = m_parts.GetArray();
-//            for (int i = 0; i < parts.Length; i++)
-//                parts[i].StoreUndoState();
-
-            RootPart.StoreUndoState(true);
-            RootPart.IgnoreUndoUpdate = true;
-
             m_rootPart.UpdateRotation(rot);
 
             PhysicsActor actor = m_rootPart.PhysActor;
@@ -3102,8 +3884,6 @@ namespace OpenSim.Region.Framework.Scenes
 
             HasGroupChanged = true;
             ScheduleGroupForTerseUpdate();
-
-            RootPart.IgnoreUndoUpdate = false;
         }
 
         /// <summary>
@@ -3116,13 +3896,11 @@ namespace OpenSim.Region.Framework.Scenes
             SceneObjectPart part = GetPart(localID);
 
             SceneObjectPart[] parts = m_parts.GetArray();
-            for (int i = 0; i < parts.Length; i++)
-                parts[i].StoreUndoState();
 
             if (part != null)
             {
-//                m_log.DebugFormat(
-//                    "[SCENE OBJECT GROUP]: Updating single rotation of {0} {1} to {2}", part.Name, part.LocalId, rot);
+                if (m_rootPart.PhysActor != null)
+                    m_rootPart.PhysActor.Building = true;
 
                 if (part.UUID == m_rootPart.UUID)
                 {
@@ -3132,6 +3910,9 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     part.UpdateRotation(rot);
                 }
+
+                if (m_rootPart.PhysActor != null)
+                    m_rootPart.PhysActor.Building = false;
             }
         }
 
@@ -3145,12 +3926,8 @@ namespace OpenSim.Region.Framework.Scenes
             SceneObjectPart part = GetPart(localID);
             if (part != null)
             {
-//                m_log.DebugFormat(
-//                    "[SCENE OBJECT GROUP]: Updating single position and rotation of {0} {1} to {2}",
-//                    part.Name, part.LocalId, rot);
-
-                part.StoreUndoState();
-                part.IgnoreUndoUpdate = true;
+                if (m_rootPart.PhysActor != null)
+                    m_rootPart.PhysActor.Building = true;
 
                 if (part.UUID == m_rootPart.UUID)
                 {
@@ -3163,7 +3940,8 @@ namespace OpenSim.Region.Framework.Scenes
                     part.OffsetPosition = pos;
                 }
 
-                part.IgnoreUndoUpdate = false;
+                if (m_rootPart.PhysActor != null)
+                    m_rootPart.PhysActor.Building = false;
             }
         }
 
@@ -3173,15 +3951,12 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="rot"></param>
         public void UpdateRootRotation(Quaternion rot)
         {
-//            m_log.DebugFormat(
-//                "[SCENE OBJECT GROUP]: Updating root rotation of {0} {1} to {2}",
-//                Name, LocalId, rot);
-
+            // needs to be called with phys building true
             Quaternion axRot = rot;
             Quaternion oldParentRot = m_rootPart.RotationOffset;
 
-            m_rootPart.StoreUndoState();
-            m_rootPart.UpdateRotation(rot);
+            //Don't use UpdateRotation because it schedules an update prematurely
+            m_rootPart.RotationOffset = rot;
 
             PhysicsActor pa = m_rootPart.PhysActor;
 
@@ -3197,35 +3972,145 @@ namespace OpenSim.Region.Framework.Scenes
                 SceneObjectPart prim = parts[i];
                 if (prim.UUID != m_rootPart.UUID)
                 {
-                    prim.IgnoreUndoUpdate = true;
+                    Quaternion NewRot = oldParentRot * prim.RotationOffset;
+                    NewRot = Quaternion.Inverse(axRot) * NewRot;
+                    prim.RotationOffset = NewRot;
+
                     Vector3 axPos = prim.OffsetPosition;
+
                     axPos *= oldParentRot;
                     axPos *= Quaternion.Inverse(axRot);
                     prim.OffsetPosition = axPos;
-                    Quaternion primsRot = prim.RotationOffset;
-                    Quaternion newRot = oldParentRot * primsRot;
-                    newRot = Quaternion.Inverse(axRot) * newRot;
-                    prim.RotationOffset = newRot;
-                    prim.ScheduleTerseUpdate();
-                    prim.IgnoreUndoUpdate = false;
-                }
-            }
-
-//            for (int i = 0; i < parts.Length; i++)
-//            {
-//                SceneObjectPart childpart = parts[i];
-//                if (childpart != m_rootPart)
-//                {
-////                    childpart.IgnoreUndoUpdate = false;
-////                    childpart.StoreUndoState();
-//                }
-//            }
+                }
+            }
 
-            m_rootPart.ScheduleTerseUpdate();
+            HasGroupChanged = true;
+            ScheduleGroupForFullUpdate();
+        }
 
-//            m_log.DebugFormat(
-//                "[SCENE OBJECT GROUP]: Updated root rotation of {0} {1} to {2}",
-//                Name, LocalId, rot);
+        private enum updatetype :int
+        {
+            none = 0,
+            partterse = 1,
+            partfull = 2,
+            groupterse = 3,
+            groupfull = 4
+        }
+
+        public void doChangeObject(SceneObjectPart part, ObjectChangeData data)
+        {
+            // TODO  this still as excessive *.Schedule*Update()s
+
+            if (part != null && part.ParentGroup != null)
+            {
+                ObjectChangeType change = data.change;
+                bool togroup = ((change & ObjectChangeType.Group) != 0);
+                //                bool uniform = ((what & ObjectChangeType.UniformScale) != 0);  not in use
+
+                SceneObjectGroup group = part.ParentGroup;
+                PhysicsActor pha = group.RootPart.PhysActor;
+
+                updatetype updateType = updatetype.none;
+
+                if (togroup)
+                {
+                    // related to group
+                    if ((change & (ObjectChangeType.Rotation | ObjectChangeType.Position)) != 0)
+                    {
+                        if ((change & ObjectChangeType.Rotation) != 0)
+                        {
+                            group.RootPart.UpdateRotation(data.rotation);
+                            updateType = updatetype.none;
+                        }
+                        if ((change & ObjectChangeType.Position) != 0)
+                        {
+                            if (IsAttachment || m_scene.Permissions.CanObjectEntry(group.UUID, false, data.position))
+                                UpdateGroupPosition(data.position);
+                            updateType = updatetype.groupterse;
+                        }
+                        else
+                        // ugly rotation update of all parts
+                        {
+                            group.ResetChildPrimPhysicsPositions();
+                        }
+
+                    }
+                    if ((change & ObjectChangeType.Scale) != 0)
+                    {
+                        if (pha != null)
+                            pha.Building = true;
+
+                        group.GroupResize(data.scale);
+                        updateType = updatetype.none;
+
+                        if (pha != null)
+                            pha.Building = false;
+                    }
+                }
+                else
+                {
+                    // related to single prim in a link-set ( ie group)
+                    if (pha != null)
+                        pha.Building = true;
+
+                    // root part is special
+                    // parts offset positions or rotations need to change also
+
+                    if (part == group.RootPart)
+                    {
+                        if ((change & ObjectChangeType.Rotation) != 0)
+                            group.UpdateRootRotation(data.rotation);
+                        if ((change & ObjectChangeType.Position) != 0)
+                            group.UpdateRootPosition(data.position);
+                        if ((change & ObjectChangeType.Scale) != 0)
+                            part.Resize(data.scale);
+                    }
+                    else
+                    {
+                        if ((change & ObjectChangeType.Position) != 0)
+                        {
+                            part.OffsetPosition = data.position;
+                            updateType = updatetype.partterse;
+                        }
+                        if ((change & ObjectChangeType.Rotation) != 0)
+                        {
+                            part.UpdateRotation(data.rotation);
+                            updateType = updatetype.none;
+                        }
+                        if ((change & ObjectChangeType.Scale) != 0)
+                        {
+                            part.Resize(data.scale);
+                            updateType = updatetype.none;
+                        }
+                    }
+
+                    if (pha != null)
+                        pha.Building = false;
+                }
+
+                if (updateType != updatetype.none)
+                {
+                    group.HasGroupChanged = true;
+
+                    switch (updateType)
+                    {
+                        case updatetype.partterse:
+                            part.ScheduleTerseUpdate();
+                            break;
+                        case updatetype.partfull:
+                            part.ScheduleFullUpdate();
+                            break;
+                        case updatetype.groupterse:
+                            group.ScheduleGroupForTerseUpdate();
+                            break;
+                        case updatetype.groupfull:
+                            group.ScheduleGroupForFullUpdate();
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            }
         }
 
         #endregion
@@ -3266,6 +4151,8 @@ namespace OpenSim.Region.Framework.Scenes
             waypoint.handle = handle;
             lock (m_rotTargets)
             {
+                if (m_rotTargets.Count >= 8)
+                    m_rotTargets.Remove(m_rotTargets.ElementAt(0).Key);
                 m_rotTargets.Add(handle, waypoint);
             }
             m_scene.AddGroupTarget(this);
@@ -3291,6 +4178,8 @@ namespace OpenSim.Region.Framework.Scenes
             waypoint.handle = handle;
             lock (m_targets)
             {
+                if (m_targets.Count >= 8)
+                    m_targets.Remove(m_targets.ElementAt(0).Key);
                 m_targets.Add(handle, waypoint);
             }
             m_scene.AddGroupTarget(this);
@@ -3324,10 +4213,11 @@ namespace OpenSim.Region.Framework.Scenes
                             scriptPosTarget target = m_targets[idx];
                             if (Util.GetDistanceTo(target.targetPos, m_rootPart.GroupPosition) <= target.tolerance)
                             {
+                                at_target = true;
+
                                 // trigger at_target
                                 if (m_scriptListens_atTarget)
                                 {
-                                    at_target = true;
                                     scriptPosTarget att = new scriptPosTarget();
                                     att.targetPos = target.targetPos;
                                     att.tolerance = target.tolerance;
@@ -3445,11 +4335,50 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
         }
-        
+
+        public Vector3 GetGeometricCenter()
+        {
+            // this is not real geometric center but a average of positions relative to root prim acording to
+            // http://wiki.secondlife.com/wiki/llGetGeometricCenter
+            // ignoring tortured prims details since sl also seems to ignore
+            // so no real use in doing it on physics
+            
+            Vector3 gc = Vector3.Zero;
+
+            int nparts = m_parts.Count;
+            if (nparts <= 1)
+                return gc;
+
+            SceneObjectPart[] parts = m_parts.GetArray();
+            nparts = parts.Length; // just in case it changed
+            if (nparts <= 1)
+                return gc;
+
+            Quaternion parentRot = RootPart.RotationOffset;
+            Vector3 pPos;
+
+            // average all parts positions
+            for (int i = 0; i < nparts; i++)
+            {
+                // do it directly
+                //                gc += parts[i].GetWorldPosition();
+                if (parts[i] != RootPart)
+                {
+                    pPos = parts[i].OffsetPosition;
+                    gc += pPos;
+                }
+
+            }
+            gc /= nparts;
+
+            // relative to root:
+//            gc -= AbsolutePosition;
+            return gc;
+        }
+
         public float GetMass()
         {
             float retmass = 0f;
-
             SceneObjectPart[] parts = m_parts.GetArray();
             for (int i = 0; i < parts.Length; i++)
                 retmass += parts[i].GetMass();
@@ -3457,6 +4386,39 @@ namespace OpenSim.Region.Framework.Scenes
             return retmass;
         }
 
+        // center of mass of full object
+        public Vector3 GetCenterOfMass()
+        {
+            PhysicsActor pa = RootPart.PhysActor;
+
+            if(((RootPart.Flags & PrimFlags.Physics) !=0) && pa !=null)
+            {
+                // physics knows better about center of mass of physical prims
+                Vector3 tmp = pa.CenterOfMass;
+                return tmp;
+            }
+            
+            Vector3 Ptot = Vector3.Zero;
+            float totmass = 0f;
+            float m;
+
+            SceneObjectPart[] parts = m_parts.GetArray();
+            for (int i = 0; i < parts.Length; i++)
+            {
+                m = parts[i].GetMass();
+                Ptot += parts[i].GetPartCenterOfMass() * m;
+                totmass += m;
+            }
+
+            if (totmass == 0)
+                totmass = 0;
+            else
+                totmass = 1 / totmass;
+            Ptot *= totmass;
+
+            return Ptot;
+        }
+
         /// <summary>
         /// If the object is a sculpt/mesh, retrieve the mesh data for each part and reinsert it into each shape so that
         /// the physics engine can use it.
@@ -3636,6 +4598,14 @@ namespace OpenSim.Region.Framework.Scenes
             FromItemID = uuid;
         }
 
+        public void ResetOwnerChangeFlag()
+        {
+            ForEachPart(delegate(SceneObjectPart part)
+            {
+                part.ResetOwnerChangeFlag();
+            });
+        }
+
         #endregion
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index cce8b21..7cab841 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -63,7 +63,8 @@ namespace OpenSim.Region.Framework.Scenes
         TELEPORT = 512,
         REGION_RESTART = 1024,
         MEDIA = 2048,
-        ANIMATION = 16384
+        ANIMATION = 16384,
+        POSITION = 32768
     }
 
     // I don't really know where to put this except here.
@@ -122,7 +123,18 @@ namespace OpenSim.Region.Framework.Scenes
         /// Denote all sides of the prim
         /// </value>
         public const int ALL_SIDES = -1;
-        
+
+        private const scriptEvents PhysicsNeededSubsEvents = (
+                    scriptEvents.collision | scriptEvents.collision_start | scriptEvents.collision_end |
+                    scriptEvents.land_collision | scriptEvents.land_collision_start | scriptEvents.land_collision_end
+                    );
+        private const scriptEvents PhyscicsPhantonSubsEvents = (
+                    scriptEvents.land_collision | scriptEvents.land_collision_start | scriptEvents.land_collision_end
+                    );
+        private const scriptEvents PhyscicsVolumeDtcSubsEvents = (
+                    scriptEvents.collision_start | scriptEvents.collision_end
+                    );      
+
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         /// <summary>
@@ -138,7 +150,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </remarks>
         public bool IsRoot 
         {
-            get { return ParentGroup.RootPart == this; } 
+            get { return Object.ReferenceEquals(ParentGroup.RootPart, this); } 
         }
 
         /// <summary>
@@ -197,12 +209,25 @@ namespace OpenSim.Region.Framework.Scenes
 
         public double SoundRadius;
 
+
         public uint TimeStampFull;
 
         public uint TimeStampLastActivity; // Will be used for AutoReturn
 
         public uint TimeStampTerse;
 
+        // The following two are to hold the attachment data
+        // while an object is inworld
+        [XmlIgnore]
+        public byte AttachPoint = 0;
+
+        [XmlIgnore]
+        public Vector3 AttachOffset = Vector3.Zero;
+
+        [XmlIgnore]
+        public Quaternion AttachRotation = Quaternion.Identity;
+
+        [XmlIgnore]
         public int STATUS_ROTATE_X;
 
         public int STATUS_ROTATE_Y;
@@ -229,8 +254,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public Vector3 RotationAxis = Vector3.One;
 
-        public bool VolumeDetectActive; // XmlIgnore set to avoid problems with persistance until I come to care for this
-                                        // Certainly this must be a persistant setting finally
+        public bool VolumeDetectActive;
 
         public bool IsWaitingForFirstSpinUpdatePacket;
 
@@ -270,10 +294,10 @@ namespace OpenSim.Region.Framework.Scenes
         private Quaternion m_sitTargetOrientation = Quaternion.Identity;
         private Vector3 m_sitTargetPosition;
         private string m_sitAnimation = "SIT";
+        private bool m_occupied;                                        // KF if any av is sitting on this prim
         private string m_text = String.Empty;
         private string m_touchName = String.Empty;
-        private readonly List<UndoState> m_undo = new List<UndoState>(5);
-        private readonly List<UndoState> m_redo = new List<UndoState>(5);
+        private UndoRedoState m_UndoRedo = null;
 
         private bool m_passTouches = false;
         private bool m_passCollisions = false;
@@ -301,14 +325,20 @@ namespace OpenSim.Region.Framework.Scenes
         protected Vector3 m_lastVelocity;
         protected Vector3 m_lastAcceleration;
         protected Vector3 m_lastAngularVelocity;
-        protected int m_lastTerseSent;
+        protected int m_lastUpdateSentTime;
+        protected float m_buoyancy = 0.0f;
+        protected Vector3 m_force;
+        protected Vector3 m_torque;
 
         protected byte m_physicsShapeType = (byte)PhysShapeType.prim;
         protected float m_density = 1000.0f; // in kg/m^3
         protected float m_gravitymod = 1.0f;
         protected float m_friction = 0.6f; // wood
         protected float m_bounce = 0.5f; // wood
-        
+
+
+        protected bool m_isSelected = false;
+
         /// <summary>
         /// Stores media texture data
         /// </summary>
@@ -320,10 +350,25 @@ namespace OpenSim.Region.Framework.Scenes
         private Vector3 m_cameraAtOffset;
         private bool m_forceMouselook;
 
-        // TODO: Collision sound should have default.
+
+        // 0 for default collision sounds, -1 for script disabled sound 1 for script defined sound
+        private sbyte m_collisionSoundType;
         private UUID m_collisionSound;
         private float m_collisionSoundVolume;
 
+        private int LastColSoundSentTime; 
+
+
+        private SOPVehicle m_vehicleParams = null;
+
+        private KeyframeMotion m_keyframeMotion = null;
+
+        public KeyframeMotion KeyframeMotion
+        {
+            get; set;
+        }
+
+
         #endregion Fields
 
 //        ~SceneObjectPart()
@@ -353,6 +398,7 @@ namespace OpenSim.Region.Framework.Scenes
             // this appears to have the same UUID (!) as the prim.  If this isn't the case, one can't drag items from
             // the prim into an agent inventory (Linden client reports that the "Object not found for drop" in its log
             m_inventory = new SceneObjectPartInventory(this);
+            LastColSoundSentTime = Util.EnvironmentTickCount();
         }
 
         /// <summary>
@@ -367,7 +413,7 @@ namespace OpenSim.Region.Framework.Scenes
             UUID ownerID, PrimitiveBaseShape shape, Vector3 groupPosition, 
             Quaternion rotationOffset, Vector3 offsetPosition) : this()
         {
-            m_name = "Primitive";
+            m_name = "Object";
 
             CreationDate = (int)Utils.DateTimeToUnixTime(Rezzed);
             LastOwnerID = CreatorID = OwnerID = ownerID;
@@ -406,7 +452,7 @@ namespace OpenSim.Region.Framework.Scenes
         private uint _ownerMask = (uint)PermissionMask.All;
         private uint _groupMask = (uint)PermissionMask.None;
         private uint _everyoneMask = (uint)PermissionMask.None;
-        private uint _nextOwnerMask = (uint)PermissionMask.All;
+        private uint _nextOwnerMask = (uint)(PermissionMask.Move | PermissionMask.Modify | PermissionMask.Transfer);
         private PrimFlags _flags = PrimFlags.None;
         private DateTime m_expires;
         private DateTime m_rezzed;
@@ -500,12 +546,16 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <value>
-        /// Access should be via Inventory directly - this property temporarily remains for xml serialization purposes
+        /// Get the inventory list
         /// </value>
         public TaskInventoryDictionary TaskInventory
         {
-            get { return m_inventory.Items; }
-            set { m_inventory.Items = value; }
+            get {
+                return m_inventory.Items;
+            }
+            set {
+                m_inventory.Items = value;
+            }
         }
 
         /// <summary>
@@ -555,20 +605,6 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        public byte Material
-        {
-            get { return (byte) m_material; }
-            set
-            {
-                m_material = (Material)value;
-
-                PhysicsActor pa = PhysActor;
-
-                if (pa != null)
-                    pa.SetMaterial((int)value);
-            }
-        }
-
         [XmlIgnore]
         public bool PassTouches
         {
@@ -594,6 +630,18 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        public bool IsSelected
+        {
+            get { return m_isSelected; }
+            set
+            {
+                m_isSelected = value;
+                if (ParentGroup != null)
+                    ParentGroup.PartSelectChanged(value);
+            }
+        }
+        
+        
         public Dictionary<int, string> CollisionFilter
         {
             get { return m_CollisionFilter; }
@@ -662,14 +710,12 @@ namespace OpenSim.Region.Framework.Scenes
             set { m_LoopSoundSlavePrims = value; }
         }
 
-        
         public Byte[] TextureAnimation
         {
             get { return m_TextureAnimation; }
             set { m_TextureAnimation = value; }
         }
 
-        
         public Byte[] ParticleSystem
         {
             get { return m_particleSystem; }
@@ -706,9 +752,12 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 // If this is a linkset, we don't want the physics engine mucking up our group position here.
                 PhysicsActor actor = PhysActor;
-                // If physical and the root prim of a linkset, the position of the group is what physics thinks.
-                if (actor != null && ParentID == 0)
-                    m_groupPosition = actor.Position;
+                if (ParentID == 0)
+                {
+                    if (actor != null)
+                        m_groupPosition = actor.Position;
+                    return m_groupPosition;
+                }
 
                 // If I'm an attachment, my position is reported as the position of who I'm attached to
                 if (ParentGroup.IsAttachment)
@@ -718,14 +767,16 @@ namespace OpenSim.Region.Framework.Scenes
                         return sp.AbsolutePosition;
                 }
 
+                // use root prim's group position. Physics may have updated it
+                if (ParentGroup.RootPart != this)
+                    m_groupPosition = ParentGroup.RootPart.GroupPosition;
                 return m_groupPosition;
             }
             set
             {
                 m_groupPosition = value;
-
                 PhysicsActor actor = PhysActor;
-                if (actor != null)
+                if (actor != null && ParentGroup.Scene.PhysicsScene != null)
                 {
                     try
                     {
@@ -749,16 +800,6 @@ namespace OpenSim.Region.Framework.Scenes
                         m_log.ErrorFormat("[SCENEOBJECTPART]: GROUP POSITION. {0}", e);
                     }
                 }
-                
-                // TODO if we decide to do sitting in a more SL compatible way (multiple avatars per prim), this has to be fixed, too
-                if (SitTargetAvatar != UUID.Zero)
-                {
-                    ScenePresence avatar;
-                    if (ParentGroup.Scene.TryGetScenePresence(SitTargetAvatar, out avatar))
-                    {
-                        avatar.ParentPosition = GetWorldPosition();
-                    }
-                }
             }
         }
 
@@ -767,7 +808,7 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_offsetPosition; }
             set
             {
-//                StoreUndoState();
+                Vector3 oldpos = m_offsetPosition;
                 m_offsetPosition = value;
 
                 if (ParentGroup != null && !ParentGroup.IsDeleted)
@@ -779,10 +820,25 @@ namespace OpenSim.Region.Framework.Scenes
                         actor.Orientation = GetWorldRotation();
 
                         // Tell the physics engines that this prim changed.
-                        if (ParentGroup.Scene != null)
+                        if (ParentGroup.Scene != null && ParentGroup.Scene.PhysicsScene != null)
                             ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor);
                     }
+
+                    if (!m_parentGroup.m_dupeInProgress)
+                    {
+                        List<ScenePresence> avs = ParentGroup.GetLinkedAvatars();
+                        foreach (ScenePresence av in avs)
+                        {
+                            if (av.ParentID == m_localId)
+                            {
+                                Vector3 offset = (m_offsetPosition - oldpos);
+                                av.AbsolutePosition += offset;
+                                av.SendAvatarDataToAllAgents();
+                            }
+                        }
+                    }
                 }
+                TriggerScriptChangedEvent(Changed.POSITION);
             }
         }
 
@@ -833,7 +889,7 @@ namespace OpenSim.Region.Framework.Scenes
             
             set
             {
-                StoreUndoState();
+//                StoreUndoState();
                 m_rotationOffset = value;
 
                 PhysicsActor actor = PhysActor;
@@ -921,19 +977,36 @@ namespace OpenSim.Region.Framework.Scenes
             get
             {
                 PhysicsActor actor = PhysActor;
-                if ((actor != null) && actor.IsPhysical)
+                if ((actor != null) && actor.IsPhysical && ParentGroup.RootPart == this)
                 {
                     m_angularVelocity = actor.RotationalVelocity;
                 }
                 return m_angularVelocity;
             }
-            set { m_angularVelocity = value; }
+            set
+            {
+                m_angularVelocity = value;
+                PhysicsActor actor = PhysActor;
+                if ((actor != null) && actor.IsPhysical && ParentGroup.RootPart == this && VehicleType == (int)Vehicle.TYPE_NONE)
+                {
+                    actor.RotationalVelocity = m_angularVelocity;
+                }                       
+            }
         }
 
         /// <summary></summary>
         public Vector3 Acceleration
         {
-            get { return m_acceleration; }
+                        get 
+                        { 
+                PhysicsActor actor = PhysActor;
+                if (actor != null)
+                                {
+                                        m_acceleration = actor.Acceleration;
+                                }
+                                return m_acceleration;
+                        } 
+            
             set { m_acceleration = value; }
         }
 
@@ -1001,7 +1074,10 @@ namespace OpenSim.Region.Framework.Scenes
         public PrimitiveBaseShape Shape
         {
             get { return m_shape; }
-            set { m_shape = value;}
+            set
+            {
+                m_shape = value;
+            }
         }
 
         /// <summary>
@@ -1014,7 +1090,6 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (m_shape != null)
                 {
-                    StoreUndoState();
 
                     m_shape.Scale = value;
 
@@ -1082,10 +1157,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             get
             {
-                if (ParentGroup.IsAttachment)
-                    return GroupPosition;
-
-                return m_offsetPosition + m_groupPosition;
+                return GroupPosition + (m_offsetPosition * ParentGroup.RootPart.RotationOffset);
             }
         }
 
@@ -1263,6 +1335,13 @@ namespace OpenSim.Region.Framework.Scenes
                 _flags = value; 
             }
         }
+        
+        [XmlIgnore]
+        public bool IsOccupied                          // KF If an av is sittingon this prim
+        {
+                get { return m_occupied; }
+                set { m_occupied = value; }
+        }
 
         /// <summary>
         /// ID of the avatar that is sat on us if we have a sit target.  If there is no such avatar then is UUID.Zero
@@ -1313,12 +1392,41 @@ namespace OpenSim.Region.Framework.Scenes
             set { m_sitAnimation = value; }
         }
 
+        public UUID invalidCollisionSoundUUID = new UUID("ffffffff-ffff-ffff-ffff-ffffffffffff");
+
+        // 0 for default collision sounds, -1 for script disabled sound 1 for script defined sound
+        // runtime thing.. do not persist
+        [XmlIgnore]
+        public sbyte CollisionSoundType
+        {
+            get
+            {
+                return m_collisionSoundType;
+            }
+            set
+            {
+                m_collisionSoundType = value;
+                if (value == -1)
+                    m_collisionSound = invalidCollisionSoundUUID;
+                else if (value == 0)
+                    m_collisionSound = UUID.Zero;
+            }
+        }
+
         public UUID CollisionSound
         {
             get { return m_collisionSound; }
             set
-            {
+            {           
                 m_collisionSound = value;
+
+                if (value == invalidCollisionSoundUUID)
+                    m_collisionSoundType = -1;
+                else if (value == UUID.Zero)
+                    m_collisionSoundType = 0;
+                else
+                    m_collisionSoundType = 1;
+
                 aggregateScriptEvents();
             }
         }
@@ -1329,6 +1437,125 @@ namespace OpenSim.Region.Framework.Scenes
             set { m_collisionSoundVolume = value; }
         }
 
+        public float Buoyancy
+        {
+            get
+            {
+                if (ParentGroup.RootPart == this)
+                    return m_buoyancy;
+
+                return ParentGroup.RootPart.Buoyancy;
+            }
+            set
+            {
+                if (ParentGroup != null && ParentGroup.RootPart != null && ParentGroup.RootPart != this)
+                {
+                    ParentGroup.RootPart.Buoyancy = value;
+                    return;
+                }
+                m_buoyancy = value;
+                if (PhysActor != null)
+                    PhysActor.Buoyancy = value;
+            }
+        }
+
+        public Vector3 Force
+        {
+            get
+            {
+                if (ParentGroup.RootPart == this)
+                    return m_force;
+
+                return ParentGroup.RootPart.Force;
+            }
+
+            set
+            {
+                if (ParentGroup != null && ParentGroup.RootPart != null && ParentGroup.RootPart != this)
+                {
+                    ParentGroup.RootPart.Force = value;
+                    return;
+                }
+                m_force = value;
+                if (PhysActor != null)
+                    PhysActor.Force = value;
+            }
+        }
+
+        public Vector3 Torque
+        {
+            get
+            {
+                if (ParentGroup.RootPart == this)
+                    return m_torque;
+                
+                return ParentGroup.RootPart.Torque;
+            }
+
+            set
+            {
+                if (ParentGroup != null && ParentGroup.RootPart != null && ParentGroup.RootPart != this)
+                {
+                    ParentGroup.RootPart.Torque = value;
+                    return;
+                }
+                m_torque = value;
+                if (PhysActor != null)
+                    PhysActor.Torque = value;
+            }
+        }
+
+        public byte Material
+        {
+            get { return (byte)m_material; }
+            set
+            {
+                if (value >= 0 && value <= (byte)SOPMaterialData.MaxMaterial)
+                {
+                    bool update = false;
+
+                    if (m_material != (Material)value)
+                    {
+                        update = true;
+                        m_material = (Material)value;
+                    }
+
+                    if (m_friction != SOPMaterialData.friction(m_material))
+                    {
+                        update = true;
+                        m_friction = SOPMaterialData.friction(m_material);
+                    }
+
+                    if (m_bounce != SOPMaterialData.bounce(m_material))
+                    {
+                        update = true;
+                        m_bounce = SOPMaterialData.bounce(m_material);
+                    }
+
+                    if (update)
+                    {
+                        if (PhysActor != null)
+                        {
+                            PhysActor.SetMaterial((int)value);
+                        }
+                        if(ParentGroup != null)
+                            ParentGroup.HasGroupChanged = true;
+                        ScheduleFullUpdateIfNone();
+                        UpdatePhysRequired = true;
+                    }
+                }
+            }
+        }
+
+        // not a propriety to move to methods place later
+        private bool HasMesh()
+        {
+            if (Shape != null && (Shape.SculptType == (byte)SculptType.Mesh))
+                return true;
+            return false;
+        }
+
+        // not a propriety to move to methods place later
         public byte DefaultPhysicsShapeType()
         {
             byte type;
@@ -1341,6 +1568,65 @@ namespace OpenSim.Region.Framework.Scenes
             return type;
         }
 
+        [XmlIgnore]
+        public bool UsesComplexCost
+        {
+            get
+            {
+                byte pst = PhysicsShapeType;
+                if(pst == (byte) PhysShapeType.none || pst == (byte) PhysShapeType.convex || HasMesh())
+                    return true;
+                return false;
+            }
+        }
+
+        [XmlIgnore]
+        public float PhysicsCost
+        {
+            get
+            {
+                if(PhysicsShapeType == (byte)PhysShapeType.none)
+                    return 0;
+
+                float cost = 0.1f;
+                if (PhysActor != null)
+                    cost = PhysActor.PhysicsCost;
+                else
+                    cost = 0.1f;
+
+                if ((Flags & PrimFlags.Physics) != 0)
+                    cost *= (1.0f + 0.01333f * Scale.LengthSquared()); // 0.01333 == 0.04/3
+                return cost;
+            }
+        }
+
+        [XmlIgnore]
+        public float StreamingCost
+        {
+            get
+            {
+                float cost;
+                if (PhysActor != null)
+                    cost = PhysActor.StreamCost;
+                else
+                    cost = 1.0f;
+                return 1.0f;
+            }
+        }
+
+        [XmlIgnore]
+        public float SimulationCost
+        {
+            get
+            {
+                // ignoring scripts. Don't like considering them for this
+                if((Flags & PrimFlags.Physics) != 0)
+                    return 1.0f;
+
+                return 0.5f;
+            }
+        }
+
         public byte PhysicsShapeType
         {
             get { return m_physicsShapeType; }
@@ -1374,11 +1660,14 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                     else if (PhysActor == null)
                     {
-                        ApplyPhysics((uint)Flags, VolumeDetectActive);
+                        ApplyPhysics((uint)Flags, VolumeDetectActive, false);
+                        UpdatePhysicsSubscribedEvents();
                     }
                     else
                     {
                         PhysActor.PhysicsShapeType = m_physicsShapeType;
+//                        if (Shape.SculptEntry)
+//                            CheckSculptAndLoad();
                     }
 
                     if (ParentGroup != null)
@@ -1480,6 +1769,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+
         #endregion Public Properties with only Get
 
         private uint ApplyMask(uint val, bool set, uint mask)
@@ -1625,6 +1915,61 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        //      SetVelocity for LSL llSetVelocity..  may need revision if having other uses in future
+        public void SetVelocity(Vector3 pVel, bool localGlobalTF)
+        {
+            if (ParentGroup == null || ParentGroup.IsDeleted)
+                return;
+
+            if (ParentGroup.IsAttachment)
+                return;                         // don't work on attachments (for now ??)
+
+            SceneObjectPart root = ParentGroup.RootPart;
+
+            if (root.VehicleType != (int)Vehicle.TYPE_NONE) // don't mess with vehicles
+                return;
+
+            PhysicsActor pa = root.PhysActor;
+
+            if (pa == null || !pa.IsPhysical)
+                return;
+
+            if (localGlobalTF)
+            {
+                pVel = pVel * GetWorldRotation();
+            }
+
+            ParentGroup.Velocity = pVel;
+        }
+
+        //      SetAngularVelocity for LSL llSetAngularVelocity..  may need revision if having other uses in future
+        public void SetAngularVelocity(Vector3 pAngVel, bool localGlobalTF)
+        {
+            if (ParentGroup == null || ParentGroup.IsDeleted)
+                return;
+
+            if (ParentGroup.IsAttachment)
+                return;                         // don't work on attachments (for now ??)
+
+            SceneObjectPart root = ParentGroup.RootPart;
+
+            if (root.VehicleType != (int)Vehicle.TYPE_NONE) // don't mess with vehicles
+                return;
+
+            PhysicsActor pa = root.PhysActor;
+
+            if (pa == null || !pa.IsPhysical)
+                return;
+
+            if (localGlobalTF)
+            {
+                pAngVel = pAngVel * GetWorldRotation();
+            }
+
+            root.AngularVelocity = pAngVel;
+        }
+        
+
         /// <summary>
         /// hook to the physics scene to apply angular impulse
         /// This is sent up to the group, which then finds the root prim
@@ -1645,7 +1990,7 @@ namespace OpenSim.Region.Framework.Scenes
                 impulse = newimpulse;
             }
 
-            ParentGroup.applyAngularImpulse(impulse);
+            ParentGroup.ApplyAngularImpulse(impulse);
         }
 
         /// <summary>
@@ -1655,20 +2000,24 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="impulsei">Vector force</param>
         /// <param name="localGlobalTF">true for the local frame, false for the global frame</param>
-        public void SetAngularImpulse(Vector3 impulsei, bool localGlobalTF)
+        
+        // this is actualy Set Torque.. keeping naming so not to edit lslapi also
+        public void SetAngularImpulse(Vector3 torquei, bool localGlobalTF)
         {
-            Vector3 impulse = impulsei;
+            Vector3 torque = torquei;
 
             if (localGlobalTF)
             {
+/*
                 Quaternion grot = GetWorldRotation();
                 Quaternion AXgrot = grot;
                 Vector3 AXimpulsei = impulsei;
                 Vector3 newimpulse = AXimpulsei * AXgrot;
-                impulse = newimpulse;
+ */
+                torque *= GetWorldRotation();
             }
 
-            ParentGroup.setAngularImpulse(impulse);
+            Torque = torque;
         }
 
         /// <summary>
@@ -1676,7 +2025,9 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="rootObjectFlags"></param>
         /// <param name="VolumeDetectActive"></param>
-        public void ApplyPhysics(uint rootObjectFlags, bool _VolumeDetectActive)
+        /// <param name="building"></param>
+
+                public void ApplyPhysics(uint _ObjectFlags, bool _VolumeDetectActive, bool building)
         {
             VolumeDetectActive = _VolumeDetectActive;
 
@@ -1686,8 +2037,8 @@ namespace OpenSim.Region.Framework.Scenes
             if (PhysicsShapeType == (byte)PhysShapeType.none)
                 return;
 
-            bool isPhysical = (rootObjectFlags & (uint) PrimFlags.Physics) != 0;
-            bool isPhantom = (rootObjectFlags & (uint) PrimFlags.Phantom) != 0;
+            bool isPhysical = (_ObjectFlags & (uint) PrimFlags.Physics) != 0;
+            bool isPhantom = (_ObjectFlags & (uint)PrimFlags.Phantom) != 0;
 
             if (_VolumeDetectActive)
                 isPhantom = true;
@@ -1701,7 +2052,8 @@ namespace OpenSim.Region.Framework.Scenes
                 if ((!isPhantom || isPhysical || _VolumeDetectActive) && !ParentGroup.IsAttachment
                                                 && !(Shape.PathCurve == (byte)Extrusion.Flexible))
                 {
-                    AddToPhysics(isPhysical, isPhantom, isPhysical);
+                    AddToPhysics(isPhysical, isPhantom, building, isPhysical);
+                    UpdatePhysicsSubscribedEvents(); // not sure if appliable here
                 }
                 else
                     PhysActor = null; // just to be sure
@@ -1756,6 +2108,12 @@ namespace OpenSim.Region.Framework.Scenes
             dupe.Category = Category;
             dupe.m_rezzed = m_rezzed;
 
+            dupe.m_UndoRedo = null;
+            dupe.m_isSelected = false;
+
+            dupe.IgnoreUndoUpdate = false;
+            dupe.Undoing = false;
+
             dupe.m_inventory = new SceneObjectPartInventory(dupe);
             dupe.m_inventory.Items = (TaskInventoryDictionary)m_inventory.Items.Clone();
 
@@ -1771,6 +2129,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             // Move afterwards ResetIDs as it clears the localID
             dupe.LocalId = localID;
+
             // This may be wrong...    it might have to be applied in SceneObjectGroup to the object that's being duplicated.
             dupe.LastOwnerID = OwnerID;
 
@@ -1778,6 +2137,9 @@ namespace OpenSim.Region.Framework.Scenes
             Array.Copy(Shape.ExtraParams, extraP, extraP.Length);
             dupe.Shape.ExtraParams = extraP;
 
+            // safeguard  actual copy is done in sog.copy
+            dupe.KeyframeMotion = null;
+
             dupe.DynAttrs.CopyFrom(DynAttrs);
             
             if (userExposed)
@@ -1791,8 +2153,12 @@ namespace OpenSim.Region.Framework.Scenes
 */                
                 bool UsePhysics = ((dupe.Flags & PrimFlags.Physics) != 0);
                 dupe.DoPhysicsPropertyUpdate(UsePhysics, true);
+//                dupe.UpdatePhysicsSubscribedEvents();  // not sure...
             }
             
+            if (dupe.PhysActor != null)
+                dupe.PhysActor.LocalID = localID;
+
             ParentGroup.Scene.EventManager.TriggerOnSceneObjectPartCopy(dupe, this, userExposed);
 
 //            m_log.DebugFormat("[SCENE OBJECT PART]: Clone of {0} {1} finished", Name, UUID);
@@ -1811,10 +2177,10 @@ namespace OpenSim.Region.Framework.Scenes
         {
             if (asset != null)
                 SculptTextureCallback(asset);
-            else
-                m_log.WarnFormat(
-                    "[SCENE OBJECT PART]: Part {0} {1} requested mesh/sculpt data for asset id {2} from asset service but received no data",
-                    Name, UUID, id);
+//            else
+//                m_log.WarnFormat(
+//                    "[SCENE OBJECT PART]: Part {0} {1} requested mesh/sculpt data for asset id {2} from asset service but received no data",
+//                    Name, UUID, id);
         }
 */
         /// <summary>
@@ -1913,6 +2279,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         /// <summary>
         /// Do a physics propery update for this part.
+        /// now also updates phantom and volume detector
         /// </summary>
         /// <param name="UsePhysics"></param>
         /// <param name="isNew"></param>
@@ -1938,61 +2305,69 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         if (pa.IsPhysical) // implies UsePhysics==false for this block
                         {
-                            if (!isNew)
+                            if (!isNew)  // implies UsePhysics==false for this block
+                            {
                                 ParentGroup.Scene.RemovePhysicalPrim(1);
 
-                            pa.OnRequestTerseUpdate -= PhysicsRequestingTerseUpdate;
-                            pa.OnOutOfBounds -= PhysicsOutOfBounds;
-                            pa.delink();
+                                Velocity = new Vector3(0, 0, 0);
+                                Acceleration = new Vector3(0, 0, 0);
+                                if (ParentGroup.RootPart == this)
+                                    AngularVelocity = new Vector3(0, 0, 0);
 
-                            if (ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints && (!isNew))
-                            {
-                                // destroy all joints connected to this now deactivated body
-                                ParentGroup.Scene.PhysicsScene.RemoveAllJointsConnectedToActorThreadLocked(pa);
-                            }
+                                if (pa.Phantom && !VolumeDetectActive)
+                                {
+                                    RemoveFromPhysics();
+                                    return;
+                                }
 
-                            // stop client-side interpolation of all joint proxy objects that have just been deleted
-                            // this is done because RemoveAllJointsConnectedToActor invokes the OnJointDeactivated callback,
-                            // which stops client-side interpolation of deactivated joint proxy objects.
+                                pa.IsPhysical = UsePhysics;
+                                pa.OnRequestTerseUpdate -= PhysicsRequestingTerseUpdate;
+                                pa.OnOutOfBounds -= PhysicsOutOfBounds;
+                                pa.delink();
+                                if (ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints)
+                                {
+                                    // destroy all joints connected to this now deactivated body
+                                    ParentGroup.Scene.PhysicsScene.RemoveAllJointsConnectedToActorThreadLocked(pa);
+                                }
+                            }
                         }
 
-                        if (!UsePhysics && !isNew)
-                        {
-                            // reset velocity to 0 on physics switch-off. Without that, the client thinks the
-                            // prim still has velocity and continues to interpolate its position along the old
-                            // velocity-vector.
-                            Velocity = new Vector3(0, 0, 0);
-                            Acceleration = new Vector3(0, 0, 0);
-                            AngularVelocity = new Vector3(0, 0, 0);
-                            //RotationalVelocity = new Vector3(0, 0, 0);
-                        }
+                        if (pa.IsPhysical != UsePhysics)
+                            pa.IsPhysical = UsePhysics;
 
-                        pa.IsPhysical = UsePhysics;
+                        if (UsePhysics)
+                        {
+                            if (ParentGroup.RootPart.KeyframeMotion != null)
+                                ParentGroup.RootPart.KeyframeMotion.Stop();
+                            ParentGroup.RootPart.KeyframeMotion = null;
+                            ParentGroup.Scene.AddPhysicalPrim(1);
 
-                        // If we're not what we're supposed to be in the physics scene, recreate ourselves.
-                        //m_parentGroup.Scene.PhysicsScene.RemovePrim(PhysActor);
-                        /// that's not wholesome.  Had to make Scene public
-                        //PhysActor = null;
+                            PhysActor.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate;
+                            PhysActor.OnOutOfBounds += PhysicsOutOfBounds;
 
-                        if ((Flags & PrimFlags.Phantom) == 0)
-                        {
-                            if (UsePhysics)
+                            if (ParentID != 0 && ParentID != LocalId)
                             {
-                                ParentGroup.Scene.AddPhysicalPrim(1);
+                                PhysicsActor parentPa = ParentGroup.RootPart.PhysActor;
 
-                                pa.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate;
-                                pa.OnOutOfBounds += PhysicsOutOfBounds;
-                                if (ParentID != 0 && ParentID != LocalId)
+                                if (parentPa != null)
                                 {
-                                    PhysicsActor parentPa = ParentGroup.RootPart.PhysActor;
-
-                                    if (parentPa != null)
-                                    {
-                                        pa.link(parentPa);
-                                    }
+                                    pa.link(parentPa);
                                 }
                             }
-                        }
+                        }                           
+                    }
+
+                    bool phan = ((Flags & PrimFlags.Phantom) != 0);
+                    if (pa.Phantom != phan)
+                        pa.Phantom = phan;
+
+// some engines dont' have this check still
+//                    if (VolumeDetectActive != pa.IsVolumeDtc)
+                    {
+                        if (VolumeDetectActive)
+                            pa.SetVolumeDetect(1);
+                        else
+                            pa.SetVolumeDetect(0);
                     }
 
                     // If this part is a sculpt then delay the physics update until we've asynchronously loaded the
@@ -2111,42 +2486,63 @@ namespace OpenSim.Region.Framework.Scenes
 
         public Vector3 GetGeometricCenter()
         {
+            // this is not real geometric center but a average of positions relative to root prim acording to
+            // http://wiki.secondlife.com/wiki/llGetGeometricCenter
+            // ignoring tortured prims details since sl also seems to ignore
+            // so no real use in doing it on physics
+            if (ParentGroup.IsDeleted)
+                return new Vector3(0, 0, 0);
+
+            return ParentGroup.GetGeometricCenter();
+        }
+
+        public float GetMass()
+        {
             PhysicsActor pa = PhysActor;
 
             if (pa != null)
-                return new Vector3(pa.GeometricCenter.X, pa.GeometricCenter.Y, pa.GeometricCenter.Z);
+                return pa.Mass;
             else
-                return new Vector3(0, 0, 0);
+                return 0;
         }
 
         public Vector3 GetCenterOfMass()
         {
+            if (ParentGroup.RootPart == this)
+            {
+                if (ParentGroup.IsDeleted)
+                    return AbsolutePosition;
+                return ParentGroup.GetCenterOfMass();
+            }
+
             PhysicsActor pa = PhysActor;
 
             if (pa != null)
-                return new Vector3(pa.CenterOfMass.X, pa.CenterOfMass.Y, pa.CenterOfMass.Z);
+            {
+                Vector3 tmp = pa.CenterOfMass;
+                return tmp;
+            }
             else
-                return new Vector3(0, 0, 0);
+                return AbsolutePosition;
         }
 
-        public float GetMass()
+        public Vector3 GetPartCenterOfMass()
         {
             PhysicsActor pa = PhysActor;
 
             if (pa != null)
-                return pa.Mass;
+            {
+                Vector3 tmp = pa.CenterOfMass;
+                return tmp;
+            }
             else
-                return 0;
+                return AbsolutePosition;
         }
 
+
         public Vector3 GetForce()
         {
-            PhysicsActor pa = PhysActor;
-
-            if (pa != null)
-                return pa.Force;
-            else
-                return Vector3.Zero;
+            return Force;
         }
 
         /// <summary>
@@ -2361,15 +2757,25 @@ namespace OpenSim.Region.Framework.Scenes
 
         private void SendLandCollisionEvent(scriptEvents ev, ScriptCollidingNotification notify)
         {
-            if ((ParentGroup.RootPart.ScriptEvents & ev) != 0)
-            {
-                ColliderArgs LandCollidingMessage = new ColliderArgs();
-                List<DetectedObject> colliding = new List<DetectedObject>();
-                    
-                colliding.Add(CreateDetObjectForGround());
-                LandCollidingMessage.Colliders = colliding;
+            bool sendToRoot = true;
 
+            ColliderArgs LandCollidingMessage = new ColliderArgs();
+            List<DetectedObject> colliding = new List<DetectedObject>();
+                
+            colliding.Add(CreateDetObjectForGround());
+            LandCollidingMessage.Colliders = colliding;
+
+            if (Inventory.ContainsScripts())
+            {
+                if (!PassCollisions)
+                    sendToRoot = false;
+            }
+            if ((ScriptEvents & ev) != 0)
                 notify(LocalId, LandCollidingMessage);
+
+            if ((ParentGroup.RootPart.ScriptEvents & ev) != 0 && sendToRoot)
+            {
+                notify(ParentGroup.RootPart.LocalId, LandCollidingMessage);
             }
         }
 
@@ -2385,57 +2791,120 @@ namespace OpenSim.Region.Framework.Scenes
             List<uint> endedColliders = new List<uint>();
             List<uint> startedColliders = new List<uint>();
 
-            // calculate things that started colliding this time
-            // and build up list of colliders this time
-            foreach (uint localid in collissionswith.Keys)
+            if (collissionswith.Count == 0)
             {
-                thisHitColliders.Add(localid);
-                if (!m_lastColliders.Contains(localid))
-                    startedColliders.Add(localid);
-            }
+                if (m_lastColliders.Count == 0)
+                    return; // nothing to do
 
-            // calculate things that ended colliding
-            foreach (uint localID in m_lastColliders)
-            {
-                if (!thisHitColliders.Contains(localID))
+                foreach (uint localID in m_lastColliders)
+                {
                     endedColliders.Add(localID);
+                }
+                m_lastColliders.Clear();
             }
 
-            //add the items that started colliding this time to the last colliders list.
-            foreach (uint localID in startedColliders)
-                m_lastColliders.Add(localID);
+            else
+            {
+                List<CollisionForSoundInfo> soundinfolist = new List<CollisionForSoundInfo>();
+
+                // calculate things that started colliding this time
+                // and build up list of colliders this time
+                if (!VolumeDetectActive && CollisionSoundType >= 0)
+                {
+                    CollisionForSoundInfo soundinfo;
+                    ContactPoint curcontact;
 
-            // remove things that ended colliding from the last colliders list
-            foreach (uint localID in endedColliders)
-                m_lastColliders.Remove(localID);
+                    foreach (uint id in collissionswith.Keys)
+                    {
+                        thisHitColliders.Add(id);
+                        if (!m_lastColliders.Contains(id))
+                        {
+                            startedColliders.Add(id);
 
-            // play the sound.
-            if (startedColliders.Count > 0 && CollisionSound != UUID.Zero && CollisionSoundVolume > 0.0f)
-            {
-                ISoundModule soundModule = ParentGroup.Scene.RequestModuleInterface<ISoundModule>();
-                if (soundModule != null)
+                            curcontact = collissionswith[id];
+                            if (Math.Abs(curcontact.RelativeSpeed) > 0.2)
+                            {
+                                soundinfo = new CollisionForSoundInfo();
+                                soundinfo.colliderID = id;
+                                soundinfo.position = curcontact.Position;
+                                soundinfo.relativeVel = curcontact.RelativeSpeed;
+                                soundinfolist.Add(soundinfo);
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    foreach (uint id in collissionswith.Keys)
+                    {
+                        thisHitColliders.Add(id);
+                        if (!m_lastColliders.Contains(id))
+                            startedColliders.Add(id);
+                    }
+                }
+
+                // calculate things that ended colliding
+                foreach (uint localID in m_lastColliders)
                 {
-                    soundModule.SendSound(UUID, CollisionSound,
-                            CollisionSoundVolume, true, (byte)0, 0, false,
-                            false);
+                    if (!thisHitColliders.Contains(localID))
+                        endedColliders.Add(localID);
                 }
+
+                //add the items that started colliding this time to the last colliders list.
+                foreach (uint localID in startedColliders)
+                    m_lastColliders.Add(localID);
+
+                // remove things that ended colliding from the last colliders list
+                foreach (uint localID in endedColliders)
+                    m_lastColliders.Remove(localID);
+
+                // play sounds.
+                if (soundinfolist.Count > 0)
+                    CollisionSounds.PartCollisionSound(this, soundinfolist);
             }
 
             SendCollisionEvent(scriptEvents.collision_start, startedColliders, ParentGroup.Scene.EventManager.TriggerScriptCollidingStart);
-            SendCollisionEvent(scriptEvents.collision      , m_lastColliders , ParentGroup.Scene.EventManager.TriggerScriptColliding);
+            if (!VolumeDetectActive)
+                SendCollisionEvent(scriptEvents.collision  , m_lastColliders , ParentGroup.Scene.EventManager.TriggerScriptColliding);
             SendCollisionEvent(scriptEvents.collision_end  , endedColliders  , ParentGroup.Scene.EventManager.TriggerScriptCollidingEnd);
 
             if (startedColliders.Contains(0))
-            {
-                if (m_lastColliders.Contains(0))
-                    SendLandCollisionEvent(scriptEvents.land_collision, ParentGroup.Scene.EventManager.TriggerScriptLandColliding);
-                else
-                    SendLandCollisionEvent(scriptEvents.land_collision_start, ParentGroup.Scene.EventManager.TriggerScriptLandCollidingStart);
-            }
+                SendLandCollisionEvent(scriptEvents.land_collision_start, ParentGroup.Scene.EventManager.TriggerScriptLandCollidingStart);
+            if (m_lastColliders.Contains(0))
+                SendLandCollisionEvent(scriptEvents.land_collision, ParentGroup.Scene.EventManager.TriggerScriptLandColliding);
             if (endedColliders.Contains(0))
                 SendLandCollisionEvent(scriptEvents.land_collision_end, ParentGroup.Scene.EventManager.TriggerScriptLandCollidingEnd);
         }
 
+        // The Collision sounds code calls this
+        public void SendCollisionSound(UUID soundID, double volume, Vector3 position)
+        {
+            if (soundID == UUID.Zero)
+                return;
+
+            ISoundModule soundModule = ParentGroup.Scene.RequestModuleInterface<ISoundModule>();
+            if (soundModule == null)
+                return;
+
+            if (volume > 1)
+                volume = 1;
+            if (volume < 0)
+                volume = 0;
+
+            int now = Util.EnvironmentTickCount();
+            if(Util.EnvironmentTickCountSubtract(now,LastColSoundSentTime) <200)
+                return;
+
+            LastColSoundSentTime = now;
+
+            UUID ownerID = OwnerID;
+            UUID objectID = ParentGroup.RootPart.UUID;
+            UUID parentID = ParentGroup.UUID;
+            ulong regionHandle = ParentGroup.Scene.RegionInfo.RegionHandle;
+
+            soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, 0 );
+        }
+
         public void PhysicsOutOfBounds(Vector3 pos)
         {
             // Note: This is only being called on the root prim at this time.
@@ -2457,9 +2926,9 @@ namespace OpenSim.Region.Framework.Scenes
                 Vector3 newpos = new Vector3(pa.Position.GetBytes(), 0);
                 
                 if (ParentGroup.Scene.TestBorderCross(newpos, Cardinals.N)
-                    | ParentGroup.Scene.TestBorderCross(newpos, Cardinals.S)
-                    | ParentGroup.Scene.TestBorderCross(newpos, Cardinals.E)
-                    | ParentGroup.Scene.TestBorderCross(newpos, Cardinals.W))
+                    || ParentGroup.Scene.TestBorderCross(newpos, Cardinals.S)
+                    || ParentGroup.Scene.TestBorderCross(newpos, Cardinals.E)
+                    || ParentGroup.Scene.TestBorderCross(newpos, Cardinals.W))
                 {
                     ParentGroup.AbsolutePosition = newpos;
                     return;
@@ -2744,6 +3213,14 @@ namespace OpenSim.Region.Framework.Scenes
             if (ParentGroup == null)
                 return;
 
+            // Update the "last" values
+            m_lastPosition = OffsetPosition;
+            m_lastRotation = RotationOffset;
+            m_lastVelocity = Velocity;
+            m_lastAcceleration = Acceleration;
+            m_lastAngularVelocity = AngularVelocity;
+            m_lastUpdateSentTime = Environment.TickCount;
+
             ParentGroup.Scene.ForEachScenePresence(delegate(ScenePresence avatar)
             {
                 SendFullUpdate(avatar.ControllingClient);
@@ -2802,8 +3279,8 @@ namespace OpenSim.Region.Framework.Scenes
         {
             const float ROTATION_TOLERANCE = 0.01f;
             const float VELOCITY_TOLERANCE = 0.001f;
-            const float POSITION_TOLERANCE = 0.05f;
-            const int TIME_MS_TOLERANCE = 3000;
+            const float POSITION_TOLERANCE = 0.05f; // I don't like this, but I suppose it's necessary
+            const int TIME_MS_TOLERANCE = 200; //llSetPos has a 200ms delay. This should NOT be 3 seconds.
 
             switch (UpdateFlag)
             {
@@ -2817,17 +3294,10 @@ namespace OpenSim.Region.Framework.Scenes
                         Velocity.ApproxEquals(Vector3.Zero, VELOCITY_TOLERANCE) ||
                         !AngularVelocity.ApproxEquals(m_lastAngularVelocity, VELOCITY_TOLERANCE) ||
                         !OffsetPosition.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) ||
-                        Environment.TickCount - m_lastTerseSent > TIME_MS_TOLERANCE)
+                        Environment.TickCount - m_lastUpdateSentTime > TIME_MS_TOLERANCE)
                     {
                         SendTerseUpdateToAllClients();
 
-                        // Update the "last" values
-                        m_lastPosition = OffsetPosition;
-                        m_lastRotation = RotationOffset;
-                        m_lastVelocity = Velocity;
-                        m_lastAcceleration = Acceleration;
-                        m_lastAngularVelocity = AngularVelocity;
-                        m_lastTerseSent = Environment.TickCount;
                     }
                     break;
                 }
@@ -2845,6 +3315,17 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void SendTerseUpdateToAllClients()
         {
+            if (ParentGroup == null || ParentGroup.Scene == null)
+                return;
+
+            // Update the "last" values
+            m_lastPosition = OffsetPosition;
+            m_lastRotation = RotationOffset;
+            m_lastVelocity = Velocity;
+            m_lastAcceleration = Acceleration;
+            m_lastAngularVelocity = AngularVelocity;
+            m_lastUpdateSentTime = Environment.TickCount;
+
             ParentGroup.Scene.ForEachClient(delegate(IClientAPI client)
             {
                 SendTerseUpdateToClient(client);
@@ -2868,10 +3349,13 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void SetBuoyancy(float fvalue)
         {
-            PhysicsActor pa = PhysActor;
-
-            if (pa != null)
-                pa.Buoyancy = fvalue;
+            Buoyancy = fvalue;
+/*            
+            if (PhysActor != null)
+            {
+                PhysActor.Buoyancy = fvalue;
+            }
+ */
         }
 
         public void SetDieAtEdge(bool p)
@@ -2887,47 +3371,111 @@ namespace OpenSim.Region.Framework.Scenes
             PhysicsActor pa = PhysActor;
 
             if (pa != null)
-                pa.FloatOnWater = floatYN == 1;
+                pa.FloatOnWater = (floatYN == 1);
         }
 
         public void SetForce(Vector3 force)
         {
-            PhysicsActor pa = PhysActor;
+            Force = force;
+        }
 
-            if (pa != null)
-                pa.Force = force;
+        public SOPVehicle VehicleParams
+        {
+            get
+            {
+                return m_vehicleParams;
+            }
+            set
+            {
+                m_vehicleParams = value;
+            }
+        }
+
+
+        public int VehicleType
+        {
+            get
+            {
+                if (m_vehicleParams == null)
+                    return (int)Vehicle.TYPE_NONE;
+                else
+                    return (int)m_vehicleParams.Type;
+            }
+            set
+            {
+                SetVehicleType(value);
+            }
         }
 
         public void SetVehicleType(int type)
         {
-            PhysicsActor pa = PhysActor;
+                m_vehicleParams = null;
+                
+                if (type == (int)Vehicle.TYPE_NONE)
+                {
+                    if (_parentID ==0 && PhysActor != null)
+                        PhysActor.VehicleType = (int)Vehicle.TYPE_NONE;
+                    return;
+                }
+                m_vehicleParams = new SOPVehicle();
+                m_vehicleParams.ProcessTypeChange((Vehicle)type);
+                {
+                    if (_parentID ==0 && PhysActor != null)
+                        PhysActor.VehicleType = type;
+                    return;
+                }
+        }
 
-            if (pa != null)
-                pa.VehicleType = type;
+        public void SetVehicleFlags(int param, bool remove)
+        {
+            if (m_vehicleParams == null)
+                return;
+
+            m_vehicleParams.ProcessVehicleFlags(param, remove);
+
+            if (_parentID ==0 && PhysActor != null)
+            {
+                PhysActor.VehicleFlags(param, remove);
+            }
         }
 
         public void SetVehicleFloatParam(int param, float value)
         {
-            PhysicsActor pa = PhysActor;
+            if (m_vehicleParams == null)
+                return;
 
-            if (pa != null)
-                pa.VehicleFloatParam(param, value);
+            m_vehicleParams.ProcessFloatVehicleParam((Vehicle)param, value);
+
+            if (_parentID == 0 && PhysActor != null)
+            {
+                PhysActor.VehicleFloatParam(param, value);
+            }
         }
 
         public void SetVehicleVectorParam(int param, Vector3 value)
         {
-            PhysicsActor pa = PhysActor;
+            if (m_vehicleParams == null)
+                return;
 
-            if (pa != null)
-                pa.VehicleVectorParam(param, value);
+            m_vehicleParams.ProcessVectorVehicleParam((Vehicle)param, value);
+
+            if (_parentID == 0 && PhysActor != null)
+            {
+                PhysActor.VehicleVectorParam(param, value);
+            }
         }
 
         public void SetVehicleRotationParam(int param, Quaternion rotation)
         {
-            PhysicsActor pa = PhysActor;
+            if (m_vehicleParams == null)
+                return;
 
-            if (pa != null)
-                pa.VehicleRotationParam(param, rotation);
+            m_vehicleParams.ProcessRotationVehicleParam((Vehicle)param, rotation);
+
+            if (_parentID == 0 && PhysActor != null)
+            {
+                PhysActor.VehicleRotationParam(param, rotation);
+            }
         }
 
         /// <summary>
@@ -3128,14 +3676,6 @@ namespace OpenSim.Region.Framework.Scenes
             hasProfileCut = hasDimple; // is it the same thing?
         }
         
-        public void SetVehicleFlags(int param, bool remove)
-        {
-            PhysicsActor pa = PhysActor;
-
-            if (pa != null)
-                pa.VehicleFlags(param, remove);
-        }
-
         public void SetGroup(UUID groupID, IClientAPI client)
         {
             // Scene.AddNewPrims() calls with client == null so can't use this.
@@ -3235,71 +3775,20 @@ namespace OpenSim.Region.Framework.Scenes
         {
             ParentGroup.stopMoveToTarget();
 
-            ParentGroup.ScheduleGroupForTerseUpdate();
+//            ParentGroup.ScheduleGroupForTerseUpdate();
             //ParentGroup.ScheduleGroupForFullUpdate();
         }
 
-        public void StoreUndoState()
+        public void StoreUndoState(ObjectChangeType change)
         {
-            StoreUndoState(false);
-        }
-
-        public void StoreUndoState(bool forGroup)
-        {
-            if (ParentGroup == null || ParentGroup.Scene == null)
-                return;
-
-            if (Undoing)
-            {
-//                m_log.DebugFormat(
-//                    "[SCENE OBJECT PART]: Ignoring undo store for {0} {1} since already undoing", Name, LocalId);
-                return;
-            }
-
-            if (IgnoreUndoUpdate)
-            {
-//                    m_log.DebugFormat("[SCENE OBJECT PART]: Ignoring undo store for {0} {1}", Name, LocalId);
-                return;
-            }
+            if (m_UndoRedo == null)
+                m_UndoRedo = new UndoRedoState(5);
 
-            lock (m_undo)
+            lock (m_UndoRedo)
             {
-                if (m_undo.Count > 0)
+                if (!Undoing && !IgnoreUndoUpdate && ParentGroup != null) // just to read better  - undo is in progress, or suspended
                 {
-                    UndoState last = m_undo[m_undo.Count - 1];
-                    if (last != null)
-                    {
-                        // TODO: May need to fix for group comparison
-                        if (last.Compare(this))
-                        {
-//                                        m_log.DebugFormat(
-//                                            "[SCENE OBJECT PART]: Not storing undo for {0} {1} since current state is same as last undo state, initial stack size {2}",
-//                                            Name, LocalId, m_undo.Count);
-
-                            return;
-                        }
-                    }
-                }
-
-//                                m_log.DebugFormat(
-//                                    "[SCENE OBJECT PART]: Storing undo state for {0} {1}, forGroup {2}, initial stack size {3}",
-//                                    Name, LocalId, forGroup, m_undo.Count);
-
-                if (ParentGroup.Scene.MaxUndoCount > 0)
-                {
-                    UndoState nUndo = new UndoState(this, forGroup);
-
-                    m_undo.Add(nUndo);
-
-                    if (m_undo.Count > ParentGroup.Scene.MaxUndoCount)
-                        m_undo.RemoveAt(0);
-
-                    if (m_redo.Count > 0)
-                        m_redo.Clear();
-
-//                                    m_log.DebugFormat(
-//                                        "[SCENE OBJECT PART]: Stored undo state for {0} {1}, forGroup {2}, stack size now {3}",
-//                                        Name, LocalId, forGroup, m_undo.Count);
+                    m_UndoRedo.StoreUndo(this, change);
                 }
             }
         }
@@ -3311,88 +3800,46 @@ namespace OpenSim.Region.Framework.Scenes
         {
             get
             {
-                lock (m_undo)
-                    return m_undo.Count;
+                if (m_UndoRedo == null)
+                    return 0;
+                return m_UndoRedo.Count;
             }
         }
 
         public void Undo()
         {
-            lock (m_undo)
-            {
-//                m_log.DebugFormat(
-//                    "[SCENE OBJECT PART]: Handling undo request for {0} {1}, stack size {2}",
-//                    Name, LocalId, m_undo.Count);
-
-                if (m_undo.Count > 0)
-                {
-                    UndoState goback = m_undo[m_undo.Count - 1];
-                    m_undo.RemoveAt(m_undo.Count - 1);
-
-                    UndoState nUndo = null;
-    
-                    if (ParentGroup.Scene.MaxUndoCount > 0)
-                    {
-                        nUndo = new UndoState(this, goback.ForGroup);
-                    }
-
-                    goback.PlaybackState(this);
-
-                    if (nUndo != null)
-                    {
-                        m_redo.Add(nUndo);
-
-                        if (m_redo.Count > ParentGroup.Scene.MaxUndoCount)
-                            m_redo.RemoveAt(0);
-                    }
-                }
+            if (m_UndoRedo == null || Undoing || ParentGroup == null)
+                return;
 
-//                m_log.DebugFormat(
-//                    "[SCENE OBJECT PART]: Handled undo request for {0} {1}, stack size now {2}",
-//                    Name, LocalId, m_undo.Count);
+            lock (m_UndoRedo)
+            {
+                Undoing = true;
+                m_UndoRedo.Undo(this);
+                Undoing = false;
             }
         }
 
         public void Redo()
         {
-            lock (m_undo)
-            {
-//                m_log.DebugFormat(
-//                    "[SCENE OBJECT PART]: Handling redo request for {0} {1}, stack size {2}",
-//                    Name, LocalId, m_redo.Count);
-
-                if (m_redo.Count > 0)
-                {
-                    UndoState gofwd = m_redo[m_redo.Count - 1];
-                    m_redo.RemoveAt(m_redo.Count - 1);
-
-                    if (ParentGroup.Scene.MaxUndoCount > 0)
-                    {
-                        UndoState nUndo = new UndoState(this, gofwd.ForGroup);
-
-                        m_undo.Add(nUndo);
-
-                        if (m_undo.Count > ParentGroup.Scene.MaxUndoCount)
-                            m_undo.RemoveAt(0);
-                    }
-
-                    gofwd.PlayfwdState(this);
+            if (m_UndoRedo == null || Undoing || ParentGroup == null)
+                return;
 
-//                m_log.DebugFormat(
-//                    "[SCENE OBJECT PART]: Handled redo request for {0} {1}, stack size now {2}",
-//                    Name, LocalId, m_redo.Count);
-                }
+            lock (m_UndoRedo)
+            {
+                Undoing = true;
+                m_UndoRedo.Redo(this);
+                Undoing = false;
             }
         }
 
         public void ClearUndoState()
         {
-//            m_log.DebugFormat("[SCENE OBJECT PART]: Clearing undo and redo stacks in {0} {1}", Name, LocalId);
+            if (m_UndoRedo == null || Undoing)
+                return;
 
-            lock (m_undo)
+            lock (m_UndoRedo)
             {
-                m_undo.Clear();
-                m_redo.Clear();
+                m_UndoRedo.Clear();
             }
         }
 
@@ -3943,7 +4390,7 @@ namespace OpenSim.Region.Framework.Scenes
                         if (god)
                         {
                             BaseMask = ApplyMask(BaseMask, set, mask);
-                            Inventory.ApplyGodPermissions(_baseMask);
+                            Inventory.ApplyGodPermissions(BaseMask);
                         }
 
                         break;
@@ -3962,7 +4409,7 @@ namespace OpenSim.Region.Framework.Scenes
                     case 16:
                         NextOwnerMask = ApplyMask(NextOwnerMask, set, mask) &
                                 baseMask;
-                        // Prevent the client from creating no mod, no copy
+                        // Prevent the client from creating no copy, no transfer
                         // objects
                         if ((NextOwnerMask & (uint)PermissionMask.Copy) == 0)
                             NextOwnerMask |= (uint)PermissionMask.Transfer;
@@ -3980,20 +4427,20 @@ namespace OpenSim.Region.Framework.Scenes
         {
             bool update = false;
 
-            if (BaseMask != source.BaseMask ||
-                OwnerMask != source.OwnerMask ||
-                GroupMask != source.GroupMask ||
-                EveryoneMask != source.EveryoneMask ||
-                NextOwnerMask != source.NextOwnerMask)
-                update = true;
+            uint prevOwnerMask = OwnerMask;
+            uint prevGroupMask = GroupMask;
+            uint prevEveryoneMask = EveryoneMask;
+            uint prevNextOwnerMask = NextOwnerMask;
 
-            BaseMask = source.BaseMask;
-            OwnerMask = source.OwnerMask;
-            GroupMask = source.GroupMask;
-            EveryoneMask = source.EveryoneMask;
-            NextOwnerMask = source.NextOwnerMask;
+            OwnerMask = source.OwnerMask & BaseMask;
+            GroupMask = source.GroupMask & BaseMask;
+            EveryoneMask = source.EveryoneMask & BaseMask;
+            NextOwnerMask = source.NextOwnerMask & BaseMask;
 
-            if (update)
+            if (OwnerMask != prevOwnerMask ||
+                GroupMask != prevGroupMask ||
+                EveryoneMask != prevEveryoneMask ||
+                NextOwnerMask != prevNextOwnerMask)
                 SendFullUpdateToAllClients();
         }
 
@@ -4044,6 +4491,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+
         public void UpdateExtraPhysics(ExtraPhysicsData physdata)
         {
             if (physdata.PhysShapeType == PhysShapeType.invalid || ParentGroup == null)
@@ -4071,7 +4519,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="SetTemporary"></param>
         /// <param name="SetPhantom"></param>
         /// <param name="SetVD"></param>
-        public void UpdatePrimFlags(bool UsePhysics, bool SetTemporary, bool SetPhantom, bool SetVD)
+        public void UpdatePrimFlags(bool UsePhysics, bool SetTemporary, bool SetPhantom, bool SetVD, bool building)
         {
             bool wasUsingPhysics = ((Flags & PrimFlags.Physics) != 0);
             bool wasTemporary = ((Flags & PrimFlags.TemporaryOnRez) != 0);
@@ -4081,195 +4529,145 @@ namespace OpenSim.Region.Framework.Scenes
             if ((UsePhysics == wasUsingPhysics) && (wasTemporary == SetTemporary) && (wasPhantom == SetPhantom) && (SetVD == wasVD))
                 return;
 
-            PhysicsActor pa = PhysActor;
-
-            // Special cases for VD. VD can only be called from a script 
-            // and can't be combined with changes to other states. So we can rely
-            // that...
-            // ... if VD is changed, all others are not.
-            // ... if one of the others is changed, VD is not.
-            if (SetVD) // VD is active, special logic applies
-            {
-                // State machine logic for VolumeDetect
-                // More logic below
-                bool phanReset = (SetPhantom != wasPhantom) && !SetPhantom;
-
-                if (phanReset) // Phantom changes from on to off switch VD off too
-                {
-                    SetVD = false;               // Switch it of for the course of this routine
-                    VolumeDetectActive = false; // and also permanently
-
-                    if (pa != null)
-                        pa.SetVolumeDetect(0);   // Let physics know about it too
-                }
-                else
-                {
-                    // If volumedetect is active we don't want phantom to be applied.
-                    // If this is a new call to VD out of the state "phantom"
-                    // this will also cause the prim to be visible to physics
-                    SetPhantom = false;
-                }
-            }
+            VolumeDetectActive = SetVD;
 
-            if (UsePhysics && IsJoint())
-            {
+            // volume detector implies phantom
+            if (VolumeDetectActive)
                 SetPhantom = true;
-            }
 
             if (UsePhysics)
-            {
                 AddFlag(PrimFlags.Physics);
-                if (!wasUsingPhysics)
-                {
-                    DoPhysicsPropertyUpdate(UsePhysics, false);
-                }
-            }
             else
-            {
                 RemFlag(PrimFlags.Physics);
-                if (wasUsingPhysics)
-                {
-                    DoPhysicsPropertyUpdate(UsePhysics, false);
-                }
-            }
 
-            if (SetPhantom
-                || ParentGroup.IsAttachment
-                || PhysicsShapeType == (byte)PhysShapeType.none
-                || (Shape.PathCurve == (byte)Extrusion.Flexible)) // note: this may have been changed above in the case of joints
-            {
+            if (SetPhantom)
                 AddFlag(PrimFlags.Phantom);
-
-                if (PhysActor != null)
-                {
-                    RemoveFromPhysics();
-                    pa = null;
-                }
-            }
-            else // Not phantom
-            {
+            else
                 RemFlag(PrimFlags.Phantom);
 
-                if (ParentGroup.Scene == null)
-                    return;
+            if (SetTemporary)
+                AddFlag(PrimFlags.TemporaryOnRez);
+            else
+                RemFlag(PrimFlags.TemporaryOnRez);
 
-                if (ParentGroup.Scene.CollidablePrims && pa == null)
-                {
-                    AddToPhysics(UsePhysics, SetPhantom, false);
-                    pa = PhysActor;
 
+            if (ParentGroup.Scene == null)
+                return;
 
-                    if (pa != null)
-                    {
-                        pa.SetMaterial(Material);
-                        DoPhysicsPropertyUpdate(UsePhysics, true);
-    
-                        if (
-                            ((AggregateScriptEvents & scriptEvents.collision) != 0) ||
-                            ((AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
-                            ((AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
-                            ((AggregateScriptEvents & scriptEvents.land_collision_start) != 0) ||
-                            ((AggregateScriptEvents & scriptEvents.land_collision) != 0) ||
-                            ((AggregateScriptEvents & scriptEvents.land_collision_end) != 0) ||
-                            ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.collision) != 0) ||
-                            ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
-                            ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
-                            ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.land_collision_start) != 0) ||
-                            ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.land_collision) != 0) ||
-                            ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.land_collision_end) != 0) ||
-                            (CollisionSound != UUID.Zero)
-                            )
-                        {
-                            pa.OnCollisionUpdate += PhysicsCollision;
-                            pa.SubscribeEvents(1000);
-                        }
-                    }
-                }
-                else // it already has a physical representation
-                {
-                    DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status. If it's phantom this will remove the prim
-                }
-            }
+            PhysicsActor pa = PhysActor;
+
+            if (pa != null && building && pa.Building != building)
+                pa.Building = building;
 
-            if (SetVD)
+            if ((SetPhantom && !UsePhysics && !SetVD) ||  ParentGroup.IsAttachment || PhysicsShapeType == (byte)PhysShapeType.none
+                || (Shape.PathCurve == (byte)Extrusion.Flexible))
             {
-                // If the above logic worked (this is urgent candidate to unit tests!)
-                // we now have a physicsactor.
-                // Defensive programming calls for a check here.
-                // Better would be throwing an exception that could be catched by a unit test as the internal 
-                // logic should make sure, this Physactor is always here.
                 if (pa != null)
                 {
-                    pa.SetVolumeDetect(1);
-                    AddFlag(PrimFlags.Phantom); // We set this flag also if VD is active
-                    VolumeDetectActive = true;
+                    if(wasUsingPhysics)
+                        ParentGroup.Scene.RemovePhysicalPrim(1);
+                    RemoveFromPhysics();
                 }
+
+                Velocity = new Vector3(0, 0, 0);
+                Acceleration = new Vector3(0, 0, 0);
+                if (ParentGroup.RootPart == this)
+                    AngularVelocity = new Vector3(0, 0, 0);
             }
             else if (SetVD != wasVD)
             {
-                // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like
-                // (mumbles, well, at least if you have infinte CPU powers :-))
-                if (pa != null)
-                    pa.SetVolumeDetect(0);
+                if (ParentGroup.Scene.CollidablePrims)
+                {
+                    if (pa == null)
+                    {
+                        AddToPhysics(UsePhysics, SetPhantom, building, false);
+                        pa = PhysActor;
+/*
+                        if (pa != null)
+                        {
+                            if (
+//                                ((AggregateScriptEvents & scriptEvents.collision) != 0) ||
+//                                ((AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
+//                                ((AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
+//                                ((AggregateScriptEvents & scriptEvents.land_collision_start) != 0) ||
+//                                ((AggregateScriptEvents & scriptEvents.land_collision) != 0) ||
+//                                ((AggregateScriptEvents & scriptEvents.land_collision_end) != 0) ||
+                                ((AggregateScriptEvents & PhysicsNeededSubsEvents) != 0) ||
+                                ((ParentGroup.RootPart.AggregateScriptEvents & PhysicsNeededSubsEvents) != 0) ||
+                                (CollisionSound != UUID.Zero)
+                                )
+                            {
+                                pa.OnCollisionUpdate += PhysicsCollision;
+                                pa.SubscribeEvents(1000);
+                            }
+                        }
+*/
+                    }
+                    else // it already has a physical representation
+                    {
+                        DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status.
+/* moved into DoPhysicsPropertyUpdate
+                        if(VolumeDetectActive)
+                            pa.SetVolumeDetect(1);
+                        else
+                            pa.SetVolumeDetect(0);
+*/
 
-                RemFlag(PrimFlags.Phantom);
-                VolumeDetectActive = false;
-            }
+                        if (pa.Building != building)
+                            pa.Building = building;
+                    }
 
-            if (SetTemporary)
-            {
-                AddFlag(PrimFlags.TemporaryOnRez);
-            }
-            else
-            {
-                RemFlag(PrimFlags.TemporaryOnRez);
-            }
+                    UpdatePhysicsSubscribedEvents();
+                }
+            }         
 
             //            m_log.Debug("Update:  PHY:" + UsePhysics.ToString() + ", T:" + IsTemporary.ToString() + ", PHA:" + IsPhantom.ToString() + " S:" + CastsShadows.ToString());
 
+           // and last in case we have a new actor and not building
+
             if (ParentGroup != null)
             {
                 ParentGroup.HasGroupChanged = true;
                 ScheduleFullUpdate();
             }
-
+            
 //            m_log.DebugFormat("[SCENE OBJECT PART]: Updated PrimFlags on {0} {1} to {2}", Name, LocalId, Flags);
         }
 
         /// <summary>
         /// Adds this part to the physics scene.
+        /// and sets the PhysActor property
         /// </summary>
-        /// <remarks>This method also sets the PhysActor property.</remarks>
-        /// <param name="rigidBody">Add this prim with a rigid body.</param>
-        /// <returns>
-        /// The physics actor.  null if there was a failure.
-        /// </returns>
-        private void AddToPhysics(bool isPhysical, bool isPhantom, bool applyDynamics)
-        {
+        /// <param name="isPhysical">Add this prim as physical.</param>
+        /// <param name="isPhantom">Add this prim as phantom.</param>
+        /// <param name="building">tells physics to delay full construction of object</param>
+        /// <param name="applyDynamics">applies velocities, force and torque</param>
+        private void AddToPhysics(bool isPhysical, bool isPhantom, bool building, bool applyDynamics)
+        {          
             PhysicsActor pa;
 
-            Vector3 velocity = Velocity;
+            Vector3 velocity = Velocity; 
             Vector3 rotationalVelocity = AngularVelocity;;
 
             try
             {
                 pa = ParentGroup.Scene.PhysicsScene.AddPrimShape(
-                        string.Format("{0}/{1}", Name, UUID),
-                        Shape,
-                        AbsolutePosition,
-                        Scale,
-                        GetWorldRotation(),
-                        isPhysical,
-                        isPhantom,
-                        PhysicsShapeType,
-                        m_localId);
+                                 string.Format("{0}/{1}", Name, UUID),
+                                 Shape,
+                                 AbsolutePosition,
+                                 Scale,
+                                 GetWorldRotation(),
+                                 isPhysical,
+                                 isPhantom,
+                                 PhysicsShapeType,
+                                 m_localId);
             }
             catch (Exception e)
             {
                 m_log.ErrorFormat("[SCENE]: caught exception meshing object {0}. Object set to phantom. e={1}", m_uuid, e);
                 pa = null;
             }
-
+          
             if (pa != null)
             {
                 pa.SOPName = this.Name; // save object into the PhysActor so ODE internals know the joint/body info
@@ -4282,11 +4680,21 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if (VolumeDetectActive) // change if not the default only
                     pa.SetVolumeDetect(1);
+
+                if (m_vehicleParams != null && LocalId == ParentGroup.RootPart.LocalId)
+                    m_vehicleParams.SetVehicle(pa);
+
                 // we are going to tell rest of code about physics so better have this here
                 PhysActor = pa;
 
+                //                DoPhysicsPropertyUpdate(isPhysical, true);
+                // lets expand it here just with what it really needs to do
+
                 if (isPhysical)
                 {
+                    if (ParentGroup.RootPart.KeyframeMotion != null)
+                        ParentGroup.RootPart.KeyframeMotion.Stop();
+                    ParentGroup.RootPart.KeyframeMotion = null;
                     ParentGroup.Scene.AddPhysicalPrim(1);
 
                     pa.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate;
@@ -4303,19 +4711,34 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
 
-                if (applyDynamics)
+                if (applyDynamics) 
                     // do independent of isphysical so parameters get setted (at least some)                   
                 {
                     Velocity = velocity;
                     AngularVelocity = rotationalVelocity;
 //                    pa.Velocity = velocity;
                     pa.RotationalVelocity = rotationalVelocity;
+
+                    // if not vehicle and root part apply force and torque
+                    if ((m_vehicleParams == null || m_vehicleParams.Type == Vehicle.TYPE_NONE)
+                            && LocalId == ParentGroup.RootPart.LocalId)
+                    {
+                        pa.Force = Force;
+                        pa.Torque = Torque;
+                    }
                 }
 
-                ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(pa);
+//                if (Shape.SculptEntry)
+//                    CheckSculptAndLoad();
+//                else
+                    ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(pa);
+
+                if (!building)
+                    pa.Building = false;
             }
 
             PhysActor = pa;
+
             ParentGroup.Scene.EventManager.TriggerObjectAddedToPhysicalScene(this);
         }
 
@@ -4324,13 +4747,21 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <remarks>
         /// This isn't the same as turning off physical, since even without being physical the prim has a physics
-        /// representation for collision detection.  Rather, this would be used in situations such as making a prim
-        /// phantom.
+        /// representation for collision detection.
         /// </remarks>
         public void RemoveFromPhysics()
         {
-            ParentGroup.Scene.EventManager.TriggerObjectRemovedFromPhysicalScene(this);
-            ParentGroup.Scene.PhysicsScene.RemovePrim(PhysActor);
+            PhysicsActor pa = PhysActor;
+            if (pa != null)
+            {
+                pa.OnCollisionUpdate -= PhysicsCollision;
+                pa.OnRequestTerseUpdate -= PhysicsRequestingTerseUpdate;
+                pa.OnOutOfBounds -= PhysicsOutOfBounds;
+
+                ParentGroup.Scene.PhysicsScene.RemovePrim(pa);
+
+                ParentGroup.Scene.EventManager.TriggerObjectRemovedFromPhysicalScene(this);
+            }
             PhysActor = null;
         }
 
@@ -4462,6 +4893,8 @@ namespace OpenSim.Region.Framework.Scenes
         {
 //            m_log.DebugFormat("Processing CheckSculptAndLoad for {0} {1}", Name, LocalId);
 
+            return;
+
             if (ParentGroup.IsDeleted)
                 return;
 
@@ -4542,6 +4975,44 @@ namespace OpenSim.Region.Framework.Scenes
             ScheduleFullUpdate();
         }
 
+
+        private void UpdatePhysicsSubscribedEvents()
+        {
+            PhysicsActor pa = PhysActor;
+            if (pa == null)
+                return;
+
+            pa.OnCollisionUpdate -= PhysicsCollision;
+
+            bool hassound = (!VolumeDetectActive && CollisionSoundType >= 0 && ((Flags & PrimFlags.Physics) != 0));
+
+            scriptEvents CombinedEvents = AggregateScriptEvents;
+
+            // merge with root part
+            if (ParentGroup != null && ParentGroup.RootPart != null)
+                CombinedEvents |= ParentGroup.RootPart.AggregateScriptEvents;
+
+            // submit to this part case
+            if (VolumeDetectActive)
+                CombinedEvents &= PhyscicsVolumeDtcSubsEvents;
+            else if ((Flags & PrimFlags.Phantom) != 0)
+                CombinedEvents &= PhyscicsPhantonSubsEvents;
+            else
+                CombinedEvents &= PhysicsNeededSubsEvents;
+
+            if (hassound || CombinedEvents != 0)
+            {
+                // subscribe to physics updates.
+                pa.OnCollisionUpdate += PhysicsCollision;
+                pa.SubscribeEvents(50); // 20 reports per second
+            }
+            else
+            {
+                pa.UnSubscribeEvents();
+            }
+        }
+
+
         public void aggregateScriptEvents()
         {
             if (ParentGroup == null || ParentGroup.RootPart == null)
@@ -4578,40 +5049,32 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 objectflagupdate |= (uint) PrimFlags.AllowInventoryDrop;
             }
-
+/*
             PhysicsActor pa = PhysActor;
-
-            if (
-                ((AggregateScriptEvents & scriptEvents.collision) != 0) ||
-                ((AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
-                ((AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
-                ((AggregateScriptEvents & scriptEvents.land_collision_start) != 0) ||
-                ((AggregateScriptEvents & scriptEvents.land_collision) != 0) ||
-                ((AggregateScriptEvents & scriptEvents.land_collision_end) != 0) ||
-                ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.collision) != 0) ||
-                ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
-                ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
-                ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.land_collision_start) != 0) ||
-                ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.land_collision) != 0) ||
-                ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.land_collision_end) != 0) ||
-                (CollisionSound != UUID.Zero)
-                )
+            if (pa != null)
             {
-                // subscribe to physics updates.
-                if (pa != null)
+                if (
+//                    ((AggregateScriptEvents & scriptEvents.collision) != 0) ||
+//                    ((AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
+//                    ((AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
+//                    ((AggregateScriptEvents & scriptEvents.land_collision_start) != 0) ||
+//                    ((AggregateScriptEvents & scriptEvents.land_collision) != 0) ||
+//                    ((AggregateScriptEvents & scriptEvents.land_collision_end) != 0) ||
+                    ((AggregateScriptEvents & PhysicsNeededSubsEvents) != 0) || ((ParentGroup.RootPart.AggregateScriptEvents & PhysicsNeededSubsEvents) != 0) || (CollisionSound != UUID.Zero)
+                    )
                 {
+                    // subscribe to physics updates.
                     pa.OnCollisionUpdate += PhysicsCollision;
                     pa.SubscribeEvents(1000);
                 }
-            }
-            else
-            {
-                if (pa != null)
+                else
                 {
                     pa.UnSubscribeEvents();
                     pa.OnCollisionUpdate -= PhysicsCollision;
                 }
             }
+ */
+            UpdatePhysicsSubscribedEvents();
 
             //if ((GetEffectiveObjectFlags() & (uint)PrimFlags.Scripted) != 0)
             //{
@@ -4742,6 +5205,18 @@ namespace OpenSim.Region.Framework.Scenes
             return new Color4(color.R, color.G, color.B, (byte)(0xFF - color.A));
         }
 
+        public void ResetOwnerChangeFlag()
+        {
+            List<UUID> inv = Inventory.GetInventoryList();
+
+            foreach (UUID itemID in inv)
+            {
+                TaskInventoryItem item = Inventory.GetInventoryItem(itemID);
+                item.OwnerChanged = false;
+                Inventory.UpdateInventoryItem(item, false, false);
+            }
+        }
+
         /// <summary>
         /// Record an avatar sitting on this part.
         /// </summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index db723fa..3a9a146 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -48,6 +48,9 @@ namespace OpenSim.Region.Framework.Scenes
         private string m_inventoryFileName = String.Empty;
         private byte[] m_inventoryFileData = new byte[0];
         private uint m_inventoryFileNameSerial = 0;
+        private bool m_inventoryPrivileged = false;
+
+        private Dictionary<UUID, ArrayList> m_scriptErrors = new Dictionary<UUID, ArrayList>();
         
         /// <value>
         /// The part to which the inventory belongs.
@@ -84,7 +87,9 @@ namespace OpenSim.Region.Framework.Scenes
         /// </value>
         protected internal TaskInventoryDictionary Items
         {
-            get { return m_items; }
+            get { 
+                return m_items; 
+            }
             set
             {
                 m_items = value;
@@ -133,38 +138,45 @@ namespace OpenSim.Region.Framework.Scenes
         public void ResetInventoryIDs()
         {
             if (null == m_part)
-                return;
-            
-            lock (m_items)
+            m_items.LockItemsForWrite(true);
+
+            if (Items.Count == 0)
             {
-                if (0 == m_items.Count)
-                    return;
+                m_items.LockItemsForWrite(false);
+                return;
+            }
 
-                IList<TaskInventoryItem> items = GetInventoryItems();
-                m_items.Clear();
+            IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
+            Items.Clear();
 
-                foreach (TaskInventoryItem item in items)
-                {
-                    item.ResetIDs(m_part.UUID);
-                    m_items.Add(item.ItemID, item);
-                }
+            foreach (TaskInventoryItem item in items)
+            {
+                item.ResetIDs(m_part.UUID);
+                Items.Add(item.ItemID, item);
             }
+            m_items.LockItemsForWrite(false);
         }
 
         public void ResetObjectID()
         {
-            lock (Items)
+            m_items.LockItemsForWrite(true);
+
+            if (Items.Count == 0)
             {
-                IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
-                Items.Clear();
-    
-                foreach (TaskInventoryItem item in items)
-                {
-                    item.ParentPartID = m_part.UUID;
-                    item.ParentID = m_part.UUID;
-                    Items.Add(item.ItemID, item);
-                }
+                m_items.LockItemsForWrite(false);
+                return;
             }
+
+            IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
+            Items.Clear();
+
+            foreach (TaskInventoryItem item in items)
+            {
+                item.ParentPartID = m_part.UUID;
+                item.ParentID = m_part.UUID;
+                Items.Add(item.ItemID, item);
+            }
+            m_items.LockItemsForWrite(false);
         }
 
         /// <summary>
@@ -173,17 +185,14 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="ownerId"></param>
         public void ChangeInventoryOwner(UUID ownerId)
         {
-            lock (Items)
-            {
-                if (0 == Items.Count)
-                {
-                    return;
-                }
-            }
+            List<TaskInventoryItem> items = GetInventoryItems();
+
+            if (items.Count == 0)
+                return;
 
+            m_items.LockItemsForWrite(true);
             HasInventoryChanged = true;
             m_part.ParentGroup.HasGroupChanged = true;
-            List<TaskInventoryItem> items = GetInventoryItems();
             foreach (TaskInventoryItem item in items)
             {
                 if (ownerId != item.OwnerID)
@@ -194,6 +203,7 @@ namespace OpenSim.Region.Framework.Scenes
                 item.PermsGranter = UUID.Zero;
                 item.OwnerChanged = true;
             }
+            m_items.LockItemsForWrite(false);
         }
 
         /// <summary>
@@ -202,12 +212,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="groupID"></param>
         public void ChangeInventoryGroup(UUID groupID)
         {
-            lock (Items)
+            m_items.LockItemsForWrite(true);
+            if (0 == Items.Count)
             {
-                if (0 == Items.Count)
-                {
-                    return;
-                }
+                m_items.LockItemsForWrite(false);
+                return;
             }
 
             // Don't let this set the HasGroupChanged flag for attachments
@@ -219,12 +228,15 @@ namespace OpenSim.Region.Framework.Scenes
                 m_part.ParentGroup.HasGroupChanged = true;
             }
 
-            List<TaskInventoryItem> items = GetInventoryItems();
+            IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
             foreach (TaskInventoryItem item in items)
             {
                 if (groupID != item.GroupID)
+                {
                     item.GroupID = groupID;
+                }
             }
+            m_items.LockItemsForWrite(false);
         }
 
         private void QueryScriptStates()
@@ -232,15 +244,18 @@ namespace OpenSim.Region.Framework.Scenes
             if (m_part == null || m_part.ParentGroup == null || m_part.ParentGroup.Scene == null)
                 return;
 
-            lock (Items)
+            Items.LockItemsForRead(true);
+            foreach (TaskInventoryItem item in Items.Values)
             {
-                foreach (TaskInventoryItem item in Items.Values)
+                if (item.InvType == (int)InventoryType.LSL)
                 {
                     bool running;
                     if (TryGetScriptInstanceRunning(m_part.ParentGroup.Scene, item, out running))
                         item.ScriptRunning = running;
                 }
             }
+
+            Items.LockItemsForRead(false);
         }
 
         public bool TryGetScriptInstanceRunning(UUID itemId, out bool running)
@@ -317,7 +332,10 @@ namespace OpenSim.Region.Framework.Scenes
         {
             List<TaskInventoryItem> scripts = GetInventoryItems(InventoryType.LSL);
             foreach (TaskInventoryItem item in scripts)
+            {
                 RemoveScriptInstance(item.ItemID, sceneObjectBeingDeleted);
+                m_part.RemoveScriptEvents(item.ItemID);
+            }
         }
 
         /// <summary>
@@ -339,7 +357,10 @@ namespace OpenSim.Region.Framework.Scenes
 //                 item.Name, item.ItemID, m_part.Name, m_part.UUID, m_part.ParentGroup.Scene.RegionInfo.RegionName);
 
             if (!m_part.ParentGroup.Scene.Permissions.CanRunScript(item.ItemID, m_part.UUID, item.OwnerID))
+            {
+                StoreScriptError(item.ItemID, "no permission");
                 return false;
+            }
 
             m_part.AddFlag(PrimFlags.Scripted);
 
@@ -349,14 +370,13 @@ namespace OpenSim.Region.Framework.Scenes
             if (stateSource == 2 && // Prim crossing
                     m_part.ParentGroup.Scene.m_trustBinaries)
             {
-                lock (m_items)
-                {
-                    m_items[item.ItemID].PermsMask = 0;
-                    m_items[item.ItemID].PermsGranter = UUID.Zero;
-                }
-                
+                m_items.LockItemsForWrite(true);
+                m_items[item.ItemID].PermsMask = 0;
+                m_items[item.ItemID].PermsGranter = UUID.Zero;
+                m_items.LockItemsForWrite(false);
                 m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
                     m_part.LocalId, item.ItemID, String.Empty, startParam, postOnRez, engine, stateSource);
+                StoreScriptErrors(item.ItemID, null);
                 m_part.ParentGroup.AddActiveScriptCount(1);
                 m_part.ScheduleFullUpdate();
                 return true;
@@ -365,6 +385,8 @@ namespace OpenSim.Region.Framework.Scenes
             AssetBase asset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString());
             if (null == asset)
             {
+                string msg = String.Format("asset ID {0} could not be found", item.AssetID);
+                StoreScriptError(item.ItemID, msg);
                 m_log.ErrorFormat(
                     "[PRIM INVENTORY]: Couldn't start script {0}, {1} at {2} in {3} since asset ID {4} could not be found",
                     item.Name, item.ItemID, m_part.AbsolutePosition, 
@@ -377,16 +399,18 @@ namespace OpenSim.Region.Framework.Scenes
                 if (m_part.ParentGroup.m_savedScriptState != null)
                     item.OldItemID = RestoreSavedScriptState(item.LoadedItemID, item.OldItemID, item.ItemID);
 
-                lock (m_items)
-                {
-                    m_items[item.ItemID].OldItemID = item.OldItemID;
-                    m_items[item.ItemID].PermsMask = 0;
-                    m_items[item.ItemID].PermsGranter = UUID.Zero;
-                }
+                m_items.LockItemsForWrite(true);
+
+                m_items[item.ItemID].OldItemID = item.OldItemID;
+                m_items[item.ItemID].PermsMask = 0;
+                m_items[item.ItemID].PermsGranter = UUID.Zero;
 
+                m_items.LockItemsForWrite(false);
+                
                 string script = Utils.BytesToString(asset.Data);
                 m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
                     m_part.LocalId, item.ItemID, script, startParam, postOnRez, engine, stateSource);
+                StoreScriptErrors(item.ItemID, null);
                 if (!item.ScriptRunning)
                     m_part.ParentGroup.Scene.EventManager.TriggerStopScript(
                         m_part.LocalId, item.ItemID);
@@ -459,22 +483,149 @@ namespace OpenSim.Region.Framework.Scenes
             return stateID;
         }
 
+        /// <summary>
+        /// Start a script which is in this prim's inventory.
+        /// Some processing may occur in the background, but this routine returns asap.
+        /// </summary>
+        /// <param name="itemId">
+        /// A <see cref="UUID"/>
+        /// </param>
         public bool CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource)
         {
-            TaskInventoryItem item = GetInventoryItem(itemId);
-            if (item != null)
+            lock (m_scriptErrors)
             {
-                return CreateScriptInstance(item, startParam, postOnRez, engine, stateSource);
+                // Indicate to CreateScriptInstanceInternal() we don't want it to wait for completion
+                m_scriptErrors.Remove(itemId);
+            }
+            CreateScriptInstanceInternal(itemId, startParam, postOnRez, engine, stateSource);
+            return true;
+        }
+
+        private void CreateScriptInstanceInternal(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource)
+        {
+            m_items.LockItemsForRead(true);
+            if (m_items.ContainsKey(itemId))
+            {
+                if (m_items.ContainsKey(itemId))
+                {
+                    m_items.LockItemsForRead(false);
+                    CreateScriptInstance(m_items[itemId], startParam, postOnRez, engine, stateSource);
+                }
+                else
+                {
+                    m_items.LockItemsForRead(false);
+                    string msg = String.Format("couldn't be found for prim {0}, {1} at {2} in {3}", m_part.Name, m_part.UUID,
+                        m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
+                    StoreScriptError(itemId, msg);
+                    m_log.ErrorFormat(
+                        "[PRIM INVENTORY]: " +
+                        "Couldn't start script with ID {0} since it {1}", itemId, msg);
+                }
             }
             else
             {
+                m_items.LockItemsForRead(false);
+                string msg = String.Format("couldn't be found for prim {0}, {1}", m_part.Name, m_part.UUID);
+                StoreScriptError(itemId, msg);
                 m_log.ErrorFormat(
                     "[PRIM INVENTORY]: Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2} at {3} in {4}",
                     itemId, m_part.Name, m_part.UUID, 
                     m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
+            }
+            
+        }
 
-                return false;
+        /// <summary>
+        /// Start a script which is in this prim's inventory and return any compilation error messages.
+        /// </summary>
+        /// <param name="itemId">
+        /// A <see cref="UUID"/>
+        /// </param>
+        public ArrayList CreateScriptInstanceEr(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource)
+        {
+            ArrayList errors;
+
+            // Indicate to CreateScriptInstanceInternal() we want it to 
+            // post any compilation/loading error messages
+            lock (m_scriptErrors)
+            {
+                m_scriptErrors[itemId] = null;
+            }
+
+            // Perform compilation/loading
+            CreateScriptInstanceInternal(itemId, startParam, postOnRez, engine, stateSource);
+
+            // Wait for and retrieve any errors
+            lock (m_scriptErrors)
+            {
+                while ((errors = m_scriptErrors[itemId]) == null)
+                {
+                    if (!System.Threading.Monitor.Wait(m_scriptErrors, 15000))
+                    {
+                        m_log.ErrorFormat(
+                            "[PRIM INVENTORY]: " +
+                            "timedout waiting for script {0} errors", itemId);
+                        errors = m_scriptErrors[itemId];
+                        if (errors == null)
+                        {
+                            errors = new ArrayList(1);
+                            errors.Add("timedout waiting for errors");
+                        }
+                        break;
+                    }
+                }
+                m_scriptErrors.Remove(itemId);
             }
+            return errors;
+        }
+
+        // Signal to CreateScriptInstanceEr() that compilation/loading is complete
+        private void StoreScriptErrors(UUID itemId, ArrayList errors)
+        {
+            lock (m_scriptErrors)
+            {
+                // If compilation/loading initiated via CreateScriptInstance(),
+                // it does not want the errors, so just get out
+                if (!m_scriptErrors.ContainsKey(itemId))
+                {
+                    return;
+                }
+
+                // Initiated via CreateScriptInstanceEr(), if we know what the
+                // errors are, save them and wake CreateScriptInstanceEr().
+                if (errors != null)
+                {
+                    m_scriptErrors[itemId] = errors;
+                    System.Threading.Monitor.PulseAll(m_scriptErrors);
+                    return;
+                }
+            }
+
+            // Initiated via CreateScriptInstanceEr() but we don't know what
+            // the errors are yet, so retrieve them from the script engine.
+            // This may involve some waiting internal to GetScriptErrors().
+            errors = GetScriptErrors(itemId);
+
+            // Get a default non-null value to indicate success.
+            if (errors == null)
+            {
+                errors = new ArrayList();
+            }
+
+            // Post to CreateScriptInstanceEr() and wake it up
+            lock (m_scriptErrors)
+            {
+                m_scriptErrors[itemId] = errors;
+                System.Threading.Monitor.PulseAll(m_scriptErrors);
+            }
+        }
+
+        // Like StoreScriptErrors(), but just posts a single string message
+        private void StoreScriptError(UUID itemId, string message)
+        {
+            ArrayList errors = new ArrayList(1);
+            errors.Add(message);
+            StoreScriptErrors(itemId, errors);
         }
 
         /// <summary>
@@ -487,15 +638,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </param>
         public void RemoveScriptInstance(UUID itemId, bool sceneObjectBeingDeleted)
         {
-            bool scriptPresent = false;
-
-            lock (m_items)
-            {
-                if (m_items.ContainsKey(itemId))
-                    scriptPresent = true;
-            }
-            
-            if (scriptPresent)
+            if (m_items.ContainsKey(itemId))
             {
                 if (!sceneObjectBeingDeleted)
                     m_part.RemoveScriptEvents(itemId);
@@ -565,14 +708,16 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns></returns>
         private bool InventoryContainsName(string name)
         {
-            lock (m_items)
+            m_items.LockItemsForRead(true);
+            foreach (TaskInventoryItem item in m_items.Values)
             {
-                foreach (TaskInventoryItem item in m_items.Values)
+                if (item.Name == name)
                 {
-                    if (item.Name == name)
-                        return true;
+                    m_items.LockItemsForRead(false);
+                    return true;
                 }
             }
+            m_items.LockItemsForRead(false);
             return false;
         }
 
@@ -614,8 +759,9 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="item"></param>
         public void AddInventoryItemExclusive(TaskInventoryItem item, bool allowedDrop)
         {
-            List<TaskInventoryItem> il = GetInventoryItems();
-            
+            m_items.LockItemsForRead(true);
+            List<TaskInventoryItem> il = new List<TaskInventoryItem>(m_items.Values);
+            m_items.LockItemsForRead(false);
             foreach (TaskInventoryItem i in il)
             {
                 if (i.Name == item.Name)
@@ -653,14 +799,14 @@ namespace OpenSim.Region.Framework.Scenes
             item.Name = name;
             item.GroupID = m_part.GroupID;
 
-            lock (m_items)
-                m_items.Add(item.ItemID, item);
-
-            if (allowedDrop) 
-                m_part.TriggerScriptChangedEvent(Changed.ALLOWED_DROP);
-            else
-                m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
-
+            m_items.LockItemsForWrite(true);
+            m_items.Add(item.ItemID, item);
+            m_items.LockItemsForWrite(false);
+                if (allowedDrop) 
+                    m_part.TriggerScriptChangedEvent(Changed.ALLOWED_DROP);
+                else
+                    m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
+            
             m_inventorySerial++;
             //m_inventorySerial += 2;
             HasInventoryChanged = true;
@@ -676,15 +822,15 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="items"></param>
         public void RestoreInventoryItems(ICollection<TaskInventoryItem> items)
         {
-            lock (m_items)
+            m_items.LockItemsForWrite(true);
+            foreach (TaskInventoryItem item in items)
             {
-                foreach (TaskInventoryItem item in items)
-                {
-                    m_items.Add(item.ItemID, item);
-//                    m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
-                }
-                m_inventorySerial++;
+                m_items.Add(item.ItemID, item);
+//                m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
             }
+            m_items.LockItemsForWrite(false);
+
+            m_inventorySerial++;
         }
 
         /// <summary>
@@ -695,23 +841,24 @@ namespace OpenSim.Region.Framework.Scenes
         public TaskInventoryItem GetInventoryItem(UUID itemId)
         {
             TaskInventoryItem item;
-
-            lock (m_items)
-                m_items.TryGetValue(itemId, out item);
-
+            m_items.LockItemsForRead(true);
+            m_items.TryGetValue(itemId, out item);
+            m_items.LockItemsForRead(false);
             return item;
         }
 
         public TaskInventoryItem GetInventoryItem(string name)
         {
-            lock (m_items)
+            m_items.LockItemsForRead(true);
+            foreach (TaskInventoryItem item in m_items.Values)
             {
-                foreach (TaskInventoryItem item in m_items.Values)
+                if (item.Name == name)
                 {
-                    if (item.Name == name)
-                        return item;
+                    m_items.LockItemsForRead(false);
+                    return item;
                 }
             }
+            m_items.LockItemsForRead(false);
 
             return null;
         }
@@ -720,15 +867,16 @@ namespace OpenSim.Region.Framework.Scenes
         {
             List<TaskInventoryItem> items = new List<TaskInventoryItem>();
 
-            lock (m_items)
+            m_items.LockItemsForRead(true);
+
+            foreach (TaskInventoryItem item in m_items.Values)
             {
-                foreach (TaskInventoryItem item in m_items.Values)
-                {
-                    if (item.Name == name)
-                        items.Add(item);
-                }
+                if (item.Name == name)
+                    items.Add(item);
             }
 
+            m_items.LockItemsForRead(false);
+
             return items;
         }
         
@@ -747,6 +895,10 @@ namespace OpenSim.Region.Framework.Scenes
             string xmlData = Utils.BytesToString(rezAsset.Data);
             SceneObjectGroup group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
 
+            group.RootPart.AttachPoint = group.RootPart.Shape.State;
+            group.RootPart.AttachOffset = group.AbsolutePosition;
+            group.RootPart.AttachRotation = group.GroupRotation;
+
             group.ResetIDs();
 
             SceneObjectPart rootPart = group.GetPart(group.UUID);
@@ -821,8 +973,9 @@ namespace OpenSim.Region.Framework.Scenes
 
         public bool UpdateInventoryItem(TaskInventoryItem item, bool fireScriptEvents, bool considerChanged)
         {
-            TaskInventoryItem it = GetInventoryItem(item.ItemID);
-            if (it != null)
+            m_items.LockItemsForWrite(true);
+
+            if (m_items.ContainsKey(item.ItemID))
             {
 //                m_log.DebugFormat("[PRIM INVENTORY]: Updating item {0} in {1}", item.Name, m_part.Name);
                 
@@ -835,14 +988,10 @@ namespace OpenSim.Region.Framework.Scenes
                     item.GroupID = m_part.GroupID;
 
                 if (item.AssetID == UUID.Zero)
-                    item.AssetID = it.AssetID;
+                    item.AssetID = m_items[item.ItemID].AssetID;
 
-                lock (m_items)
-                {
-                    m_items[item.ItemID] = item;
-                    m_inventorySerial++;
-                }
-                
+                m_items[item.ItemID] = item;
+                m_inventorySerial++;
                 if (fireScriptEvents)
                     m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
                 
@@ -851,7 +1000,7 @@ namespace OpenSim.Region.Framework.Scenes
                     HasInventoryChanged = true;
                     m_part.ParentGroup.HasGroupChanged = true;
                 }
-                
+                m_items.LockItemsForWrite(false);
                 return true;
             }
             else
@@ -862,8 +1011,9 @@ namespace OpenSim.Region.Framework.Scenes
                     item.ItemID, m_part.Name, m_part.UUID, 
                     m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
             }
-            return false;
+            m_items.LockItemsForWrite(false);
 
+            return false;
         }
 
         /// <summary>
@@ -874,43 +1024,59 @@ namespace OpenSim.Region.Framework.Scenes
         /// in this prim's inventory.</returns>
         public int RemoveInventoryItem(UUID itemID)
         {
-            TaskInventoryItem item = GetInventoryItem(itemID);
-            if (item != null)
+            m_items.LockItemsForRead(true);
+
+            if (m_items.ContainsKey(itemID))
             {
                 int type = m_items[itemID].InvType;
+                m_items.LockItemsForRead(false);
                 if (type == 10) // Script
                 {
-                    m_part.RemoveScriptEvents(itemID);
                     m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemID);
                 }
+                m_items.LockItemsForWrite(true);
                 m_items.Remove(itemID);
+                m_items.LockItemsForWrite(false);
                 m_inventorySerial++;
                 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
 
                 HasInventoryChanged = true;
                 m_part.ParentGroup.HasGroupChanged = true;
 
-                if (!ContainsScripts())
+                int scriptcount = 0;
+                m_items.LockItemsForRead(true);
+                foreach (TaskInventoryItem item in m_items.Values)
+                {
+                    if (item.Type == 10)
+                    {
+                        scriptcount++;
+                    }
+                }
+                m_items.LockItemsForRead(false);
+                
+
+                if (scriptcount <= 0)
+                {
                     m_part.RemFlag(PrimFlags.Scripted);
+                }
 
                 m_part.ScheduleFullUpdate();
 
                 return type;
-                
             }
             else
             {
+                m_items.LockItemsForRead(false);
                 m_log.ErrorFormat(
                     "[PRIM INVENTORY]: " +
-                    "Tried to remove item ID {0} from prim {1}, {2} at {3} in {4} but the item does not exist in this inventory",
-                    itemID, m_part.Name, m_part.UUID,
-                    m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
+                    "Tried to remove item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
+                    itemID, m_part.Name, m_part.UUID);
             }
 
             return -1;
         }
 
-        private bool CreateInventoryFile()
+        private bool CreateInventoryFileName()
         {
 //            m_log.DebugFormat(
 //                "[PRIM INVENTORY]: Creating inventory file for {0} {1} {2}, serial {3}",
@@ -919,70 +1085,12 @@ namespace OpenSim.Region.Framework.Scenes
             if (m_inventoryFileName == String.Empty ||
                 m_inventoryFileNameSerial < m_inventorySerial)
             {
-                // Something changed, we need to create a new file
                 m_inventoryFileName = "inventory_" + UUID.Random().ToString() + ".tmp";
                 m_inventoryFileNameSerial = m_inventorySerial;
 
-                InventoryStringBuilder invString = new InventoryStringBuilder(m_part.UUID, UUID.Zero);
-
-                lock (m_items)
-                {
-                    foreach (TaskInventoryItem item in m_items.Values)
-                    {
-//                        m_log.DebugFormat(
-//                            "[PRIM INVENTORY]: Adding item {0} {1} for serial {2} on prim {3} {4} {5}",
-//                            item.Name, item.ItemID, m_inventorySerial, m_part.Name, m_part.UUID, m_part.LocalId);
-
-                        UUID ownerID = item.OwnerID;
-                        uint everyoneMask = 0;
-                        uint baseMask = item.BasePermissions;
-                        uint ownerMask = item.CurrentPermissions;
-                        uint groupMask = item.GroupPermissions;
-
-                        invString.AddItemStart();
-                        invString.AddNameValueLine("item_id", item.ItemID.ToString());
-                        invString.AddNameValueLine("parent_id", m_part.UUID.ToString());
-
-                        invString.AddPermissionsStart();
-
-                        invString.AddNameValueLine("base_mask", Utils.UIntToHexString(baseMask));
-                        invString.AddNameValueLine("owner_mask", Utils.UIntToHexString(ownerMask));
-                        invString.AddNameValueLine("group_mask", Utils.UIntToHexString(groupMask));
-                        invString.AddNameValueLine("everyone_mask", Utils.UIntToHexString(everyoneMask));
-                        invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions));
-
-                        invString.AddNameValueLine("creator_id", item.CreatorID.ToString());
-                        invString.AddNameValueLine("owner_id", ownerID.ToString());
-
-                        invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString());
-
-                        invString.AddNameValueLine("group_id", item.GroupID.ToString());
-                        invString.AddSectionEnd();
-
-                        invString.AddNameValueLine("asset_id", item.AssetID.ToString());
-                        invString.AddNameValueLine("type", Utils.AssetTypeToString((AssetType)item.Type));
-                        invString.AddNameValueLine("inv_type", Utils.InventoryTypeToString((InventoryType)item.InvType));
-                        invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags));
-
-                        invString.AddSaleStart();
-                        invString.AddNameValueLine("sale_type", "not");
-                        invString.AddNameValueLine("sale_price", "0");
-                        invString.AddSectionEnd();
-
-                        invString.AddNameValueLine("name", item.Name + "|");
-                        invString.AddNameValueLine("desc", item.Description + "|");
-
-                        invString.AddNameValueLine("creation_date", item.CreationDate.ToString());
-                        invString.AddSectionEnd();
-                    }
-                }
-
-                m_inventoryFileData = Utils.StringToBytes(invString.BuildString);
-
                 return true;
             }
 
-            // No need to recreate, the existing file is fine
             return false;
         }
 
@@ -992,43 +1100,110 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="xferManager"></param>
         public void RequestInventoryFile(IClientAPI client, IXfer xferManager)
         {
-            lock (m_items)
-            {
-                // Don't send a inventory xfer name if there are no items.  Doing so causes viewer 3 to crash when rezzing
-                // a new script if any previous deletion has left the prim inventory empty.
-                if (m_items.Count == 0) // No inventory
-                {
-//                    m_log.DebugFormat(
-//                        "[PRIM INVENTORY]: Not sending inventory data for part {0} {1} {2} for {3} since no items",
-//                        m_part.Name, m_part.LocalId, m_part.UUID, client.Name);
+            bool changed = CreateInventoryFileName();
 
-                    client.SendTaskInventory(m_part.UUID, 0, new byte[0]);
-                    return;
-                }
+            bool includeAssets = false;
+            if (m_part.ParentGroup.Scene.Permissions.CanEditObjectInventory(m_part.UUID, client.AgentId))
+                includeAssets = true;
+
+            if (m_inventoryPrivileged != includeAssets)
+                changed = true;
+
+            InventoryStringBuilder invString = new InventoryStringBuilder(m_part.UUID, UUID.Zero);
+
+            Items.LockItemsForRead(true);
+
+            if (m_inventorySerial == 0) // No inventory
+            {
+                client.SendTaskInventory(m_part.UUID, 0, new byte[0]);
+                Items.LockItemsForRead(false);
+                return;
+            }
 
-                CreateInventoryFile();
+                        if (m_items.Count == 0) // No inventory
+                        {
+                                client.SendTaskInventory(m_part.UUID, 0, new byte[0]);
+                Items.LockItemsForRead(false);
+                                return;
+                        }
     
-                // In principle, we should only do the rest if the inventory changed;
-                // by sending m_inventorySerial to the client, it ought to know
-                // that nothing changed and that it doesn't need to request the file. 
-                // Unfortunately, it doesn't look like the client optimizes this; 
-                // the client seems to always come back and request the Xfer, 
-                // no matter what value m_inventorySerial has.
-                // FIXME: Could probably be > 0 here rather than > 2
+            if (!changed)
+            {
                 if (m_inventoryFileData.Length > 2)
                 {
-                    // Add the file for Xfer
-    //                m_log.DebugFormat(
-    //                    "[PRIM INVENTORY]: Adding inventory file {0} (length {1}) for transfer on {2} {3} {4}",
-    //                    m_inventoryFileName, m_inventoryFileData.Length, m_part.Name, m_part.UUID, m_part.LocalId);
-                    
-                    xferManager.AddNewFile(m_inventoryFileName, m_inventoryFileData);
+                    xferManager.AddNewFile(m_inventoryFileName,
+                            m_inventoryFileData);
+                    client.SendTaskInventory(m_part.UUID, (short)m_inventorySerial,
+                            Util.StringToBytes256(m_inventoryFileName));
+
+                    Items.LockItemsForRead(false);
+                    return;
                 }
-    
-                // Tell the client we're ready to Xfer the file
-                client.SendTaskInventory(m_part.UUID, (short)m_inventorySerial,
-                        Util.StringToBytes256(m_inventoryFileName));
             }
+
+            m_inventoryPrivileged = includeAssets;
+
+            foreach (TaskInventoryItem item in m_items.Values)
+            {
+                UUID ownerID = item.OwnerID;
+                uint everyoneMask = 0;
+                uint baseMask = item.BasePermissions;
+                uint ownerMask = item.CurrentPermissions;
+                uint groupMask = item.GroupPermissions;
+
+                invString.AddItemStart();
+                invString.AddNameValueLine("item_id", item.ItemID.ToString());
+                invString.AddNameValueLine("parent_id", m_part.UUID.ToString());
+
+                invString.AddPermissionsStart();
+
+                invString.AddNameValueLine("base_mask", Utils.UIntToHexString(baseMask));
+                invString.AddNameValueLine("owner_mask", Utils.UIntToHexString(ownerMask));
+                invString.AddNameValueLine("group_mask", Utils.UIntToHexString(groupMask));
+                invString.AddNameValueLine("everyone_mask", Utils.UIntToHexString(everyoneMask));
+                invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions));
+
+                invString.AddNameValueLine("creator_id", item.CreatorID.ToString());
+                invString.AddNameValueLine("owner_id", ownerID.ToString());
+
+                invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString());
+
+                invString.AddNameValueLine("group_id", item.GroupID.ToString());
+                invString.AddSectionEnd();
+
+                if (includeAssets)
+                    invString.AddNameValueLine("asset_id", item.AssetID.ToString());
+                else
+                    invString.AddNameValueLine("asset_id", UUID.Zero.ToString());
+                invString.AddNameValueLine("type", Utils.AssetTypeToString((AssetType)item.Type));
+                invString.AddNameValueLine("inv_type", Utils.InventoryTypeToString((InventoryType)item.InvType));
+                invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags));
+
+                invString.AddSaleStart();
+                invString.AddNameValueLine("sale_type", "not");
+                invString.AddNameValueLine("sale_price", "0");
+                invString.AddSectionEnd();
+
+                invString.AddNameValueLine("name", item.Name + "|");
+                invString.AddNameValueLine("desc", item.Description + "|");
+
+                invString.AddNameValueLine("creation_date", item.CreationDate.ToString());
+                invString.AddSectionEnd();
+            }
+
+            Items.LockItemsForRead(false);
+
+            m_inventoryFileData = Utils.StringToBytes(invString.BuildString);
+
+            if (m_inventoryFileData.Length > 2)
+            {
+                xferManager.AddNewFile(m_inventoryFileName, m_inventoryFileData);
+                                client.SendTaskInventory(m_part.UUID, (short)m_inventorySerial,
+                                                Util.StringToBytes256(m_inventoryFileName));
+                                return;
+            }
+
+                        client.SendTaskInventory(m_part.UUID, 0, new byte[0]);
         }
 
         /// <summary>
@@ -1037,13 +1212,19 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="datastore"></param>
         public void ProcessInventoryBackup(ISimulationDataService datastore)
         {
-            if (HasInventoryChanged)
-            {
-                HasInventoryChanged = false;
-                List<TaskInventoryItem> items = GetInventoryItems();
-                datastore.StorePrimInventory(m_part.UUID, items);
+// Removed this because linking will cause an immediate delete of the new
+// child prim from the database and the subsequent storing of the prim sees
+// the inventory of it as unchanged and doesn't store it at all. The overhead
+// of storing prim inventory needlessly is much less than the aggravation
+// of prim inventory loss.
+//            if (HasInventoryChanged)
+//            {
+                Items.LockItemsForRead(true);
+                datastore.StorePrimInventory(m_part.UUID, Items.Values);
+                Items.LockItemsForRead(false);
 
-            }
+                HasInventoryChanged = false;
+//            }
         }
 
         public class InventoryStringBuilder
@@ -1109,87 +1290,63 @@ namespace OpenSim.Region.Framework.Scenes
         {
             uint mask=0x7fffffff;
 
-            lock (m_items)
+            foreach (TaskInventoryItem item in m_items.Values)
             {
-                foreach (TaskInventoryItem item in m_items.Values)
+                if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Copy) == 0)
+                    mask &= ~((uint)PermissionMask.Copy >> 13);
+                if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Transfer) == 0)
+                    mask &= ~((uint)PermissionMask.Transfer >> 13);
+                if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Modify) == 0)
+                    mask &= ~((uint)PermissionMask.Modify >> 13);
+
+                if (item.InvType == (int)InventoryType.Object)
                 {
-                    if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Copy) == 0)
+                    if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
                         mask &= ~((uint)PermissionMask.Copy >> 13);
-                    if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Transfer) == 0)
+                    if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0)
                         mask &= ~((uint)PermissionMask.Transfer >> 13);
-                    if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Modify) == 0)
+                    if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
                         mask &= ~((uint)PermissionMask.Modify >> 13);
-
-                    if (item.InvType != (int)InventoryType.Object)
-                    {
-                        if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Copy) == 0)
-                            mask &= ~((uint)PermissionMask.Copy >> 13);
-                        if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Transfer) == 0)
-                            mask &= ~((uint)PermissionMask.Transfer >> 13);
-                        if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Modify) == 0)
-                            mask &= ~((uint)PermissionMask.Modify >> 13);
-                    }
-                    else
-                    {
-                        if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
-                            mask &= ~((uint)PermissionMask.Copy >> 13);
-                        if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0)
-                            mask &= ~((uint)PermissionMask.Transfer >> 13);
-                        if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
-                            mask &= ~((uint)PermissionMask.Modify >> 13);
-                    }
-    
-                    if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
-                        mask &= ~(uint)PermissionMask.Copy;
-                    if ((item.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)
-                        mask &= ~(uint)PermissionMask.Transfer;
-                    if ((item.CurrentPermissions & (uint)PermissionMask.Modify) == 0)
-                        mask &= ~(uint)PermissionMask.Modify;
                 }
+
+                if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
+                    mask &= ~(uint)PermissionMask.Copy;
+                if ((item.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)
+                    mask &= ~(uint)PermissionMask.Transfer;
+                if ((item.CurrentPermissions & (uint)PermissionMask.Modify) == 0)
+                    mask &= ~(uint)PermissionMask.Modify;
             }
-                
             return mask;
         }
 
         public void ApplyNextOwnerPermissions()
         {
-            lock (m_items)
+            foreach (TaskInventoryItem item in m_items.Values)
             {
-                foreach (TaskInventoryItem item in m_items.Values)
+                if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0)
                 {
-//                    m_log.DebugFormat (
-//                        "[SCENE OBJECT PART INVENTORY]: Applying next permissions {0} to {1} in {2} with current {3}, base {4}, everyone {5}",
-//                        item.NextPermissions, item.Name, m_part.Name, item.CurrentPermissions, item.BasePermissions, item.EveryonePermissions);
-
-                    if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0)
-                    {
-                        if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
-                            item.CurrentPermissions &= ~(uint)PermissionMask.Copy;
-                        if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0)
-                            item.CurrentPermissions &= ~(uint)PermissionMask.Transfer;
-                        if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
-                            item.CurrentPermissions &= ~(uint)PermissionMask.Modify;
-                    }
-
-                    item.CurrentPermissions &= item.NextPermissions;
-                    item.BasePermissions &= item.NextPermissions;
-                    item.EveryonePermissions &= item.NextPermissions;
-                    item.OwnerChanged = true;
-                    item.PermsMask = 0;
-                    item.PermsGranter = UUID.Zero;
+                    if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
+                        item.CurrentPermissions &= ~(uint)PermissionMask.Copy;
+                    if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0)
+                        item.CurrentPermissions &= ~(uint)PermissionMask.Transfer;
+                    if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
+                        item.CurrentPermissions &= ~(uint)PermissionMask.Modify;
                 }
+                item.CurrentPermissions &= item.NextPermissions;
+                item.BasePermissions &= item.NextPermissions;
+                item.EveryonePermissions &= item.NextPermissions;
+                item.OwnerChanged = true;
+                item.PermsMask = 0;
+                item.PermsGranter = UUID.Zero;
             }
         }
 
         public void ApplyGodPermissions(uint perms)
         {
-            lock (m_items)
+            foreach (TaskInventoryItem item in m_items.Values)
             {
-                foreach (TaskInventoryItem item in m_items.Values)
-                {
-                    item.CurrentPermissions = perms;
-                    item.BasePermissions = perms;
-                }
+                item.CurrentPermissions = perms;
+                item.BasePermissions = perms;
             }
             
             m_inventorySerial++;
@@ -1202,14 +1359,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns></returns>
         public bool ContainsScripts()
         {
-            lock (m_items)
+            foreach (TaskInventoryItem item in m_items.Values)
             {
-                foreach (TaskInventoryItem item in m_items.Values)
+                if (item.InvType == (int)InventoryType.LSL)
                 {
-                    if (item.InvType == (int)InventoryType.LSL)
-                    {
-                        return true;
-                    }
+                    return true;
                 }
             }
 
@@ -1223,17 +1377,15 @@ namespace OpenSim.Region.Framework.Scenes
         public int ScriptCount()
         {
             int count = 0;
-            lock (m_items)
+            Items.LockItemsForRead(true);
+            foreach (TaskInventoryItem item in m_items.Values)
             {
-                foreach (TaskInventoryItem item in m_items.Values)
+                if (item.InvType == (int)InventoryType.LSL)
                 {
-                    if (item.InvType == (int)InventoryType.LSL)
-                    {
-                        count++;
-                    }
+                    count++;
                 }
             }
-
+            Items.LockItemsForRead(false);
             return count;
         }
         /// <summary>
@@ -1269,11 +1421,8 @@ namespace OpenSim.Region.Framework.Scenes
         {
             List<UUID> ret = new List<UUID>();
 
-            lock (m_items)
-            {
-                foreach (TaskInventoryItem item in m_items.Values)
-                    ret.Add(item.ItemID);
-            }
+            foreach (TaskInventoryItem item in m_items.Values)
+                ret.Add(item.ItemID);
 
             return ret;
         }
@@ -1282,8 +1431,9 @@ namespace OpenSim.Region.Framework.Scenes
         {
             List<TaskInventoryItem> ret = new List<TaskInventoryItem>();
 
-            lock (m_items)
-                ret = new List<TaskInventoryItem>(m_items.Values);
+            Items.LockItemsForRead(true);
+            ret = new List<TaskInventoryItem>(m_items.Values);
+            Items.LockItemsForRead(false);
 
             return ret;
         }
@@ -1292,18 +1442,24 @@ namespace OpenSim.Region.Framework.Scenes
         {
             List<TaskInventoryItem> ret = new List<TaskInventoryItem>();
 
-            lock (m_items)
-            {
-                foreach (TaskInventoryItem item in m_items.Values)
-                    if (item.InvType == (int)type)
-                        ret.Add(item);
-            }
+            Items.LockItemsForRead(true);
+
+            foreach (TaskInventoryItem item in m_items.Values)
+                if (item.InvType == (int)type)
+                    ret.Add(item);
+
+            Items.LockItemsForRead(false);
 
             return ret;
         }
         
         public Dictionary<UUID, string> GetScriptStates()
         {
+            return GetScriptStates(false);
+        }
+
+        public Dictionary<UUID, string> GetScriptStates(bool oldIDs)
+        {
             Dictionary<UUID, string> ret = new Dictionary<UUID, string>();            
             
             if (m_part.ParentGroup.Scene == null) // Group not in a scene
@@ -1329,14 +1485,21 @@ namespace OpenSim.Region.Framework.Scenes
                         string n = e.GetXMLState(item.ItemID);
                         if (n != String.Empty)
                         {
-                            if (!ret.ContainsKey(item.ItemID))
-                                ret[item.ItemID] = n;
+                            if (oldIDs)
+                            {
+                                if (!ret.ContainsKey(item.OldItemID))
+                                    ret[item.OldItemID] = n;
+                            }
+                            else
+                            {
+                                if (!ret.ContainsKey(item.ItemID))
+                                    ret[item.ItemID] = n;
+                            }
                             break;
                         }
                     }
                 }
             }
-            
             return ret;
         }
         
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 70e3952..a57e0d1 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -63,6 +63,7 @@ namespace OpenSim.Region.Framework.Scenes
 
     struct ScriptControllers
     {
+        public UUID objectID;
         public UUID itemID;
         public ScriptControlled ignoreControls;
         public ScriptControlled eventControls;
@@ -99,7 +100,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// rotation, prim cut, prim twist, prim taper, and prim shear. See mantis
         /// issue #1716
         /// </summary>
-        public static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.0f, 0.0f, 0.418f);
+        public static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.0f, 0.0f, 0.4f);
 
         /// <summary>
         /// Movement updates for agents in neighboring regions are sent directly to clients.
@@ -139,6 +140,8 @@ namespace OpenSim.Region.Framework.Scenes
         private Vector3 m_lastPosition;
         private Quaternion m_lastRotation;
         private Vector3 m_lastVelocity;
+        private Vector3 m_lastSize = new Vector3(0.45f,0.6f,1.9f);
+
 
         private Vector3? m_forceToApply;
         private int m_userFlags;
@@ -171,6 +174,7 @@ namespace OpenSim.Region.Framework.Scenes
 //        private int m_lastColCount = -1;              //KF: Look for Collision chnages
 //        private int m_updateCount = 0;                        //KF: Update Anims for a while
 //        private static readonly int UPDATE_COUNT = 10;                // how many frames to update for
+        private List<uint> m_lastColliders = new List<uint>();
 
         private TeleportFlags m_teleportFlags;
         public TeleportFlags TeleportFlags
@@ -226,8 +230,6 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public bool LandAtTarget { get; private set; }
 
-        private bool m_followCamAuto;
-
         private int m_movementUpdateCount;
         private const int NumMovementsBetweenRayCast = 5;
 
@@ -235,6 +237,13 @@ namespace OpenSim.Region.Framework.Scenes
         //private int m_moveToPositionStateStatus;
         //*****************************************************
 
+        private bool m_collisionEventFlag = false;
+        private object m_collisionEventLock = new Object();
+
+        private int m_movementAnimationUpdateCounter = 0;
+
+        private Vector3 m_prevSitOffset;
+
         protected AvatarAppearance m_appearance;
 
         public AvatarAppearance Appearance
@@ -349,6 +358,9 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         protected Vector3 m_lastCameraPosition;
 
+        private Vector4 m_lastCameraCollisionPlane = new Vector4(0f, 0f, 0f, 1);
+        private bool m_doingCamRayCast = false;
+
         public Vector3 CameraPosition { get; set; }
 
         public Quaternion CameraRotation
@@ -429,7 +441,9 @@ namespace OpenSim.Region.Framework.Scenes
             get { return (IClientCore)ControllingClient; }
         }
 
-        public Vector3 ParentPosition { get; set; }
+        public UUID COF { get; set; }
+
+//        public Vector3 ParentPosition { get; set; }
 
         /// <summary>
         /// Position of this avatar relative to the region the avatar is in
@@ -487,7 +501,7 @@ namespace OpenSim.Region.Framework.Scenes
                 if (ParentID == 0)
                 {
                     m_pos = value;
-                    ParentPosition = Vector3.Zero;
+//                    ParentPosition = Vector3.Zero;
                 }
 
                 //m_log.DebugFormat(
@@ -556,7 +570,24 @@ namespace OpenSim.Region.Framework.Scenes
 //                    Scene.RegionInfo.RegionName, Name, m_velocity);
             }
         }
+/*
+        public override Vector3 AngularVelocity
+        {
+            get
+            {
+                if (PhysicsActor != null)
+                {
+                    m_rotationalvelocity = PhysicsActor.RotationalVelocity;
 
+                    //                    m_log.DebugFormat(
+                    //                        "[SCENE PRESENCE]: Set velocity {0} for {1} in {2} via getting Velocity!",
+                    //                        m_velocity, Name, Scene.RegionInfo.RegionName);
+                }
+
+                return m_rotationalvelocity;
+            }
+        }
+*/
         private Quaternion m_bodyRot = Quaternion.Identity;
 
         public Quaternion Rotation
@@ -567,7 +598,14 @@ namespace OpenSim.Region.Framework.Scenes
                 m_bodyRot = value;
                 if (PhysicsActor != null)
                 {
-                    PhysicsActor.Orientation = m_bodyRot;
+                    try
+                    {
+                        PhysicsActor.Orientation = m_bodyRot;
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Error("[SCENE PRESENCE]: Orientation " + e.Message);
+                    }
                 }
 //                m_log.DebugFormat("[SCENE PRESENCE]: Body rot for {0} set to {1}", Name, m_bodyRot);
             }
@@ -582,12 +620,20 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         public bool IsChildAgent { get; set; }
+        public bool IsLoggingIn { get; set; }
 
         /// <summary>
         /// If the avatar is sitting, the local ID of the prim that it's sitting on.  If not sitting then zero.
         /// </summary>
         public uint ParentID { get; set; }
 
+        public UUID ParentUUID
+        {
+            get { return m_parentUUID; }
+            set { m_parentUUID = value; }
+        }
+        private UUID m_parentUUID = UUID.Zero;
+
         /// <summary>
         /// Are we sitting on an object?
         /// </summary>
@@ -713,6 +759,7 @@ namespace OpenSim.Region.Framework.Scenes
             AttachmentsSyncLock = new Object();
             AllowMovement = true;
             IsChildAgent = true;
+            IsLoggingIn = false;
             m_sendCoarseLocationsMethod = SendCoarseLocationsDefault;
             Animator = new ScenePresenceAnimator(this);
             PresenceType = type;
@@ -756,6 +803,33 @@ namespace OpenSim.Region.Framework.Scenes
             Appearance = appearance;
         }
 
+        private void RegionHeartbeatEnd(Scene scene)
+        {
+            if (IsChildAgent)
+                return;
+
+            m_movementAnimationUpdateCounter ++;
+            if (m_movementAnimationUpdateCounter >= 2)
+            {
+                m_movementAnimationUpdateCounter = 0;
+                if (Animator != null)
+                {
+                    // If the parentID == 0 we are not sitting
+                    // if !SitGournd then we are not sitting on the ground
+                    // Fairly straightforward, now here comes the twist
+                    // if ParentUUID is NOT UUID.Zero, we are looking to
+                    // be sat on an object that isn't there yet. Should
+                    // be treated as if sat.
+                    if(ParentID == 0 && !SitGround && ParentUUID == UUID.Zero) // skip it if sitting
+                        Animator.UpdateMovementAnimations();
+                }
+                else
+                {
+                    m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd;
+                }
+            }
+        }
+
         public void RegisterToEvents()
         {
             ControllingClient.OnCompleteMovementToRegion += CompleteMovement;
@@ -765,8 +839,10 @@ namespace OpenSim.Region.Framework.Scenes
             ControllingClient.OnSetAlwaysRun += HandleSetAlwaysRun;
             ControllingClient.OnStartAnim += HandleStartAnim;
             ControllingClient.OnStopAnim += HandleStopAnim;
+            ControllingClient.OnChangeAnim += avnHandleChangeAnim;
             ControllingClient.OnForceReleaseControls += HandleForceReleaseControls;
             ControllingClient.OnAutoPilotGo += MoveToTarget;
+            ControllingClient.OnUpdateThrottles += RaiseUpdateThrottles;
 
             // ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange);
             // ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement);
@@ -825,10 +901,40 @@ namespace OpenSim.Region.Framework.Scenes
                 "[SCENE]: Upgrading child to root agent for {0} in {1}",
                 Name, m_scene.RegionInfo.RegionName);
 
-            //m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count);
-
             bool wasChild = IsChildAgent;
-            IsChildAgent = false;
+
+            if (ParentUUID != UUID.Zero)
+            {
+                m_log.DebugFormat("[SCENE PRESENCE]: Sitting avatar back on prim {0}", ParentUUID);
+                SceneObjectPart part = m_scene.GetSceneObjectPart(ParentUUID);
+                if (part == null)
+                {
+                    m_log.ErrorFormat("[SCENE PRESENCE]: Can't find prim {0} to sit on", ParentUUID);
+                }
+                else
+                {
+                    part.ParentGroup.AddAvatar(UUID);
+                    if (part.SitTargetPosition != Vector3.Zero)
+                        part.SitTargetAvatar = UUID;
+//                    ParentPosition = part.GetWorldPosition();
+                    ParentID = part.LocalId;
+                    ParentPart = part;
+                    m_pos = m_prevSitOffset;
+//                    pos = ParentPosition;
+                    pos = part.GetWorldPosition();
+                }
+                ParentUUID = UUID.Zero;
+
+                IsChildAgent = false;
+
+//                Animator.TrySetMovementAnimation("SIT");
+            }
+            else
+            {
+                IsChildAgent = false;
+                IsLoggingIn = false;
+            }
+
 
             IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>();
             if (gm != null)
@@ -838,62 +944,99 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene);
 
-            // Moved this from SendInitialData to ensure that Appearance is initialized
-            // before the inventory is processed in MakeRootAgent. This fixes a race condition
-            // related to the handling of attachments
-            //m_scene.GetAvatarAppearance(ControllingClient, out Appearance);
-            if (m_scene.TestBorderCross(pos, Cardinals.E))
+            UUID groupUUID = UUID.Zero;
+            string GroupName = string.Empty;
+            ulong groupPowers = 0;
+
+            // ----------------------------------
+            // Previous Agent Difference - AGNI sends an unsolicited AgentDataUpdate upon root agent status
+            try
             {
-                Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E);
-                pos.X = crossedBorder.BorderLine.Z - 1;
+                if (gm != null)
+                {
+                    groupUUID = ControllingClient.ActiveGroupId;
+                    GroupRecord record = gm.GetGroupRecord(groupUUID);
+                    if (record != null)
+                        GroupName = record.GroupName;
+                    GroupMembershipData groupMembershipData = gm.GetMembershipData(groupUUID, m_uuid);
+                    if (groupMembershipData != null)
+                        groupPowers = groupMembershipData.GroupPowers;
+                }
+                ControllingClient.SendAgentDataUpdate(m_uuid, groupUUID, Firstname, Lastname, groupPowers, GroupName,
+                                                      Grouptitle);
             }
-
-            if (m_scene.TestBorderCross(pos, Cardinals.N))
+            catch (Exception e)
             {
-                Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.N);
-                pos.Y = crossedBorder.BorderLine.Z - 1;
+                m_log.Debug("[AGENTUPDATE]: " + e.ToString());
             }
+            // ------------------------------------
 
-            CheckAndAdjustLandingPoint(ref pos);
-
-            if (pos.X < 0f || pos.Y < 0f || pos.Z < 0f)
+            if (ParentID == 0)
             {
-                m_log.WarnFormat(
-                    "[SCENE PRESENCE]: MakeRootAgent() was given an illegal position of {0} for avatar {1}, {2}. Clamping",
-                    pos, Name, UUID);
+                // Moved this from SendInitialData to ensure that Appearance is initialized
+                // before the inventory is processed in MakeRootAgent. This fixes a race condition
+                // related to the handling of attachments
+                //m_scene.GetAvatarAppearance(ControllingClient, out Appearance);
+                if (m_scene.TestBorderCross(pos, Cardinals.E))
+                {
+                    Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E);
+                    pos.X = crossedBorder.BorderLine.Z - 1;
+                }
 
-                if (pos.X < 0f) pos.X = 0f;
-                if (pos.Y < 0f) pos.Y = 0f;
-                if (pos.Z < 0f) pos.Z = 0f;
-            }
+                if (m_scene.TestBorderCross(pos, Cardinals.N))
+                {
+                    Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.N);
+                    pos.Y = crossedBorder.BorderLine.Z - 1;
+                }
 
-            float localAVHeight = 1.56f;
-            if (Appearance.AvatarHeight > 0)
-                localAVHeight = Appearance.AvatarHeight;
+                CheckAndAdjustLandingPoint(ref pos);
 
-            float posZLimit = 0;
+                if (pos.X < 0f || pos.Y < 0f || pos.Z < 0f)
+                {
+                    m_log.WarnFormat(
+                        "[SCENE PRESENCE]: MakeRootAgent() was given an illegal position of {0} for avatar {1}, {2}. Clamping",
+                        pos, Name, UUID);
 
-            if (pos.X < Constants.RegionSize && pos.Y < Constants.RegionSize)
-                posZLimit = (float)m_scene.Heightmap[(int)pos.X, (int)pos.Y];
-            
-            float newPosZ = posZLimit + localAVHeight / 2;
-            if (posZLimit >= (pos.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ)))
-            {
-                pos.Z = newPosZ;
-            }
-            AbsolutePosition = pos;
+                    if (pos.X < 0f) pos.X = 0f;
+                    if (pos.Y < 0f) pos.Y = 0f;
+                    if (pos.Z < 0f) pos.Z = 0f;
+                }
 
-            AddToPhysicalScene(isFlying);
+                float localAVHeight = 1.56f;
+                if (Appearance.AvatarHeight > 0)
+                    localAVHeight = Appearance.AvatarHeight;
 
-            if (ForceFly)
-            {
-                Flying = true;
-            }
-            else if (FlyDisabled)
-            {
-                Flying = false;
-            }
+                float posZLimit = 0;
 
+                if (pos.X < Constants.RegionSize && pos.Y < Constants.RegionSize)
+                    posZLimit = (float)m_scene.Heightmap[(int)pos.X, (int)pos.Y];
+                
+                float newPosZ = posZLimit + localAVHeight / 2;
+                if (posZLimit >= (pos.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ)))
+                {
+                    pos.Z = newPosZ;
+                }
+                AbsolutePosition = pos;
+
+                if (m_teleportFlags == TeleportFlags.Default)
+                {
+                    Vector3 vel = Velocity;
+                    AddToPhysicalScene(isFlying);
+                    if (PhysicsActor != null)
+                        PhysicsActor.SetMomentum(vel);
+                }
+                else
+                    AddToPhysicalScene(isFlying);
+
+                if (ForceFly)
+                {
+                    Flying = true;
+                }
+                else if (FlyDisabled)
+                {
+                    Flying = false;
+                }
+            }
             // Don't send an animation pack here, since on a region crossing this will sometimes cause a flying 
             // avatar to return to the standing position in mid-air.  On login it looks like this is being sent
             // elsewhere anyway
@@ -913,14 +1056,19 @@ namespace OpenSim.Region.Framework.Scenes
                         "[SCENE PRESENCE]: Restarting scripts in attachments for {0} in {1}", Name, Scene.Name);
                     
                     // Resume scripts
-                    foreach (SceneObjectGroup sog in m_attachments)
-                    {
-                        sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource());
-                        sog.ResumeScripts();
-                    }
+                    Util.FireAndForget(delegate(object x) {
+                        foreach (SceneObjectGroup sog in m_attachments)
+                        {
+                            sog.ScheduleGroupForFullUpdate();
+                            sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource());
+                            sog.ResumeScripts();
+                        }
+                    });
                 }
             }
 
+            SendAvatarDataToAllAgents();
+
             // send the animations of the other presences to me
             m_scene.ForEachRootScenePresence(delegate(ScenePresence presence)
             {
@@ -931,9 +1079,12 @@ namespace OpenSim.Region.Framework.Scenes
             // If we don't reset the movement flag here, an avatar that crosses to a neighbouring sim and returns will
             // stall on the border crossing since the existing child agent will still have the last movement
             // recorded, which stops the input from being processed.
+
             MovementFlag = 0;
 
             m_scene.EventManager.TriggerOnMakeRootAgent(this);
+
+            m_scene.EventManager.OnRegionHeartbeatEnd += RegionHeartbeatEnd;
         }
 
         public int GetStateSource()
@@ -961,12 +1112,16 @@ namespace OpenSim.Region.Framework.Scenes
         /// </remarks>
         public void MakeChildAgent()
         {
+            m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd;
+
             m_log.DebugFormat("[SCENE PRESENCE]: Making {0} a child agent in {1}", Name, Scene.RegionInfo.RegionName);
 
             // Reset these so that teleporting in and walking out isn't seen
             // as teleporting back
             TeleportFlags = TeleportFlags.Default;
 
+            MovementFlag = 0;
+
             // It looks like Animator is set to null somewhere, and MakeChild
             // is called after that. Probably in aborted teleports.
             if (Animator == null)
@@ -974,6 +1129,7 @@ namespace OpenSim.Region.Framework.Scenes
             else
                 Animator.ResetAnimations();
 
+            
 //            m_log.DebugFormat(
 //                 "[SCENE PRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}",
 //                 Name, UUID, m_scene.RegionInfo.RegionName);
@@ -985,6 +1141,7 @@ namespace OpenSim.Region.Framework.Scenes
             IsChildAgent = true;
             m_scene.SwapRootAgentCount(true);
             RemoveFromPhysicalScene();
+            ParentID = 0; // Child agents can't be sitting
 
             // FIXME: Set RegionHandle to the region handle of the scene this agent is moving into
             
@@ -1000,9 +1157,9 @@ namespace OpenSim.Region.Framework.Scenes
             {
 //                PhysicsActor.OnRequestTerseUpdate -= SendTerseUpdateToAllClients;
                 PhysicsActor.OnOutOfBounds -= OutOfBoundsCall;
-                m_scene.PhysicsScene.RemoveAvatar(PhysicsActor);
-                PhysicsActor.UnSubscribeEvents();
                 PhysicsActor.OnCollisionUpdate -= PhysicsCollisionUpdate;
+                PhysicsActor.UnSubscribeEvents();
+                m_scene.PhysicsScene.RemoveAvatar(PhysicsActor);
                 PhysicsActor = null;
             }
 //            else
@@ -1019,7 +1176,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="pos"></param>
         public void Teleport(Vector3 pos)
         {
-            TeleportWithMomentum(pos, null);
+            TeleportWithMomentum(pos, Vector3.Zero);
         }
 
         public void TeleportWithMomentum(Vector3 pos, Vector3? v)
@@ -1043,6 +1200,41 @@ namespace OpenSim.Region.Framework.Scenes
             SendTerseUpdateToAllClients();
         }
 
+        public void avnLocalTeleport(Vector3 newpos, Vector3? newvel, bool rotateToVelXY)
+        {
+            CheckLandingPoint(ref newpos);
+            AbsolutePosition = newpos;
+
+            if (newvel.HasValue)
+            {
+                if ((Vector3)newvel == Vector3.Zero)
+                {
+                    if (PhysicsActor != null)
+                        PhysicsActor.SetMomentum(Vector3.Zero);
+                    m_velocity = Vector3.Zero;
+                }
+                else
+                {
+                    if (PhysicsActor != null)
+                        PhysicsActor.SetMomentum((Vector3)newvel);
+                    m_velocity = (Vector3)newvel;
+
+                    if (rotateToVelXY)
+                    {
+                        Vector3 lookAt = (Vector3)newvel;
+                        lookAt.Z = 0;
+                        lookAt.Normalize();
+                        ControllingClient.SendLocalTeleport(newpos, lookAt, (uint)TeleportFlags.ViaLocation);
+                        return;
+                    }
+                }
+            }
+
+            SendTerseUpdateToAllClients();
+        }
+
+
+
         public void StopFlying()
         {
             ControllingClient.StopFlying(this);
@@ -1212,6 +1404,13 @@ namespace OpenSim.Region.Framework.Scenes
                 PhysicsActor.Size = new Vector3(0.45f, 0.6f, height);
         }
 
+        public void SetSize(Vector3 size, float feetoffset)
+        {
+            if (PhysicsActor != null && !IsChildAgent)
+                PhysicsActor.setAvatarSize(size, feetoffset);
+            
+        }
+
         /// <summary>
         /// Complete Avatar's movement into the region.
         /// </summary>
@@ -1231,7 +1430,8 @@ namespace OpenSim.Region.Framework.Scenes
 
             Vector3 look = Velocity;
 
-            if ((look.X == 0) && (look.Y == 0) && (look.Z == 0))
+            //            if ((look.X == 0) && (look.Y == 0) && (look.Z == 0))
+            if ((Math.Abs(look.X) < 0.1) && (Math.Abs(look.Y) < 0.1) && (Math.Abs(look.Z) < 0.1))
             {
                 look = new Vector3(0.99f, 0.042f, 0);
             }
@@ -1281,13 +1481,15 @@ namespace OpenSim.Region.Framework.Scenes
             // Create child agents in neighbouring regions
             if (openChildAgents && !IsChildAgent)
             {
+
                 IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
                 if (m_agentTransfer != null)
-                    Util.FireAndForget(delegate { m_agentTransfer.EnableChildAgents(this); });
+                    m_agentTransfer.EnableChildAgents(this);
 
                 IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
                 if (friendsModule != null)
                     friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
+
             }
 
 //            m_log.DebugFormat(
@@ -1303,35 +1505,43 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="collisionPoint"></param>
         /// <param name="localid"></param>
         /// <param name="distance"></param>
+        /// 
+
+        private void UpdateCameraCollisionPlane(Vector4 plane)
+        {
+            if (m_lastCameraCollisionPlane != plane)
+            {
+                m_lastCameraCollisionPlane = plane;
+                ControllingClient.SendCameraConstraint(plane);
+            }
+        }
+
         public void RayCastCameraCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 pNormal)
         {
             const float POSITION_TOLERANCE = 0.02f;
-            const float VELOCITY_TOLERANCE = 0.02f;
             const float ROTATION_TOLERANCE = 0.02f;
 
-            if (m_followCamAuto)
+            m_doingCamRayCast = false;
+            if (hitYN && localid != LocalId)
             {
-                if (hitYN)
-                {
-                    CameraConstraintActive = true;
-                    //m_log.DebugFormat("[RAYCASTRESULT]: {0}, {1}, {2}, {3}", hitYN, collisionPoint, localid, distance);
-                    
-                    Vector3 normal = Vector3.Normalize(new Vector3(0f, 0f, collisionPoint.Z) - collisionPoint);
-                    ControllingClient.SendCameraConstraint(new Vector4(normal.X, normal.Y, normal.Z, -1 * Vector3.Distance(new Vector3(0,0,collisionPoint.Z),collisionPoint)));
-                }
-                else
-                {
-                    if (!m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) ||
-                        !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE) ||
-                        !Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE))
-                    {
-                        if (CameraConstraintActive)
-                        {
-                            ControllingClient.SendCameraConstraint(new Vector4(0f, 0.5f, 0.9f, -3000f));
-                            CameraConstraintActive = false;
-                        }
-                    }
-                }
+                CameraConstraintActive = true;
+                pNormal.X = (float)Math.Round(pNormal.X, 2);
+                pNormal.Y = (float)Math.Round(pNormal.Y, 2);
+                pNormal.Z = (float)Math.Round(pNormal.Z, 2);
+                pNormal.Normalize();
+                collisionPoint.X = (float)Math.Round(collisionPoint.X, 1);
+                collisionPoint.Y = (float)Math.Round(collisionPoint.Y, 1);
+                collisionPoint.Z = (float)Math.Round(collisionPoint.Z, 1);
+
+                Vector4 plane = new Vector4(pNormal.X, pNormal.Y, pNormal.Z, Vector3.Dot(collisionPoint, pNormal));
+                UpdateCameraCollisionPlane(plane);
+            }
+            else if (!m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) ||
+                     !Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE))
+            {
+                Vector4 plane = new Vector4(0.9f, 0.0f, 0.361f, -9000f); // not right...
+                UpdateCameraCollisionPlane(plane);
+                CameraConstraintActive = false;
             }
         }
 
@@ -1406,12 +1616,6 @@ namespace OpenSim.Region.Framework.Scenes
             // DrawDistance = agentData.Far;
             DrawDistance = Scene.DefaultDrawDistance;
 
-            // Check if Client has camera in 'follow cam' or 'build' mode.
-            Vector3 camdif = (Vector3.One * Rotation - Vector3.One * CameraRotation);
-
-            m_followCamAuto = ((CameraUpAxis.Z > 0.959f && CameraUpAxis.Z < 0.98f)
-               && (Math.Abs(camdif.X) < 0.4f && Math.Abs(camdif.Y) < 0.4f)) ? true : false;
-
             m_mouseLook = (flags & AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0;
             m_leftButtonDown = (flags & AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_DOWN) != 0;
 
@@ -1431,14 +1635,38 @@ namespace OpenSim.Region.Framework.Scenes
                 StandUp();
             }
 
-            //m_log.DebugFormat("[FollowCam]: {0}", m_followCamAuto);
             // Raycast from the avatar's head to the camera to see if there's anything blocking the view
-            if ((m_movementUpdateCount % NumMovementsBetweenRayCast) == 0 && m_scene.PhysicsScene.SupportsRayCast())
+            // this exclude checks may not be complete
+
+            if (m_movementUpdateCount % NumMovementsBetweenRayCast == 0 && m_scene.PhysicsScene.SupportsRayCast())
             {
-                if (m_followCamAuto)
+                if (!m_doingCamRayCast && !m_mouseLook && ParentID == 0)
+                {
+                    Vector3 posAdjusted = AbsolutePosition;
+//                    posAdjusted.Z += 0.5f * Appearance.AvatarSize.Z - 0.5f;
+                    posAdjusted.Z += 1.0f; // viewer current camera focus point
+                    Vector3 tocam = CameraPosition - posAdjusted;
+                    tocam.X = (float)Math.Round(tocam.X, 1);
+                    tocam.Y = (float)Math.Round(tocam.Y, 1);
+                    tocam.Z = (float)Math.Round(tocam.Z, 1);
+
+                    float distTocamlen = tocam.Length();
+                    if (distTocamlen > 0.3f)
+                    {
+                        tocam *= (1.0f / distTocamlen);
+                        posAdjusted.X = (float)Math.Round(posAdjusted.X, 1);
+                        posAdjusted.Y = (float)Math.Round(posAdjusted.Y, 1);
+                        posAdjusted.Z = (float)Math.Round(posAdjusted.Z, 1);
+
+                        m_doingCamRayCast = true;
+                        m_scene.PhysicsScene.RaycastWorld(posAdjusted, tocam, distTocamlen + 1.0f, RayCastCameraCallback);
+                    }
+                }
+                else if (CameraConstraintActive && (m_mouseLook || ParentID != 0))
                 {
-                    Vector3 posAdjusted = m_pos + HEAD_ADJUSTMENT;
-                    m_scene.PhysicsScene.RaycastWorld(m_pos, Vector3.Normalize(CameraPosition - posAdjusted), Vector3.Distance(CameraPosition, posAdjusted) + 0.3f, RayCastCameraCallback);
+                    Vector4 plane = new Vector4(0.9f, 0.0f, 0.361f, -10000f); // not right...
+                    UpdateCameraCollisionPlane(plane);
+                    CameraConstraintActive = false;
                 }
             }
 
@@ -1903,7 +2131,8 @@ namespace OpenSim.Region.Framework.Scenes
 //            m_log.DebugFormat("[SCENE PRESENCE]: Resetting move to target for {0}", Name);
 
             MovingToTarget = false;
-            MoveToPositionTarget = Vector3.Zero;
+//            MoveToPositionTarget = Vector3.Zero;
+            m_forceToApply = null; // cancel possible last action
 
             // We need to reset the control flag as the ScenePresenceAnimator uses this to determine the correct
             // resting animation (e.g. hover or stand).  NPCs don't have a client that will quickly reset this flag.
@@ -1921,12 +2150,17 @@ namespace OpenSim.Region.Framework.Scenes
 //            m_log.DebugFormat("[SCENE PRESENCE]: StandUp() for {0}", Name);
 
             SitGround = false;
+
+/* move this down so avatar gets physical in the new position and not where it is siting
             if (PhysicsActor == null)
                 AddToPhysicalScene(false);
+ */
 
             if (ParentID != 0)
             {
                 SceneObjectPart part = ParentPart;
+                UnRegisterSeatControls(part.ParentGroup.UUID);
+
                 TaskInventoryDictionary taskIDict = part.TaskInventory;
                 if (taskIDict != null)
                 {
@@ -1942,14 +2176,22 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
 
-                ParentPosition = part.GetWorldPosition();
+                part.ParentGroup.DeleteAvatar(UUID);
+//                ParentPosition = part.GetWorldPosition();
                 ControllingClient.SendClearFollowCamProperties(part.ParentUUID);
 
-                m_pos += ParentPosition + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight);
-                ParentPosition = Vector3.Zero;
+//                m_pos += ParentPosition + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight);
+//                ParentPosition = Vector3.Zero;
+                m_pos = part.AbsolutePosition + (m_pos * part.GetWorldRotation()) + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight);
+                if (part.SitTargetAvatar == UUID)
+                    m_bodyRot = part.GetWorldRotation() * part.SitTargetOrientation;
 
                 ParentID = 0;
                 ParentPart = null;
+
+                if (PhysicsActor == null)
+                    AddToPhysicalScene(false);
+
                 SendAvatarDataToAllAgents();
                 m_requestedSitTargetID = 0;
 
@@ -1959,6 +2201,9 @@ namespace OpenSim.Region.Framework.Scenes
                     part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
             }
 
+            else if (PhysicsActor == null)
+                AddToPhysicalScene(false);
+
             Animator.TrySetMovementAnimation("STAND");
         }
 
@@ -2006,11 +2251,8 @@ namespace OpenSim.Region.Framework.Scenes
             if (part == null)
                 return;
 
-            // TODO: determine position to sit at based on scene geometry; don't trust offset from client
-            // see http://wiki.secondlife.com/wiki/User:Andrew_Linden/Office_Hours/2007_11_06 for details on how LL does it
-
             if (PhysicsActor != null)
-                m_sitAvatarHeight = PhysicsActor.Size.Z;
+                m_sitAvatarHeight = PhysicsActor.Size.Z * 0.5f;
 
             bool canSit = false;
             Vector3 pos = part.AbsolutePosition + offset;
@@ -2027,31 +2269,31 @@ namespace OpenSim.Region.Framework.Scenes
             }
             else
             {
+                if (PhysicsSit(part,offset)) // physics engine 
+                    return;
+
                 if (Util.GetDistanceTo(AbsolutePosition, pos) <= 10)
                 {
-//                    m_log.DebugFormat(
-//                        "[SCENE PRESENCE]: Sitting {0} on {1} {2} because sit target is unset and within 10m",
-//                        Name, part.Name, part.LocalId);
 
                     AbsolutePosition = pos + new Vector3(0.0f, 0.0f, m_sitAvatarHeight);
                     canSit = true;
                 }
-//                else
-//                {
-//                    m_log.DebugFormat(
-//                        "[SCENE PRESENCE]: Ignoring sit request of {0} on {1} {2} because sit target is unset and outside 10m",
-//                        Name, part.Name, part.LocalId);
-//                }
             }
 
             if (canSit)
             {
+
                 if (PhysicsActor != null)
                 {
                     // We can remove the physicsActor until they stand up.
                     RemoveFromPhysicalScene();
                 }
 
+                if (MovingToTarget)
+                    ResetMoveToTarget();
+
+                Velocity = Vector3.Zero;
+
                 part.AddSittingAvatar(UUID);
 
                 cameraAtOffset = part.GetCameraAtOffset();
@@ -2059,7 +2301,7 @@ namespace OpenSim.Region.Framework.Scenes
                 forceMouselook = part.GetForceMouselook();
 
                 ControllingClient.SendSitResponse(
-                    targetID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
+                    part.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
 
                 m_requestedSitTargetUUID = targetID;
 
@@ -2073,6 +2315,9 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void HandleAgentRequestSit(IClientAPI remoteClient, UUID agentID, UUID targetID, Vector3 offset)
         {
+            if (IsChildAgent)
+                return;
+
             if (ParentID != 0)
             {
                 if (ParentPart.UUID == targetID)
@@ -2088,14 +2333,6 @@ namespace OpenSim.Region.Framework.Scenes
                 m_requestedSitTargetID = part.LocalId;
                 m_requestedSitTargetUUID = targetID;
 
-//                m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset);
-
-                if (m_scene.PhysicsScene.SupportsRayCast())
-                {
-                    //m_scene.PhysicsScene.RaycastWorld(Vector3.Zero,Vector3.Zero, 0.01f,new RaycastCallback());
-                    //SitRayCastAvatarPosition(part);
-                    //return;
-                }
             }
             else
             {
@@ -2105,197 +2342,111 @@ namespace OpenSim.Region.Framework.Scenes
             SendSitResponse(targetID, offset, Quaternion.Identity);
         }
 
-        /*
-        public void SitRayCastAvatarPosition(SceneObjectPart part)
+        // returns  false if does not suport so older sit can be tried
+        public bool PhysicsSit(SceneObjectPart part, Vector3 offset)
         {
-            Vector3 EndRayCastPosition = part.AbsolutePosition + m_requestedSitOffset;
-            Vector3 StartRayCastPosition = AbsolutePosition;
-            Vector3 direction = Vector3.Normalize(EndRayCastPosition - StartRayCastPosition);
-            float distance = Vector3.Distance(EndRayCastPosition, StartRayCastPosition);
-            m_scene.PhysicsScene.RaycastWorld(StartRayCastPosition, direction, distance, SitRayCastAvatarPositionResponse);
-        }
-
-        public void SitRayCastAvatarPositionResponse(bool hitYN, Vector3 collisionPoint, uint localid, float pdistance, Vector3 normal)
-        {
-            SceneObjectPart part =  FindNextAvailableSitTarget(m_requestedSitTargetUUID);
-            if (part != null)
-            {
-                if (hitYN)
-                {
-                    if (collisionPoint.ApproxEquals(m_requestedSitOffset + part.AbsolutePosition, 0.2f))
-                    {
-                        SitRaycastFindEdge(collisionPoint, normal);
-                        m_log.DebugFormat("[SIT]: Raycast Avatar Position succeeded at point: {0}, normal:{1}", collisionPoint, normal);
-                    }
-                    else
-                    {
-                        SitRayCastAvatarPositionCameraZ(part);
-                    }
-                }
-                else
-                {
-                    SitRayCastAvatarPositionCameraZ(part);
-                }
-            }
-            else
+            if (part == null || part.ParentGroup.IsAttachment)
             {
-                ControllingClient.SendAlertMessage("Sit position no longer exists");
-                m_requestedSitTargetUUID = UUID.Zero;
-                m_requestedSitTargetID = 0;
-                m_requestedSitOffset = Vector3.Zero;
+                return true;
             }
 
-        }
+            if ( m_scene.PhysicsScene == null)
+                return false;
 
-        public void SitRayCastAvatarPositionCameraZ(SceneObjectPart part)
-        {
-            // Next, try to raycast from the camera Z position
-            Vector3 EndRayCastPosition = part.AbsolutePosition + m_requestedSitOffset;
-            Vector3 StartRayCastPosition = AbsolutePosition; StartRayCastPosition.Z = CameraPosition.Z;
-            Vector3 direction = Vector3.Normalize(EndRayCastPosition - StartRayCastPosition);
-            float distance = Vector3.Distance(EndRayCastPosition, StartRayCastPosition);
-            m_scene.PhysicsScene.RaycastWorld(StartRayCastPosition, direction, distance, SitRayCastAvatarPositionCameraZResponse);
-        }
-
-        public void SitRayCastAvatarPositionCameraZResponse(bool hitYN, Vector3 collisionPoint, uint localid, float pdistance, Vector3 normal)
-        {
-            SceneObjectPart part = FindNextAvailableSitTarget(m_requestedSitTargetUUID);
-            if (part != null)
+            if (part.PhysActor == null)
             {
-                if (hitYN)
-                {
-                    if (collisionPoint.ApproxEquals(m_requestedSitOffset + part.AbsolutePosition, 0.2f))
-                    {
-                        SitRaycastFindEdge(collisionPoint, normal);
-                        m_log.DebugFormat("[SIT]: Raycast Avatar Position + CameraZ succeeded at point: {0}, normal:{1}", collisionPoint, normal);
-                    }
-                    else
-                    {
-                        SitRayCastCameraPosition(part);
-                    }
-                }
+                // none physcis shape
+                if (part.PhysicsShapeType == (byte)PhysicsShapeType.None)
+                    ControllingClient.SendAlertMessage(" There is no suitable surface to sit on, try another spot.");
                 else
-                {
-                    SitRayCastCameraPosition(part);
+                { // non physical phantom  TODO
+                    ControllingClient.SendAlertMessage(" There is no suitable surface to sit on, try another spot.");
+                    return false;
                 }
-            }
-            else
-            {
-                ControllingClient.SendAlertMessage("Sit position no longer exists");
-                m_requestedSitTargetUUID = UUID.Zero;
-                m_requestedSitTargetID = 0;
-                m_requestedSitOffset = Vector3.Zero;
+                return true;
             }
 
-        }
 
-        public void SitRayCastCameraPosition(SceneObjectPart part)
-        {
-            // Next, try to raycast from the camera position
-            Vector3 EndRayCastPosition = part.AbsolutePosition + m_requestedSitOffset;
-            Vector3 StartRayCastPosition = CameraPosition;
-            Vector3 direction = Vector3.Normalize(EndRayCastPosition - StartRayCastPosition);
-            float distance = Vector3.Distance(EndRayCastPosition, StartRayCastPosition);
-            m_scene.PhysicsScene.RaycastWorld(StartRayCastPosition, direction, distance, SitRayCastCameraPositionResponse);
-        }
+            // not doing autopilot
+            m_requestedSitTargetID = 0; 
 
-        public void SitRayCastCameraPositionResponse(bool hitYN, Vector3 collisionPoint, uint localid, float pdistance, Vector3 normal)
-        {
-            SceneObjectPart part = FindNextAvailableSitTarget(m_requestedSitTargetUUID);
-            if (part != null)
-            {
-                if (hitYN)
-                {
-                    if (collisionPoint.ApproxEquals(m_requestedSitOffset + part.AbsolutePosition, 0.2f))
-                    {
-                        SitRaycastFindEdge(collisionPoint, normal);
-                        m_log.DebugFormat("[SIT]: Raycast Camera Position succeeded at point: {0}, normal:{1}", collisionPoint, normal);
-                    }
-                    else
-                    {
-                        SitRayHorizontal(part);
-                    }
-                }
-                else
-                {
-                    SitRayHorizontal(part);
-                }
-            }
-            else
-            {
-                ControllingClient.SendAlertMessage("Sit position no longer exists");
-                m_requestedSitTargetUUID = UUID.Zero;
-                m_requestedSitTargetID = 0;
-                m_requestedSitOffset = Vector3.Zero;
-            }
+            if (m_scene.PhysicsScene.SitAvatar(part.PhysActor, AbsolutePosition, CameraPosition, offset, new Vector3(0.35f, 0, 0.65f), PhysicsSitResponse) != 0)
+                return true;
 
+            return false;
         }
 
-        public void SitRayHorizontal(SceneObjectPart part)
+
+        private bool CanEnterLandPosition(Vector3 testPos)
         {
-            // Next, try to raycast from the avatar position to fwd
-            Vector3 EndRayCastPosition = part.AbsolutePosition + m_requestedSitOffset;
-            Vector3 StartRayCastPosition = CameraPosition;
-            Vector3 direction = Vector3.Normalize(EndRayCastPosition - StartRayCastPosition);
-            float distance = Vector3.Distance(EndRayCastPosition, StartRayCastPosition);
-            m_scene.PhysicsScene.RaycastWorld(StartRayCastPosition, direction, distance, SitRayCastHorizontalResponse);
+            ILandObject land = m_scene.LandChannel.GetLandObject(testPos.X, testPos.Y);
+
+            if (land == null || land.LandData.Name == "NO_LAND")
+                return true;
+
+            return land.CanBeOnThisLand(UUID,testPos.Z);
         }
 
-        public void SitRayCastHorizontalResponse(bool hitYN, Vector3 collisionPoint, uint localid, float pdistance, Vector3 normal)
+        // status
+        //          < 0 ignore
+        //          0   bad sit spot
+        public void PhysicsSitResponse(int status, uint partID, Vector3 offset, Quaternion Orientation)
         {
-            SceneObjectPart part = FindNextAvailableSitTarget(m_requestedSitTargetUUID);
-            if (part != null)
+            if (status < 0)
+                return;
+
+            if (status == 0)
             {
-                if (hitYN)
-                {
-                    if (collisionPoint.ApproxEquals(m_requestedSitOffset + part.AbsolutePosition, 0.2f))
-                    {
-                        SitRaycastFindEdge(collisionPoint, normal);
-                        m_log.DebugFormat("[SIT]: Raycast Horizontal Position succeeded at point: {0}, normal:{1}", collisionPoint, normal);
-                        // Next, try to raycast from the camera position
-                        Vector3 EndRayCastPosition = part.AbsolutePosition + m_requestedSitOffset;
-                        Vector3 StartRayCastPosition = CameraPosition;
-                        Vector3 direction = Vector3.Normalize(EndRayCastPosition - StartRayCastPosition);
-                        float distance = Vector3.Distance(EndRayCastPosition, StartRayCastPosition);
-                        //m_scene.PhysicsScene.RaycastWorld(StartRayCastPosition, direction, distance, SitRayCastResponseAvatarPosition);
-                    }
-                    else
-                    {
-                        ControllingClient.SendAlertMessage("Sit position not accessable.");
-                        m_requestedSitTargetUUID = UUID.Zero;
-                        m_requestedSitTargetID = 0;
-                        m_requestedSitOffset = Vector3.Zero;
-                    }
-                }
-                else
-                {
-                    ControllingClient.SendAlertMessage("Sit position not accessable.");
-                    m_requestedSitTargetUUID = UUID.Zero;
-                    m_requestedSitTargetID = 0;
-                    m_requestedSitOffset = Vector3.Zero;
-                }
+                ControllingClient.SendAlertMessage(" There is no suitable surface to sit on, try another spot.");
+                return;
             }
-            else
+
+            SceneObjectPart part = m_scene.GetSceneObjectPart(partID);
+            if (part == null)
+                return;
+
+            Vector3 targetPos = part.GetWorldPosition() + offset * part.GetWorldRotation();     
+            if(!CanEnterLandPosition(targetPos))
             {
-                ControllingClient.SendAlertMessage("Sit position no longer exists");
-                m_requestedSitTargetUUID = UUID.Zero;
-                m_requestedSitTargetID = 0;
-                m_requestedSitOffset = Vector3.Zero;
+                ControllingClient.SendAlertMessage(" Sit position on restricted land, try another spot");
+                return;
             }
 
-        }
+            RemoveFromPhysicalScene();
 
-        private void SitRaycastFindEdge(Vector3 collisionPoint, Vector3 collisionNormal)
-        {
-            int i = 0;
-            //throw new NotImplementedException();
-            //m_requestedSitTargetUUID = UUID.Zero;
-            //m_requestedSitTargetID = 0;
-            //m_requestedSitOffset = Vector3.Zero;
+            if (MovingToTarget)
+                ResetMoveToTarget();
+
+            Velocity = Vector3.Zero;
+
+            part.AddSittingAvatar(UUID);
 
-            SendSitResponse(ControllingClient, m_requestedSitTargetUUID, collisionPoint - m_requestedSitOffset, Quaternion.Identity);
+            Vector3 cameraAtOffset = part.GetCameraAtOffset();
+            Vector3 cameraEyeOffset = part.GetCameraEyeOffset();
+            bool forceMouselook = part.GetForceMouselook();
+
+            ControllingClient.SendSitResponse(
+                part.UUID, offset, Orientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
+
+            // not using autopilot
+
+            Rotation = Orientation;
+            m_pos = offset;
+
+            m_requestedSitTargetID = 0;
+            part.ParentGroup.AddAvatar(UUID);
+
+            ParentPart = part;
+            ParentID = part.LocalId;
+            if(status == 3)
+                Animator.TrySetMovementAnimation("SIT_GROUND");
+            else
+                Animator.TrySetMovementAnimation("SIT");
+            SendAvatarDataToAllAgents();
+
+            part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
         }
-        */
+
 
         public void HandleAgentSit(IClientAPI remoteClient, UUID agentID)
         {
@@ -2312,6 +2463,7 @@ namespace OpenSim.Region.Framework.Scenes
                     return;
                 }
 
+
                 if (part.SitTargetAvatar == UUID)
                 {
                     Vector3 sitTargetPos = part.SitTargetPosition;
@@ -2326,14 +2478,39 @@ namespace OpenSim.Region.Framework.Scenes
 
                     //Quaternion result = (sitTargetOrient * vq) * nq;
 
-                    m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT;
+                    double x, y, z, m;
+
+                    Quaternion r = sitTargetOrient;
+                    m = r.X * r.X + r.Y * r.Y + r.Z * r.Z + r.W * r.W;
+
+                    if (Math.Abs(1.0 - m) > 0.000001)
+                    {
+                        m = 1.0 / Math.Sqrt(m);
+                        r.X *= (float)m;
+                        r.Y *= (float)m;
+                        r.Z *= (float)m;
+                        r.W *= (float)m;
+                    }
+
+                    x = 2 * (r.X * r.Z + r.Y * r.W);
+                    y = 2 * (-r.X * r.W + r.Y * r.Z);
+                    z = -r.X * r.X - r.Y * r.Y + r.Z * r.Z + r.W * r.W;
+
+                    Vector3 up = new Vector3((float)x, (float)y, (float)z);
+                    Vector3 sitOffset = up * Appearance.AvatarHeight * 0.02638f;
+
+                    m_pos = sitTargetPos + sitOffset + SIT_TARGET_ADJUSTMENT;
+
+//                    m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT - sitOffset;
                     Rotation = sitTargetOrient;
-                    ParentPosition = part.AbsolutePosition;
+//                    ParentPosition = part.AbsolutePosition;
+                    part.ParentGroup.AddAvatar(UUID);
                 }
                 else
                 {
                     m_pos -= part.AbsolutePosition;
-                    ParentPosition = part.AbsolutePosition;
+//                    ParentPosition = part.AbsolutePosition;
+                    part.ParentGroup.AddAvatar(UUID);
 
 //                        m_log.DebugFormat(
 //                            "[SCENE PRESENCE]: Sitting {0} at position {1} ({2} + {3}) on part {4} {5} without sit target",
@@ -2384,6 +2561,13 @@ namespace OpenSim.Region.Framework.Scenes
             Animator.RemoveAnimation(animID, false);
         }
 
+        public void avnHandleChangeAnim(UUID animID, bool addRemove,bool sendPack)
+        {
+            Animator.avnChangeAnim(animID, addRemove, sendPack);
+        }
+
+
+
         /// <summary>
         /// Rotate the avatar to the given rotation and apply a movement in the given relative vector
         /// </summary>
@@ -2437,14 +2621,15 @@ namespace OpenSim.Region.Framework.Scenes
                         direc.Z *= 2.6f;
 
                         // TODO: PreJump and jump happen too quickly.  Many times prejump gets ignored.
-                        Animator.TrySetMovementAnimation("PREJUMP");
-                        Animator.TrySetMovementAnimation("JUMP");
+//                        Animator.TrySetMovementAnimation("PREJUMP");
+//                        Animator.TrySetMovementAnimation("JUMP");
                     }
                 }
             }
 
             // TODO: Add the force instead of only setting it to support multiple forces per frame?
             m_forceToApply = direc;
+            Animator.UpdateMovementAnimations();
         }
 
         #endregion
@@ -2462,16 +2647,12 @@ namespace OpenSim.Region.Framework.Scenes
                 // NOTE: Velocity is not the same as m_velocity. Velocity will attempt to
                 // grab the latest PhysicsActor velocity, whereas m_velocity is often
                 // storing a requested force instead of an actual traveling velocity
+                if (Appearance.AvatarSize != m_lastSize && !IsLoggingIn)
+                    SendAvatarDataToAllAgents();
 
-                // Throw away duplicate or insignificant updates
-                if (
-                    // If the velocity has become zero, send it no matter what.
-                       (Velocity != m_lastVelocity && Velocity == Vector3.Zero)
-                    // otherwise, if things have changed reasonably, send the update
-                    || (!Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE)
-                        || !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE)
-                        || !m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE)))
-
+                if (!Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) ||
+                    !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE) ||
+                    !m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE))
                 {
                     SendTerseUpdateToAllClients();
 
@@ -2660,6 +2841,8 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
             }
 
+            m_lastSize = Appearance.AvatarSize;
+
             int count = 0;
             m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence)
                                          {
@@ -2767,6 +2950,8 @@ namespace OpenSim.Region.Framework.Scenes
 
             avatar.ControllingClient.SendAppearance(
                 UUID, Appearance.VisualParams, Appearance.Texture.GetBytes());
+
+            
         }
 
         #endregion
@@ -2841,8 +3026,9 @@ namespace OpenSim.Region.Framework.Scenes
 
             // If we don't have a PhysActor, we can't cross anyway
             // Also don't do this while sat, sitting avatars cross with the
-            // object they sit on.
-            if (ParentID != 0 || PhysicsActor == null)
+            // object they sit on. ParentUUID denoted a pending sit, don't
+            // interfere with it.
+            if (ParentID != 0 || PhysicsActor == null || ParentUUID != UUID.Zero)
                 return;
 
             if (!IsInTransit)
@@ -3103,6 +3289,10 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         private static Vector3 marker = new Vector3(-1f, -1f, -1f);
+        private void RaiseUpdateThrottles()
+        {
+            m_scene.EventManager.TriggerThrottleUpdate(this);
+        }
         /// <summary>
         /// This updates important decision making data about a child agent
         /// The main purpose is to figure out what objects to send to a child agent that's in a neighboring region
@@ -3183,6 +3373,9 @@ namespace OpenSim.Region.Framework.Scenes
             cAgent.AlwaysRun = SetAlwaysRun;
 
             cAgent.Appearance = new AvatarAppearance(Appearance);
+
+            cAgent.ParentPart = ParentUUID;
+            cAgent.SitOffset = m_pos;
             
             lock (scriptedcontrols)
             {
@@ -3191,7 +3384,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 foreach (ScriptControllers c in scriptedcontrols.Values)
                 {
-                    controls[i++] = new ControllerData(c.itemID, (uint)c.ignoreControls, (uint)c.eventControls);
+                    controls[i++] = new ControllerData(c.objectID, c.itemID, (uint)c.ignoreControls, (uint)c.eventControls);
                 }
                 cAgent.Controllers = controls;
             }
@@ -3224,6 +3417,8 @@ namespace OpenSim.Region.Framework.Scenes
             CameraAtAxis = cAgent.AtAxis;
             CameraLeftAxis = cAgent.LeftAxis;
             CameraUpAxis = cAgent.UpAxis;
+            ParentUUID = cAgent.ParentPart;
+            m_prevSitOffset = cAgent.SitOffset;
 
             // When we get to the point of re-computing neighbors everytime this
             // changes, then start using the agent's drawdistance rather than the 
@@ -3261,6 +3456,7 @@ namespace OpenSim.Region.Framework.Scenes
                         foreach (ControllerData c in cAgent.Controllers)
                         {
                             ScriptControllers sc = new ScriptControllers();
+                            sc.objectID = c.ObjectID;
                             sc.itemID = c.ItemID;
                             sc.ignoreControls = (ScriptControlled)c.IgnoreControls;
                             sc.eventControls = (ScriptControlled)c.EventControls;
@@ -3328,20 +3524,27 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             if (Appearance.AvatarHeight == 0)
-                Appearance.SetHeight();
+//                Appearance.SetHeight();
+                Appearance.SetSize(new Vector3(0.45f,0.6f,1.9f));
 
             PhysicsScene scene = m_scene.PhysicsScene;
 
             Vector3 pVec = AbsolutePosition;
 
+/*
             PhysicsActor = scene.AddAvatar(
                 LocalId, Firstname + "." + Lastname, pVec,
-                new Vector3(0f, 0f, Appearance.AvatarHeight), isFlying);
+                new Vector3(0.45f, 0.6f, Appearance.AvatarHeight), isFlying);
+*/
+
+            PhysicsActor = scene.AddAvatar(
+                LocalId, Firstname + "." + Lastname, pVec,
+                Appearance.AvatarBoxSize,Appearance.AvatarFeetOffset, isFlying);
 
             //PhysicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients;
             PhysicsActor.OnCollisionUpdate += PhysicsCollisionUpdate;
             PhysicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong
-            PhysicsActor.SubscribeEvents(500);
+            PhysicsActor.SubscribeEvents(100);
             PhysicsActor.LocalID = LocalId;
         }
 
@@ -3355,6 +3558,7 @@ namespace OpenSim.Region.Framework.Scenes
                 ControllingClient.SendAgentAlertMessage("Physics is having a problem with your avatar.  You may not be able to move until you relog.", true);
         }
 
+
         /// <summary>
         /// Event called by the physics plugin to tell the avatar about a collision.
         /// </summary>
@@ -3368,7 +3572,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="e"></param>
         public void PhysicsCollisionUpdate(EventArgs e)
         {
-            if (IsChildAgent)
+            if (IsChildAgent || Animator == null)
                 return;
             
             //if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f))
@@ -3384,7 +3588,6 @@ namespace OpenSim.Region.Framework.Scenes
             CollisionEventUpdate collisionData = (CollisionEventUpdate)e;
             Dictionary<uint, ContactPoint> coldata = collisionData.m_objCollisionList;
 
-            CollisionPlane = Vector4.UnitW;
 
 //            // No collisions at all means we may be flying. Update always
 //            // to make falling work
@@ -3396,6 +3599,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (coldata.Count != 0)
             {
+/*
                 switch (Animator.CurrentMovementAnimation)
                 {
                     case "STAND":
@@ -3404,24 +3608,38 @@ namespace OpenSim.Region.Framework.Scenes
                     case "CROUCH":
                     case "CROUCHWALK":
                         {
+ */
                             ContactPoint lowest;
                             lowest.SurfaceNormal = Vector3.Zero;
                             lowest.Position = Vector3.Zero;
-                            lowest.Position.Z = Single.NaN;
+                            lowest.Position.Z = float.MaxValue;
 
                             foreach (ContactPoint contact in coldata.Values)
                             {
-                                if (Single.IsNaN(lowest.Position.Z) || contact.Position.Z < lowest.Position.Z)
+                                
+                                if (contact.CharacterFeet && contact.Position.Z < lowest.Position.Z)
                                 {
                                     lowest = contact;
                                 }
                             }
 
-                            CollisionPlane = new Vector4(-lowest.SurfaceNormal, -Vector3.Dot(lowest.Position, lowest.SurfaceNormal));
+                            if (lowest.Position.Z != float.MaxValue)
+                            {
+                                lowest.SurfaceNormal = -lowest.SurfaceNormal;
+                                CollisionPlane = new Vector4(lowest.SurfaceNormal, Vector3.Dot(lowest.Position, lowest.SurfaceNormal));
+                            }
+                            else
+                                CollisionPlane = Vector4.UnitW;
+/*
                         }
                         break;
                 }
+*/
             }
+            else
+                CollisionPlane = Vector4.UnitW;
+
+            RaiseCollisionScriptEvents(coldata);
 
             // Gods do not take damage and Invulnerable is set depending on parcel/region flags
             if (Invulnerable || GodLevel > 0)
@@ -3520,6 +3738,13 @@ namespace OpenSim.Region.Framework.Scenes
             // m_reprioritizationTimer.Dispose(); 
 
             RemoveFromPhysicalScene();
+          
+            m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd;
+
+//            if (Animator != null)
+//                Animator.Close();
+            Animator = null;
+
         }
 
         public void AddAttachment(SceneObjectGroup gobj)
@@ -3753,10 +3978,18 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void RegisterControlEventsToScript(int controls, int accept, int pass_on, uint Obj_localID, UUID Script_item_UUID)
         {
+            SceneObjectPart p = m_scene.GetSceneObjectPart(Obj_localID);
+            if (p == null)
+                return;
+
+            ControllingClient.SendTakeControls(controls, false, false);
+            ControllingClient.SendTakeControls(controls, true, false);
+
             ScriptControllers obj = new ScriptControllers();
             obj.ignoreControls = ScriptControlled.CONTROL_ZERO;
             obj.eventControls = ScriptControlled.CONTROL_ZERO;
 
+            obj.objectID = p.ParentGroup.UUID;
             obj.itemID = Script_item_UUID;
             if (pass_on == 0 && accept == 0)
             {
@@ -3805,6 +4038,21 @@ namespace OpenSim.Region.Framework.Scenes
             ControllingClient.SendTakeControls(int.MaxValue, false, false);
         }
 
+        private void UnRegisterSeatControls(UUID obj)
+        {
+            List<UUID> takers = new List<UUID>();
+
+            foreach (ScriptControllers c in scriptedcontrols.Values)
+            {
+                if (c.objectID == obj)
+                    takers.Add(c.itemID);
+            }
+            foreach (UUID t in takers)
+            {
+                UnRegisterControlEventsToScript(0, t);
+            }
+        }
+
         public void UnRegisterControlEventsToScript(uint Obj_localID, UUID Script_item_UUID)
         {
             ScriptControllers takecontrols;
@@ -4134,6 +4382,12 @@ namespace OpenSim.Region.Framework.Scenes
 
         private void CheckAndAdjustLandingPoint(ref Vector3 pos)
         {
+            string reason;
+
+            // Honor bans
+            if (!m_scene.TestLandRestrictions(UUID, out reason, ref pos.X, ref pos.Y))
+                return;
+
             SceneObjectGroup telehub = null;
             if (m_scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero && (telehub = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject)) != null)
             {
@@ -4173,11 +4427,206 @@ namespace OpenSim.Region.Framework.Scenes
                         pos = land.LandData.UserLocation;
                     }
                 }
-
+                
                 land.SendLandUpdateToClient(ControllingClient);
             }
         }
 
+        private DetectedObject CreateDetObject(SceneObjectPart obj)
+        {
+            DetectedObject detobj = new DetectedObject();
+            detobj.keyUUID = obj.UUID;
+            detobj.nameStr = obj.Name;
+            detobj.ownerUUID = obj.OwnerID;
+            detobj.posVector = obj.AbsolutePosition;
+            detobj.rotQuat = obj.GetWorldRotation();
+            detobj.velVector = obj.Velocity;
+            detobj.colliderType = 0;
+            detobj.groupUUID = obj.GroupID;
+
+            return detobj;
+        }
+
+        private DetectedObject CreateDetObject(ScenePresence av)
+        {
+            DetectedObject detobj = new DetectedObject();
+            detobj.keyUUID = av.UUID;
+            detobj.nameStr = av.ControllingClient.Name;
+            detobj.ownerUUID = av.UUID;
+            detobj.posVector = av.AbsolutePosition;
+            detobj.rotQuat = av.Rotation;
+            detobj.velVector = av.Velocity;
+            detobj.colliderType = 0;
+            detobj.groupUUID = av.ControllingClient.ActiveGroupId;
+
+            return detobj;
+        }
+
+        private DetectedObject CreateDetObjectForGround()
+        {
+            DetectedObject detobj = new DetectedObject();
+            detobj.keyUUID = UUID.Zero;
+            detobj.nameStr = "";
+            detobj.ownerUUID = UUID.Zero;
+            detobj.posVector = AbsolutePosition;
+            detobj.rotQuat = Quaternion.Identity;
+            detobj.velVector = Vector3.Zero;
+            detobj.colliderType = 0;
+            detobj.groupUUID = UUID.Zero;
+
+            return detobj;
+        }
+
+        private ColliderArgs CreateColliderArgs(SceneObjectPart dest, List<uint> colliders)
+        {
+            ColliderArgs colliderArgs = new ColliderArgs();
+            List<DetectedObject> colliding = new List<DetectedObject>();
+            foreach (uint localId in colliders)
+            {
+                if (localId == 0)
+                    continue;
+
+                SceneObjectPart obj = m_scene.GetSceneObjectPart(localId);
+                if (obj != null)
+                {
+                    if (!dest.CollisionFilteredOut(obj.UUID, obj.Name))
+                        colliding.Add(CreateDetObject(obj));
+                }
+                else
+                {
+                    ScenePresence av = m_scene.GetScenePresence(localId);
+                    if (av != null && (!av.IsChildAgent))
+                    {
+                        if (!dest.CollisionFilteredOut(av.UUID, av.Name))
+                            colliding.Add(CreateDetObject(av));
+                    }
+                }
+            }
+
+            colliderArgs.Colliders = colliding;
+
+            return colliderArgs;
+        }
+
+        private delegate void ScriptCollidingNotification(uint localID, ColliderArgs message);
+
+        private void SendCollisionEvent(SceneObjectGroup dest, scriptEvents ev, List<uint> colliders, ScriptCollidingNotification notify)
+        {
+            ColliderArgs CollidingMessage;
+
+            if (colliders.Count > 0)
+            {
+                if ((dest.RootPart.ScriptEvents & ev) != 0)
+                {
+                    CollidingMessage = CreateColliderArgs(dest.RootPart, colliders);
+
+                    if (CollidingMessage.Colliders.Count > 0)
+                        notify(dest.RootPart.LocalId, CollidingMessage);
+                }
+            }
+        }
+
+        private void SendLandCollisionEvent(SceneObjectGroup dest, scriptEvents ev, ScriptCollidingNotification notify)
+        {
+            if ((dest.RootPart.ScriptEvents & ev) != 0)
+            {
+                ColliderArgs LandCollidingMessage = new ColliderArgs();
+                List<DetectedObject> colliding = new List<DetectedObject>();
+
+                colliding.Add(CreateDetObjectForGround());
+                LandCollidingMessage.Colliders = colliding;
+
+                notify(dest.RootPart.LocalId, LandCollidingMessage);
+            }
+        }
+
+        private void RaiseCollisionScriptEvents(Dictionary<uint, ContactPoint> coldata)
+        {
+            try
+            {
+                List<uint> thisHitColliders = new List<uint>();
+                List<uint> endedColliders = new List<uint>();
+                List<uint> startedColliders = new List<uint>();
+                List<CollisionForSoundInfo> soundinfolist = new List<CollisionForSoundInfo>();
+                CollisionForSoundInfo soundinfo;
+                ContactPoint curcontact;
+
+                if (coldata.Count == 0)
+                {
+                    if (m_lastColliders.Count == 0)
+                        return; // nothing to do
+
+                    foreach (uint localID in m_lastColliders)
+                    {
+                        endedColliders.Add(localID);
+                    }
+                    m_lastColliders.Clear();
+                }
+
+                else
+                {
+                    foreach (uint id in coldata.Keys)
+                    {
+                        thisHitColliders.Add(id);
+                        if (!m_lastColliders.Contains(id))
+                        {
+                            startedColliders.Add(id);
+                            curcontact = coldata[id];
+                            if (Math.Abs(curcontact.RelativeSpeed) > 0.2)
+                            {
+                                soundinfo = new CollisionForSoundInfo();
+                                soundinfo.colliderID = id;
+                                soundinfo.position = curcontact.Position;
+                                soundinfo.relativeVel = curcontact.RelativeSpeed;
+                                soundinfolist.Add(soundinfo);
+                            }
+                        }
+                        //m_log.Debug("[SCENE PRESENCE]: Collided with:" + localid.ToString() + " at depth of: " + collissionswith[localid].ToString());
+                    }
+
+                    // calculate things that ended colliding
+                    foreach (uint localID in m_lastColliders)
+                    {
+                        if (!thisHitColliders.Contains(localID))
+                        {
+                            endedColliders.Add(localID);
+                        }
+                    }
+                    //add the items that started colliding this time to the last colliders list.
+                    foreach (uint localID in startedColliders)
+                    {
+                        m_lastColliders.Add(localID);
+                    }
+                    // remove things that ended colliding from the last colliders list
+                    foreach (uint localID in endedColliders)
+                    {
+                        m_lastColliders.Remove(localID);
+                    }
+
+                    if (soundinfolist.Count > 0)
+                        CollisionSounds.AvatarCollisionSound(this, soundinfolist);
+                }
+
+                foreach (SceneObjectGroup att in GetAttachments())
+                {
+                    SendCollisionEvent(att, scriptEvents.collision_start, startedColliders, m_scene.EventManager.TriggerScriptCollidingStart);
+                    SendCollisionEvent(att, scriptEvents.collision      , m_lastColliders , m_scene.EventManager.TriggerScriptColliding);
+                    SendCollisionEvent(att, scriptEvents.collision_end  , endedColliders  , m_scene.EventManager.TriggerScriptCollidingEnd);
+
+                    if (startedColliders.Contains(0))
+                        SendLandCollisionEvent(att, scriptEvents.land_collision_start, m_scene.EventManager.TriggerScriptLandCollidingStart);
+                    if (m_lastColliders.Contains(0))
+                        SendLandCollisionEvent(att, scriptEvents.land_collision, m_scene.EventManager.TriggerScriptLandColliding);
+                    if (endedColliders.Contains(0))
+                        SendLandCollisionEvent(att, scriptEvents.land_collision_end, m_scene.EventManager.TriggerScriptLandCollidingEnd);
+                }
+            }
+            finally
+            {
+                m_collisionEventFlag = false;
+            }
+        }
+
         private void TeleportFlagsDebug() {
     
             // Some temporary debugging help to show all the TeleportFlags we have...
@@ -4202,6 +4651,5 @@ namespace OpenSim.Region.Framework.Scenes
             m_log.InfoFormat("[SCENE PRESENCE]: TELEPORT ******************");
     
         }
-
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 39420a6..ce4fb40 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -262,6 +262,12 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                     sr.Close();
                 }
 
+                XmlNodeList keymotion = doc.GetElementsByTagName("KeyframeMotion");
+                if (keymotion.Count > 0)
+                    sceneObject.RootPart.KeyframeMotion = KeyframeMotion.FromData(sceneObject, Convert.FromBase64String(keymotion[0].InnerText));
+                else
+                    sceneObject.RootPart.KeyframeMotion = null;
+
                 // Script state may, or may not, exist. Not having any, is NOT
                 // ever a problem.
                 sceneObject.LoadScriptState(doc);
@@ -368,11 +374,21 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             m_SOPXmlProcessors.Add("PayPrice3", ProcessPayPrice3);
             m_SOPXmlProcessors.Add("PayPrice4", ProcessPayPrice4);
 
+            m_SOPXmlProcessors.Add("Buoyancy", ProcessBuoyancy);
+            m_SOPXmlProcessors.Add("Force", ProcessForce);
+            m_SOPXmlProcessors.Add("Torque", ProcessTorque);
+            m_SOPXmlProcessors.Add("VolumeDetectActive", ProcessVolumeDetectActive);
+
+
+            m_SOPXmlProcessors.Add("Vehicle", ProcessVehicle);
+
             m_SOPXmlProcessors.Add("PhysicsShapeType", ProcessPhysicsShapeType);
             m_SOPXmlProcessors.Add("Density", ProcessDensity);
             m_SOPXmlProcessors.Add("Friction", ProcessFriction);
             m_SOPXmlProcessors.Add("Bounce", ProcessBounce);
             m_SOPXmlProcessors.Add("GravityModifier", ProcessGravityModifier);
+            m_SOPXmlProcessors.Add("CameraEyeOffset", ProcessCameraEyeOffset);
+            m_SOPXmlProcessors.Add("CameraAtOffset", ProcessCameraAtOffset);
 
             #endregion
 
@@ -401,7 +417,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             m_TaskInventoryXmlProcessors.Add("PermsMask", ProcessTIPermsMask);
             m_TaskInventoryXmlProcessors.Add("Type", ProcessTIType);
             m_TaskInventoryXmlProcessors.Add("OwnerChanged", ProcessTIOwnerChanged);
-            
+
             #endregion
 
             #region ShapeXmlProcessors initialization
@@ -626,6 +642,33 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             obj.GravityModifier = reader.ReadElementContentAsFloat("GravityModifier", String.Empty);
         }
 
+        private static void ProcessCameraEyeOffset(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.SetCameraEyeOffset(Util.ReadVector(reader, "CameraEyeOffset"));
+        }
+
+        private static void ProcessCameraAtOffset(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.SetCameraAtOffset(Util.ReadVector(reader, "CameraAtOffset"));
+        }
+
+        private static void ProcessVehicle(SceneObjectPart obj, XmlTextReader reader)
+        {
+            SOPVehicle vehicle = SOPVehicle.FromXml2(reader);
+
+            if (vehicle == null)
+            {
+                obj.VehicleParams = null;
+                m_log.DebugFormat(
+                    "[SceneObjectSerializer]: Parsing Vehicle for object part {0} {1} encountered errors.  Please see earlier log entries.",
+                    obj.Name, obj.UUID);
+            }
+            else
+            {
+                obj.VehicleParams = vehicle;
+            }
+        }
+                   
         private static void ProcessShape(SceneObjectPart obj, XmlTextReader reader)
         {
             List<string> errorNodeNames;
@@ -795,6 +838,25 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             obj.PayPrice[4] = (int)reader.ReadElementContentAsInt("PayPrice4", String.Empty);
         }
 
+        private static void ProcessBuoyancy(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.Buoyancy = (float)reader.ReadElementContentAsFloat("Buoyancy", String.Empty);
+        }
+
+        private static void ProcessForce(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.Force = Util.ReadVector(reader, "Force");
+        }
+        private static void ProcessTorque(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.Torque = Util.ReadVector(reader, "Torque");
+        }
+
+        private static void ProcessVolumeDetectActive(SceneObjectPart obj, XmlTextReader reader)
+        {
+            obj.VolumeDetectActive = Util.ReadBoolean(reader);
+        }
+
         #endregion
 
         #region TaskInventoryXmlProcessors
@@ -1182,6 +1244,16 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             });
 
             writer.WriteEndElement();
+
+            if (sog.RootPart.KeyframeMotion != null)
+            {
+                Byte[] data = sog.RootPart.KeyframeMotion.Serialize();               
+
+                writer.WriteStartElement(String.Empty, "KeyframeMotion", String.Empty);
+                writer.WriteBase64(data, 0, data.Length);
+                writer.WriteEndElement();
+            }
+
             writer.WriteEndElement();
         }
 
@@ -1289,6 +1361,16 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             writer.WriteElementString("PayPrice3", sop.PayPrice[3].ToString());
             writer.WriteElementString("PayPrice4", sop.PayPrice[4].ToString());
 
+            writer.WriteElementString("Buoyancy", sop.Buoyancy.ToString());
+
+            WriteVector(writer, "Force", sop.Force);
+            WriteVector(writer, "Torque", sop.Torque);
+
+            writer.WriteElementString("VolumeDetectActive", sop.VolumeDetectActive.ToString().ToLower());
+
+            if (sop.VehicleParams != null)
+                sop.VehicleParams.ToXml2(writer);
+
             if(sop.PhysicsShapeType != sop.DefaultPhysicsShapeType())
                 writer.WriteElementString("PhysicsShapeType", sop.PhysicsShapeType.ToString().ToLower());
             if (sop.Density != 1000.0f)
@@ -1299,6 +1381,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 writer.WriteElementString("Bounce", sop.Restitution.ToString().ToLower());
             if (sop.GravityModifier != 1.0f)
                 writer.WriteElementString("GravityModifier", sop.GravityModifier.ToString().ToLower());
+            WriteVector(writer, "CameraEyeOffset", sop.GetCameraEyeOffset());
+            WriteVector(writer, "CameraAtOffset", sop.GetCameraAtOffset());
 
             writer.WriteEndElement();
         }
@@ -1524,12 +1608,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         {
             TaskInventoryDictionary tinv = new TaskInventoryDictionary();
 
-            if (reader.IsEmptyElement)
-            {
-                reader.Read();
-                return tinv;
-            }
-
             reader.ReadStartElement(name, String.Empty);
 
             while (reader.Name == "TaskInventoryItem")
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index b9d615e..5398ab9 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -175,7 +175,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         // saved last reported value so there is something available for llGetRegionFPS 
         private float lastReportedSimFPS;
-        private float[] lastReportedSimStats = new float[22];
+        private float[] lastReportedSimStats = new float[23];
         private float m_pfps;
 
         /// <summary>
@@ -189,12 +189,13 @@ namespace OpenSim.Region.Framework.Scenes
         private int m_objectUpdates;
 
         private int m_frameMS;
-        private int m_spareMS;
+
         private int m_netMS;
         private int m_agentMS;
         private int m_physicsMS;
         private int m_imageMS;
         private int m_otherMS;
+        private int m_sleeptimeMS;
 
 //Ckrinke: (3-21-08) Comment out to remove a compiler warning. Bring back into play when needed.
 //Ckrinke        private int m_scriptMS = 0;
@@ -289,7 +290,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         private void statsHeartBeat(object sender, EventArgs e)
         {
-            SimStatsPacket.StatBlock[] sb = new SimStatsPacket.StatBlock[22];
+            SimStatsPacket.StatBlock[] sb = new SimStatsPacket.StatBlock[23];
             SimStatsPacket.RegionBlock rb = new SimStatsPacket.RegionBlock();
             
             // Know what's not thread safe in Mono... modifying timers.
@@ -327,6 +328,35 @@ namespace OpenSim.Region.Framework.Scenes
                     physfps = 0;
 
 #endregion
+                float factor = 1 / m_statsUpdateFactor;
+
+                if (reportedFPS <= 0)
+                    reportedFPS = 1;
+
+                float perframe = 1.0f / (float)reportedFPS;
+
+                float TotalFrameTime = m_frameMS * perframe;
+
+                float targetframetime = 1100.0f / (float)m_nominalReportedFps;
+
+                float sparetime;
+                float sleeptime;
+
+                if (TotalFrameTime > targetframetime)
+                {
+                    sparetime = 0;
+                    sleeptime = 0;
+                }
+                else
+                {
+                    sparetime = m_frameMS - m_physicsMS - m_agentMS;
+                    sparetime *= perframe;
+                    if (sparetime < 0)
+                        sparetime = 0;
+                    else if (sparetime > TotalFrameTime)
+                        sparetime = TotalFrameTime;
+                    sleeptime = m_sleeptimeMS * perframe;
+                }
 
                 m_rootAgents = m_scene.SceneGraph.GetRootAgentCount();
                 m_childAgents = m_scene.SceneGraph.GetChildAgentCount();
@@ -338,25 +368,15 @@ namespace OpenSim.Region.Framework.Scenes
                 // so that stat numbers are always consistent.
                 CheckStatSanity();
                 
-                //Our time dilation is 0.91 when we're running a full speed,
-                // therefore to make sure we get an appropriate range,
-                // we have to factor in our error.   (0.10f * statsUpdateFactor)
-                // multiplies the fix for the error times the amount of times it'll occur a second
-                // / 10 divides the value by the number of times the sim heartbeat runs (10fps)
-                // Then we divide the whole amount by the amount of seconds pass in between stats updates.
-
-                // 'statsUpdateFactor' is how often stats packets are sent in seconds. Used below to change
-                // values to X-per-second values.
+                // other MS is actually simulation time
+                //                m_otherMS = m_frameMS - m_physicsMS - m_imageMS - m_netMS - m_agentMS;
+                // m_imageMS  m_netMS are not included in m_frameMS
 
-                uint thisFrame = m_scene.Frame;
-                float framesUpdated = (float)(thisFrame - m_lastUpdateFrame) * m_reportedFpsCorrectionFactor;
-                m_lastUpdateFrame = thisFrame;
+                m_otherMS = m_frameMS - m_physicsMS -  m_agentMS - m_sleeptimeMS;
+                if (m_otherMS < 0)
+                    m_otherMS = 0;
 
-                // Avoid div-by-zero if somehow we've not updated any frames.
-                if (framesUpdated == 0)
-                    framesUpdated = 1;
-
-                for (int i = 0; i < 22; i++)
+                for (int i = 0; i < 23; i++)
                 {
                     sb[i] = new SimStatsPacket.StatBlock();
                 }
@@ -386,19 +406,19 @@ namespace OpenSim.Region.Framework.Scenes
                 sb[7].StatValue = m_activePrim;
 
                 sb[8].StatID = (uint)Stats.FrameMS;
-                sb[8].StatValue = m_frameMS / framesUpdated;
+                sb[8].StatValue = TotalFrameTime;
 
                 sb[9].StatID = (uint)Stats.NetMS;
-                sb[9].StatValue = m_netMS / framesUpdated;
+                sb[9].StatValue = m_netMS * perframe;
 
                 sb[10].StatID = (uint)Stats.PhysicsMS;
-                sb[10].StatValue = m_physicsMS / framesUpdated;
+                sb[10].StatValue = m_physicsMS * perframe;
 
                 sb[11].StatID = (uint)Stats.ImageMS ;
-                sb[11].StatValue = m_imageMS / framesUpdated;
+                sb[11].StatValue = m_imageMS * perframe;
 
                 sb[12].StatID = (uint)Stats.OtherMS;
-                sb[12].StatValue = m_otherMS / framesUpdated;
+                sb[12].StatValue = m_otherMS * perframe;
 
                 sb[13].StatID = (uint)Stats.InPacketsPerSecond;
                 sb[13].StatValue = (m_inPacketsPerSecond / m_statsUpdateFactor);
@@ -410,7 +430,7 @@ namespace OpenSim.Region.Framework.Scenes
                 sb[15].StatValue = m_unAckedBytes;
 
                 sb[16].StatID = (uint)Stats.AgentMS;
-                sb[16].StatValue = m_agentMS / framesUpdated;
+                sb[16].StatValue = m_agentMS * perframe;
 
                 sb[17].StatID = (uint)Stats.PendingDownloads;
                 sb[17].StatValue = m_pendingDownloads;
@@ -425,7 +445,10 @@ namespace OpenSim.Region.Framework.Scenes
                 sb[20].StatValue = m_scriptLinesPerSecond / m_statsUpdateFactor;
 
                 sb[21].StatID = (uint)Stats.SimSpareMs;
-                sb[21].StatValue = m_spareMS / framesUpdated;
+                sb[21].StatValue = sparetime;
+
+                sb[22].StatID = (uint)Stats.SimSleepMs;
+                sb[22].StatValue = sleeptime;
 
                 for (int i = 0; i < 22; i++)
                 {
@@ -444,28 +467,32 @@ namespace OpenSim.Region.Framework.Scenes
                 }
 
                 // Extra statistics that aren't currently sent to clients
-                lock (m_lastReportedExtraSimStats)
+                if (m_scene.PhysicsScene != null)
                 {
-                    m_lastReportedExtraSimStats[LastReportedObjectUpdateStatName] = m_objectUpdates / m_statsUpdateFactor;
-                    m_lastReportedExtraSimStats[SlowFramesStat.ShortName] = (float)SlowFramesStat.Value;
-
-                    Dictionary<string, float> physicsStats = m_scene.PhysicsScene.GetStats();
-    
-                    if (physicsStats != null)
+                    lock (m_lastReportedExtraSimStats)
                     {
-                        foreach (KeyValuePair<string, float> tuple in physicsStats)
+                        m_lastReportedExtraSimStats[LastReportedObjectUpdateStatName] = m_objectUpdates / m_statsUpdateFactor;
+                        m_lastReportedExtraSimStats[SlowFramesStat.ShortName] = (float)SlowFramesStat.Value;
+
+                        Dictionary<string, float> physicsStats = m_scene.PhysicsScene.GetStats();
+        
+                        if (physicsStats != null)
                         {
-                            // FIXME: An extremely dirty hack to divide MS stats per frame rather than per second
-                            // Need to change things so that stats source can indicate whether they are per second or
-                            // per frame.
-                            if (tuple.Key.EndsWith("MS"))
-                                m_lastReportedExtraSimStats[tuple.Key] = tuple.Value / framesUpdated;
-                            else
-                                m_lastReportedExtraSimStats[tuple.Key] = tuple.Value / m_statsUpdateFactor;
+                            foreach (KeyValuePair<string, float> tuple in physicsStats)
+                            {
+                                // FIXME: An extremely dirty hack to divide MS stats per frame rather than per second
+                                // Need to change things so that stats source can indicate whether they are per second or
+                                // per frame.
+                                if (tuple.Key.EndsWith("MS"))
+                                    m_lastReportedExtraSimStats[tuple.Key] = tuple.Value * perframe;
+                                else
+                                    m_lastReportedExtraSimStats[tuple.Key] = tuple.Value / m_statsUpdateFactor;
+                            }
                         }
                     }
                 }
 
+//                LastReportedObjectUpdates = m_objectUpdates / m_statsUpdateFactor;
                 ResetValues();
             }
         }
@@ -488,7 +515,8 @@ namespace OpenSim.Region.Framework.Scenes
             m_physicsMS = 0;
             m_imageMS = 0;
             m_otherMS = 0;
-            m_spareMS = 0;
+//            m_spareMS = 0;
+            m_sleeptimeMS = 0;
 
 //Ckrinke This variable is not used, so comment to remove compiler warning until it is used.
 //Ckrinke            m_scriptMS = 0;
@@ -572,11 +600,6 @@ namespace OpenSim.Region.Framework.Scenes
                 SlowFramesStat.Value++;
         }
 
-        public void AddSpareMS(int ms)
-        {
-            m_spareMS += ms;
-        }
-
         public void addNetMS(int ms)
         {
             m_netMS += ms;
@@ -602,6 +625,11 @@ namespace OpenSim.Region.Framework.Scenes
             m_otherMS += ms;
         }
 
+        public void addSleepMS(int ms)
+        {
+            m_sleeptimeMS += ms;
+        }
+
         public void AddPendingDownloads(int count)
         {
             m_pendingDownloads += count;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
index c264433..1182c96 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
@@ -62,6 +62,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Assert.That(g1Post.RootPart.Scale.X, Is.EqualTo(2));
             Assert.That(g1Post.RootPart.Scale.Y, Is.EqualTo(3));
             Assert.That(g1Post.RootPart.Scale.Z, Is.EqualTo(4));
+
+            Assert.That(g1Post.RootPart.UndoCount, Is.EqualTo(1));
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
deleted file mode 100644
index 96973de..0000000
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Reflection;
-using NUnit.Framework;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
-
-namespace OpenSim.Region.Framework.Scenes.Tests
-{
-    /// <summary>
-    /// Tests for undo/redo
-    /// </summary>
-    public class SceneObjectUndoRedoTests : OpenSimTestCase
-    {
-        [Test]
-        public void TestUndoRedoResizeSceneObject()
-        {
-            TestHelpers.InMethod();
-//            TestHelpers.EnableLogging();
-
-            Vector3 firstSize = new Vector3(2, 3, 4);
-            Vector3 secondSize = new Vector3(5, 6, 7);
-
-            Scene scene = new SceneHelpers().SetupScene();
-            scene.MaxUndoCount = 20;
-            SceneObjectGroup g1 = SceneHelpers.AddSceneObject(scene);
-
-            // TODO: It happens to be the case that we are not storing undo states for SOPs which are not yet in a SOG,
-            // which is the way that AddSceneObject() sets up the object (i.e. it creates the SOP first).  However,
-            // this is somewhat by chance.  Really, we shouldn't be storing undo states at all if the object is not
-            // in a scene.
-            Assert.That(g1.RootPart.UndoCount, Is.EqualTo(0));
-
-            g1.GroupResize(firstSize);
-            Assert.That(g1.RootPart.UndoCount, Is.EqualTo(1));
-
-            g1.GroupResize(secondSize);
-            Assert.That(g1.RootPart.UndoCount, Is.EqualTo(2));
-
-            g1.RootPart.Undo();
-            Assert.That(g1.RootPart.UndoCount, Is.EqualTo(1));
-            Assert.That(g1.GroupScale, Is.EqualTo(firstSize));
-
-            g1.RootPart.Redo();
-            Assert.That(g1.RootPart.UndoCount, Is.EqualTo(2));
-            Assert.That(g1.GroupScale, Is.EqualTo(secondSize));
-        }
-
-        [Test]
-        public void TestUndoLimit()
-        {
-            TestHelpers.InMethod();
-
-            Vector3 firstSize = new Vector3(2, 3, 4);
-            Vector3 secondSize = new Vector3(5, 6, 7);
-            Vector3 thirdSize = new Vector3(8, 9, 10);
-            Vector3 fourthSize = new Vector3(11, 12, 13);
-
-            Scene scene = new SceneHelpers().SetupScene();
-            scene.MaxUndoCount = 2;
-            SceneObjectGroup g1 = SceneHelpers.AddSceneObject(scene);
-
-            g1.GroupResize(firstSize);
-            g1.GroupResize(secondSize);
-            g1.GroupResize(thirdSize);
-            g1.GroupResize(fourthSize);
-
-            g1.RootPart.Undo();
-            g1.RootPart.Undo();
-            g1.RootPart.Undo();
-
-            Assert.That(g1.RootPart.UndoCount, Is.EqualTo(0));
-            Assert.That(g1.GroupScale, Is.EqualTo(secondSize));
-        }
-
-        [Test]
-        public void TestNoUndoOnObjectsNotInScene()
-        {
-            TestHelpers.InMethod();
-
-            Vector3 firstSize = new Vector3(2, 3, 4);
-            Vector3 secondSize = new Vector3(5, 6, 7);
-            Vector3 thirdSize = new Vector3(8, 9, 10);
-            Vector3 fourthSize = new Vector3(11, 12, 13);
-
-            Scene scene = new SceneHelpers().SetupScene();
-            scene.MaxUndoCount = 20;
-            SceneObjectGroup g1 = SceneHelpers.CreateSceneObject(1, TestHelpers.ParseTail(0x1));
-
-            g1.GroupResize(firstSize);
-            g1.GroupResize(secondSize);
-
-            Assert.That(g1.RootPart.UndoCount, Is.EqualTo(0));
-
-            g1.RootPart.Undo();
-
-            Assert.That(g1.GroupScale, Is.EqualTo(secondSize));
-        }
-
-        [Test]
-        public void TestUndoBeyondAvailable()
-        {
-            TestHelpers.InMethod();
-
-            Vector3 newSize = new Vector3(2, 3, 4);
-
-            Scene scene = new SceneHelpers().SetupScene();
-            scene.MaxUndoCount = 20;
-            SceneObjectGroup g1 = SceneHelpers.AddSceneObject(scene);
-            Vector3 originalSize = g1.GroupScale;
-
-            g1.RootPart.Undo();
-
-            Assert.That(g1.RootPart.UndoCount, Is.EqualTo(0));
-            Assert.That(g1.GroupScale, Is.EqualTo(originalSize));
-
-            g1.GroupResize(newSize);
-            Assert.That(g1.RootPart.UndoCount, Is.EqualTo(1));
-            Assert.That(g1.GroupScale, Is.EqualTo(newSize));
-
-            g1.RootPart.Undo();
-            g1.RootPart.Undo();
-
-            Assert.That(g1.RootPart.UndoCount, Is.EqualTo(0));
-            Assert.That(g1.GroupScale, Is.EqualTo(originalSize));
-        }
-
-        [Test]
-        public void TestRedoBeyondAvailable()
-        {
-            TestHelpers.InMethod();
-
-            Vector3 newSize = new Vector3(2, 3, 4);
-
-            Scene scene = new SceneHelpers().SetupScene();
-            scene.MaxUndoCount = 20;
-            SceneObjectGroup g1 = SceneHelpers.AddSceneObject(scene);
-            Vector3 originalSize = g1.GroupScale;
-
-            g1.RootPart.Redo();
-
-            Assert.That(g1.RootPart.UndoCount, Is.EqualTo(0));
-            Assert.That(g1.GroupScale, Is.EqualTo(originalSize));
-
-            g1.GroupResize(newSize);
-            g1.RootPart.Undo();
-            g1.RootPart.Redo();
-            g1.RootPart.Redo();
-
-            Assert.That(g1.RootPart.UndoCount, Is.EqualTo(1));
-            Assert.That(g1.GroupScale, Is.EqualTo(newSize));
-        }
-    }
-}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
index 2b79271..c7eaff9 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
@@ -44,7 +44,7 @@ using OpenSim.Tests.Common.Mock;
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
     [TestFixture]
-    public class SceneObjectUserGroupTests : OpenSimTestCase
+    public class SceneObjectUserGroupTests
     {
         /// <summary>
         /// Test share with group object functionality
@@ -54,6 +54,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void TestShareWithGroup()
         {
             TestHelpers.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
                         
             UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
             
diff --git a/OpenSim/Region/Framework/Scenes/UndoState.cs b/OpenSim/Region/Framework/Scenes/UndoState.cs
index 860172c..7bbf1bd 100644
--- a/OpenSim/Region/Framework/Scenes/UndoState.cs
+++ b/OpenSim/Region/Framework/Scenes/UndoState.cs
@@ -27,202 +27,307 @@
 
 using System;
 using System.Reflection;
+using System.Collections.Generic;
 using log4net;
 using OpenMetaverse;
+using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Region.Framework.Scenes
 {
     public class UndoState
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        public Vector3 Position = Vector3.Zero;
-        public Vector3 Scale = Vector3.Zero;
-        public Quaternion Rotation = Quaternion.Identity;
-
-        /// <summary>
-        /// Is this undo state for an entire group?
-        /// </summary>
-        public bool ForGroup;
+        const int UNDOEXPIRESECONDS = 300; // undo expire time   (nice to have it came from a ini later)
 
+        public ObjectChangeData data;
+        public DateTime creationtime;
         /// <summary>
         /// Constructor.
         /// </summary>
         /// <param name="part"></param>
-        /// <param name="forGroup">True if the undo is for an entire group</param>
-        public UndoState(SceneObjectPart part, bool forGroup)
+        /// <param name="change">bit field with what is changed</param>
+        /// 
+        public UndoState(SceneObjectPart part, ObjectChangeType change)
         {
-            if (part.ParentID == 0)
-            {
-                ForGroup = forGroup;
-
-//                    if (ForGroup)
-                    Position = part.ParentGroup.AbsolutePosition;
-//                    else
-//                        Position = part.OffsetPosition;
-
-//                    m_log.DebugFormat(
-//                        "[UNDO STATE]: Storing undo position {0} for root part", Position);
+            data = new ObjectChangeData();
+            data.change = change;
+            creationtime = DateTime.UtcNow;
 
-                Rotation = part.RotationOffset;
-
-//                    m_log.DebugFormat(
-//                        "[UNDO STATE]: Storing undo rotation {0} for root part", Rotation);
-
-                Scale = part.Shape.Scale;
-
-//                    m_log.DebugFormat(
-//                        "[UNDO STATE]: Storing undo scale {0} for root part", Scale);
+            if (part.ParentGroup.RootPart == part)
+            {
+                if ((change & ObjectChangeType.Position) != 0)
+                    data.position = part.ParentGroup.AbsolutePosition;
+                if ((change & ObjectChangeType.Rotation) != 0)
+                    data.rotation = part.RotationOffset;
+                if ((change & ObjectChangeType.Scale) != 0)
+                    data.scale = part.Shape.Scale;
             }
             else
             {
-                Position = part.OffsetPosition;
-//                    m_log.DebugFormat(
-//                        "[UNDO STATE]: Storing undo position {0} for child part", Position);
+                if ((change & ObjectChangeType.Position) != 0)
+                    data.position = part.OffsetPosition;
+                if ((change & ObjectChangeType.Rotation) != 0)
+                    data.rotation = part.RotationOffset;
+                if ((change & ObjectChangeType.Scale) != 0)
+                    data.scale = part.Shape.Scale;
+            }
+        }
+        /// <summary>
+        /// check if undo or redo is too old 
+        /// </summary>
 
-                Rotation = part.RotationOffset;
-//                    m_log.DebugFormat(
-//                        "[UNDO STATE]: Storing undo rotation {0} for child part", Rotation);
+        public bool checkExpire()
+        {
+            TimeSpan t = DateTime.UtcNow - creationtime;
+            if (t.Seconds > UNDOEXPIRESECONDS)
+                return true;
+            return false;
+        }
 
-                Scale = part.Shape.Scale;
-//                    m_log.DebugFormat(
-//                        "[UNDO STATE]: Storing undo scale {0} for child part", Scale);
-            }
+        /// <summary>
+        /// updates undo or redo creation time to now
+        /// </summary>
+        public void updateExpire()
+        {
+            creationtime = DateTime.UtcNow;
         }
 
         /// <summary>
         /// Compare the relevant state in the given part to this state.
         /// </summary>
         /// <param name="part"></param>
-        /// <returns>true if both the part's position, rotation and scale match those in this undo state.  False otherwise.</returns>
-        public bool Compare(SceneObjectPart part)
+        /// <returns>true what fiels and related data are equal, False otherwise.</returns>
+        /// 
+        public bool Compare(SceneObjectPart part, ObjectChangeType change)    
         {
+            if (data.change != change) // if diferent targets, then they are diferent
+                return false;
+
             if (part != null)
             {
                 if (part.ParentID == 0)
-                    return
-                        Position == part.ParentGroup.AbsolutePosition
-                            && Rotation == part.RotationOffset
-                            && Scale == part.Shape.Scale;
+                {
+                    if ((change & ObjectChangeType.Position) != 0 && data.position != part.ParentGroup.AbsolutePosition)
+                        return false;
+                }
                 else
-                    return
-                        Position == part.OffsetPosition
-                            && Rotation == part.RotationOffset
-                            && Scale == part.Shape.Scale;
-            }
+                {
+                    if ((change & ObjectChangeType.Position) != 0 && data.position != part.OffsetPosition)
+                        return false;
+                }
+
+                if ((change & ObjectChangeType.Rotation) != 0 && data.rotation != part.RotationOffset)
+                    return false;
+                if ((change & ObjectChangeType.Rotation) != 0 && data.scale == part.Shape.Scale)
+                    return false;
+                return true;
 
+            }
             return false;
         }
 
-        public void PlaybackState(SceneObjectPart part)
+        /// <summary>
+        /// executes the undo or redo to a part or its group
+        /// </summary>
+        /// <param name="part"></param>
+        /// 
+
+        public void PlayState(SceneObjectPart part)
         {
             part.Undoing = true;
 
-            if (part.ParentID == 0)
-            {
-//                    m_log.DebugFormat(
-//                        "[UNDO STATE]: Undoing position to {0} for root part {1} {2}",
-//                        Position, part.Name, part.LocalId);
+            SceneObjectGroup grp = part.ParentGroup;
 
-                if (Position != Vector3.Zero)
-                {
-                    if (ForGroup)
-                        part.ParentGroup.AbsolutePosition = Position;
-                    else
-                        part.ParentGroup.UpdateRootPosition(Position);
-                }
+            if (grp != null)
+            {
+                grp.doChangeObject(part, data);              
+            }
+            part.Undoing = false;
+        }
+    }
 
-//                    m_log.DebugFormat(
-//                        "[UNDO STATE]: Undoing rotation {0} to {1} for root part {2} {3}",
-//                        part.RotationOffset, Rotation, part.Name, part.LocalId);
+    public class UndoRedoState
+    {
+        int size;
+        public LinkedList<UndoState> m_redo = new LinkedList<UndoState>();
+        public LinkedList<UndoState> m_undo = new LinkedList<UndoState>();
 
-                if (ForGroup)
-                    part.UpdateRotation(Rotation);
-                else
-                    part.ParentGroup.UpdateRootRotation(Rotation);
+        /// <summary>
+        /// creates a new UndoRedoState with default states memory size
+        /// </summary>
 
-                if (Scale != Vector3.Zero)
-                {
-//                        m_log.DebugFormat(
-//                            "[UNDO STATE]: Undoing scale {0} to {1} for root part {2} {3}",
-//                            part.Shape.Scale, Scale, part.Name, part.LocalId);
+        public UndoRedoState()
+        {
+            size = 5;
+        }
 
-                    if (ForGroup)
-                        part.ParentGroup.GroupResize(Scale);
-                    else
-                        part.Resize(Scale);
-                }
+        /// <summary>
+        /// creates a new UndoRedoState with states memory having indicated size
+        /// </summary>
+        /// <param name="size"></param>
 
-                part.ParentGroup.ScheduleGroupForTerseUpdate();
-            }
+        public UndoRedoState(int _size)
+        {
+            if (_size < 3)
+                size = 3;
             else
-            {
-                // Note: Updating these properties on sop automatically schedules an update if needed
-                if (Position != Vector3.Zero)
-                {
-//                        m_log.DebugFormat(
-//                            "[UNDO STATE]: Undoing position {0} to {1} for child part {2} {3}",
-//                            part.OffsetPosition, Position, part.Name, part.LocalId);
+                size = _size;
+        }
 
-                    part.OffsetPosition = Position;
-                }
+        /// <summary>
+        /// returns number of undo entries in memory
+        /// </summary>
 
-//                    m_log.DebugFormat(
-//                        "[UNDO STATE]: Undoing rotation {0} to {1} for child part {2} {3}",
-//                        part.RotationOffset, Rotation, part.Name, part.LocalId);
+        public int Count
+        {
+            get { return m_undo.Count; }
+        }
 
-                part.UpdateRotation(Rotation);
+        /// <summary>
+        /// clears all undo and redo entries
+        /// </summary>
 
-                if (Scale != Vector3.Zero)
+        public void Clear()
+        {
+            m_undo.Clear();
+            m_redo.Clear();
+        }
+
+        /// <summary>
+        /// adds a new state undo to part or its group, with changes indicated by what bits
+        /// </summary>
+        /// <param name="part"></param>
+        /// <param name="change">bit field with what is changed</param>
+
+        public void StoreUndo(SceneObjectPart part, ObjectChangeType change)
+        {
+            lock (m_undo)
+            {
+                UndoState last;
+
+                if (m_redo.Count > 0) // last code seems to clear redo on every new undo
                 {
-//                        m_log.DebugFormat(
-//                            "[UNDO STATE]: Undoing scale {0} to {1} for child part {2} {3}",
-//                            part.Shape.Scale, Scale, part.Name, part.LocalId);
+                    m_redo.Clear();
+                }
 
-                    part.Resize(Scale);
+                if (m_undo.Count > 0)
+                {
+                    // check expired entry
+                    last = m_undo.First.Value;
+                    if (last != null && last.checkExpire())
+                        m_undo.Clear();
+                    else
+                    {
+                        // see if we actually have a change
+                        if (last != null)
+                        {
+                            if (last.Compare(part, change))
+                                return;
+                        }
+                    }
                 }
-            }
 
-            part.Undoing = false;
+                // limite size
+                while (m_undo.Count >= size)
+                    m_undo.RemoveLast();
+
+                UndoState nUndo = new UndoState(part, change);
+                m_undo.AddFirst(nUndo);
+            }
         }
 
-        public void PlayfwdState(SceneObjectPart part)
-        {
-            part.Undoing = true;
+        /// <summary>
+        /// executes last state undo to part or its group
+        /// current state is pushed into redo
+        /// </summary>
+        /// <param name="part"></param>
 
-            if (part.ParentID == 0)
+        public void Undo(SceneObjectPart part)
+        {
+            lock (m_undo)
             {
-                if (Position != Vector3.Zero)
-                    part.ParentGroup.AbsolutePosition = Position;
-
-                if (Rotation != Quaternion.Identity)
-                    part.UpdateRotation(Rotation);
+                UndoState nUndo;
 
-                if (Scale != Vector3.Zero)
+                // expire redo
+                if (m_redo.Count > 0)
                 {
-                    if (ForGroup)
-                        part.ParentGroup.GroupResize(Scale);
-                    else
-                        part.Resize(Scale);
+                    nUndo = m_redo.First.Value;
+                    if (nUndo != null && nUndo.checkExpire())
+                        m_redo.Clear();
                 }
 
-                part.ParentGroup.ScheduleGroupForTerseUpdate();
+                if (m_undo.Count > 0)
+                {
+                    UndoState goback = m_undo.First.Value;
+                    // check expired
+                    if (goback != null && goback.checkExpire())
+                    {
+                        m_undo.Clear();
+                        return;
+                    }
+
+                    if (goback != null)
+                    {
+                        m_undo.RemoveFirst();
+
+                        // redo limite size
+                        while (m_redo.Count >= size)
+                            m_redo.RemoveLast();
+
+                        nUndo = new UndoState(part, goback.data.change); // new value in part should it be full goback copy?
+                        m_redo.AddFirst(nUndo);
+
+                        goback.PlayState(part);
+                    }
+                }
             }
-            else
+        }
+
+        /// <summary>
+        /// executes last state redo to part or its group
+        /// current state is pushed into undo
+        /// </summary>
+        /// <param name="part"></param>
+
+        public void Redo(SceneObjectPart part)
+        {
+            lock (m_undo)
             {
-                // Note: Updating these properties on sop automatically schedules an update if needed
-                if (Position != Vector3.Zero)
-                    part.OffsetPosition = Position;
+                UndoState nUndo;
 
-                if (Rotation != Quaternion.Identity)
-                    part.UpdateRotation(Rotation);
+                // expire undo
+                if (m_undo.Count > 0)
+                {
+                    nUndo = m_undo.First.Value;
+                    if (nUndo != null && nUndo.checkExpire())
+                        m_undo.Clear();
+                }
 
-                if (Scale != Vector3.Zero)
-                    part.Resize(Scale);
+                if (m_redo.Count > 0)
+                {
+                    UndoState gofwd = m_redo.First.Value;
+                    // check expired
+                    if (gofwd != null && gofwd.checkExpire())
+                    {
+                        m_redo.Clear();
+                        return;
+                    }
+
+                    if (gofwd != null)
+                    {
+                        m_redo.RemoveFirst();
+
+                        // limite undo size
+                        while (m_undo.Count >= size)
+                            m_undo.RemoveLast();
+
+                        nUndo = new UndoState(part, gofwd.data.change);   // new value in part should it be full gofwd copy?
+                        m_undo.AddFirst(nUndo);
+
+                        gofwd.PlayState(part);
+                    }
+                }
             }
-
-            part.Undoing = false;
         }
     }
 
@@ -247,4 +352,4 @@ namespace OpenSim.Region.Framework.Scenes
             m_terrainModule.UndoTerrain(m_terrainChannel);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index ad33607..b09ae39 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -84,10 +84,6 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="assetUuids">The assets gathered</param>
         public void GatherAssetUuids(UUID assetUuid, AssetType assetType, IDictionary<UUID, AssetType> assetUuids)
         {
-            // avoid infinite loops
-            if (assetUuids.ContainsKey(assetUuid))
-                return;
-
             try
             {               
                 assetUuids[assetUuid] = assetType;
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 0ac56fa..5ac4e27 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -670,6 +670,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
         public event ObjectDrop OnObjectDrop;
         public event StartAnim OnStartAnim;
         public event StopAnim OnStopAnim;
+        public event ChangeAnim OnChangeAnim;
         public event LinkObjects OnLinkObjects;
         public event DelinkObjects OnDelinkObjects;
         public event RequestMapBlocks OnRequestMapBlocks;
@@ -715,6 +716,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
         public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily;
         public event UpdatePrimFlags OnUpdatePrimFlags;
         public event UpdatePrimTexture OnUpdatePrimTexture;
+        public event ClientChangeObject onClientChangeObject;
         public event UpdateVector OnUpdatePrimGroupPosition;
         public event UpdateVector OnUpdatePrimSinglePosition;
         public event UpdatePrimRotation OnUpdatePrimGroupRotation;
@@ -819,6 +821,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
         public event ObjectOwner OnObjectOwner;
         public event DirPlacesQuery OnDirPlacesQuery;
         public event DirFindQuery OnDirFindQuery;
+        public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
         public event DirLandQuery OnDirLandQuery;
         public event DirPopularQuery OnDirPopularQuery;
         public event DirClassifiedQuery OnDirClassifiedQuery;
@@ -835,7 +838,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
         public event ClassifiedInfoRequest OnClassifiedInfoRequest;
         public event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
         public event ClassifiedDelete OnClassifiedDelete;
-        public event ClassifiedDelete OnClassifiedGodDelete;
+        public event ClassifiedGodDelete OnClassifiedGodDelete;
         public event EventNotificationAddRequest OnEventNotificationAddRequest;
         public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
         public event EventGodDelete OnEventGodDelete;
@@ -865,10 +868,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
         public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
         public event SimWideDeletesDelegate OnSimWideDeletes;
         public event SendPostcard OnSendPostcard;
+        public event ChangeInventoryItemFlags OnChangeInventoryItemFlags;
         public event MuteListEntryUpdate OnUpdateMuteListEntry;
         public event MuteListEntryRemove OnRemoveMuteListEntry;
         public event GodlikeMessage onGodlikeMessage;
         public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate;
+        public event GenericCall2 OnUpdateThrottles;
 
 #pragma warning restore 67
 
@@ -886,10 +891,10 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void Close()
         {
-            Close(false);
+            Close(true, false);
         }
 
-        public void Close(bool force)
+        public void Close(bool sendStop, bool force)
         {
             Disconnect();
         }
@@ -906,7 +911,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
             // Mimicking LLClientView which gets always set appearance from client.
             AvatarAppearance appearance;
             m_scene.GetAvatarAppearance(this, out appearance);
-            OnSetAppearance(this, appearance.Texture, (byte[])appearance.VisualParams.Clone());
+            OnSetAppearance(this, appearance.Texture, (byte[])appearance.VisualParams.Clone(),appearance.AvatarSize, new WearableCacheItem[0]);
         }
 
         public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args)
@@ -1097,7 +1102,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId)
         {
-            
+
+        }
+
+        public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId)
+        {
+
         }
 
         public void SendRemoveInventoryItem(UUID itemID)
@@ -1120,7 +1130,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
             
         }
 
-        public void SendXferPacket(ulong xferID, uint packet, byte[] data)
+        public void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory)
         {
             
         }
@@ -1419,6 +1429,11 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         }
 
+        public void SetAgentThrottleSilent(int throttle, int setting)
+        {
+           
+
+        }
         public byte[] GetThrottlesPacked(float multiplier)
         {
             return new byte[0];
diff --git a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
index d7fb272..17971e3 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
 
                 if (m_console != null)
                 {
-                    m_console.AddCommand("TempATtachModule", false, "set auto_grant_attach_perms", "set auto_grant_attach_perms true|false", "Allow objects owned by the region owner os estate managers to obtain attach permissions without asking the user", SetAutoGrantAttachPerms);
+                    m_console.AddCommand("TempAttachModule", false, "set auto_grant_attach_perms", "set auto_grant_attach_perms true|false", "Allow objects owned by the region owner os estate managers to obtain attach permissions without asking the user", SetAutoGrantAttachPerms);
                 }
             }
             else
@@ -183,7 +183,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
                 hostPart.ParentGroup.RootPart.ScheduleFullUpdate();
             }
 
-            return attachmentsModule.AttachObject(target, hostPart.ParentGroup, (uint)attachmentPoint, false, true) ? 1 : 0;
+            return attachmentsModule.AttachObject(target, hostPart.ParentGroup, (uint)attachmentPoint, false, true, true) ? 1 : 0;
         }
     }
 }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
index 4e84364..026ceca 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
                 m_scene.AddCommand(
                     "Friends", this, "friends show",
                     "friends show [--cache] <first-name> <last-name>",
-                    "Show the friends for the given user if they exist.\n",
+                    "Show the friends for the given user if they exist.",
                     "The --cache option will show locally cached information for that user.",
                     HandleFriendsShowCommand);
             }
@@ -197,4 +197,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 37ab35a..f292a75 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -568,7 +568,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
 
         public Hashtable FreeSwitchSLVoiceGetPreloginHTTPHandler(Hashtable request)
         {
-            m_log.Debug("[FreeSwitchVoice]: FreeSwitchSLVoiceGetPreloginHTTPHandler called");
+//            m_log.Debug("[FreeSwitchVoice] FreeSwitchSLVoiceGetPreloginHTTPHandler called");
 
             Hashtable response = new Hashtable();
             response["content_type"] = "text/xml";
@@ -719,7 +719,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
         
         public Hashtable FreeSwitchSLVoiceSigninHTTPHandler(Hashtable request)
         {
-            m_log.Debug("[FreeSwitchVoice]: FreeSwitchSLVoiceSigninHTTPHandler called");
+            //m_log.Debug("[FreeSwitchVoice] FreeSwitchSLVoiceSigninHTTPHandler called");
 //            string requestbody = (string)request["body"];
 //            string uri = (string)request["uri"];
 //            string contenttype = (string)request["content-type"];
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index 881807a..7da1de6 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -192,7 +192,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                         break;
                 }
 
-                m_vivoxVoiceAccountApi = String.Format("http://{0}/api2", m_vivoxServer);
+                m_vivoxVoiceAccountApi = String.Format("https://{0}/api2", m_vivoxServer);
 
                 // Admin interface required values
                 if (String.IsNullOrEmpty(m_vivoxServer) ||
@@ -471,8 +471,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                 avatarName = avatar.Name;
 
                 m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: scene = {0}, agentID = {1}", scene, agentID);
-                m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: request: {0}, path: {1}, param: {2}",
-                                  request, path, param);
+//                    m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: request: {0}, path: {1}, param: {2}",
+//                                      request, path, param);
 
                 XmlElement    resp;
                 bool          retry = false;
@@ -579,7 +579,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
 
                 string r = LLSDHelpers.SerialiseLLSDReply(voiceAccountResponse);
 
-                m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: avatar \"{0}\": {1}", avatarName, r);
+//                    m_log.DebugFormat("[VivoxVoice][PROVISIONVOICE]: avatar \"{0}\": {1}", avatarName, r);
 
                 return r;
             }
@@ -627,8 +627,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                 // voice channel
                 LandData land = scene.GetLandData(avatar.AbsolutePosition);
 
-                m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": request: {4}, path: {5}, param: {6}",
-                                  scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, request, path, param);
+//                    m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": request: {4}, path: {5}, param: {6}",
+//                                      scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, request, path, param);
                 // m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: avatar \"{0}\": location: {1} {2} {3}",
                 //                   avatarName, avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z);
 
@@ -658,8 +658,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                 parcelVoiceInfo = new LLSDParcelVoiceInfoResponse(scene.RegionInfo.RegionName, land.LocalID, creds);
                 string r = LLSDHelpers.SerialiseLLSDReply(parcelVoiceInfo);
 
-                m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": {4}", 
-                                  scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, r);
+//                    m_log.DebugFormat("[VivoxVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": {4}", 
+//                                      scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, r);
                 return r;
             }
             catch (Exception e)
@@ -686,11 +686,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
         public string ChatSessionRequest(Scene scene, string request, string path, string param,
                                          UUID agentID, Caps caps)
         {
-            ScenePresence avatar = scene.GetScenePresence(agentID);
-            string        avatarName = avatar.Name;
+//            ScenePresence avatar = scene.GetScenePresence(agentID);
+//            string        avatarName = avatar.Name;
 
-            m_log.DebugFormat("[VivoxVoice][CHATSESSION]: avatar \"{0}\": request: {1}, path: {2}, param: {3}",
-                              avatarName, request, path, param);
+//            m_log.DebugFormat("[VivoxVoice][CHATSESSION]: avatar \"{0}\": request: {1}, path: {2}, param: {3}",
+//                              avatarName, request, path, param);
             return "<llsd>true</llsd>";
         }
 
@@ -740,7 +740,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
             return channelUri;
         }
 
-        private static readonly string m_vivoxLoginPath = "http://{0}/api2/viv_signin.php?userid={1}&pwd={2}";
+
+        private static readonly string m_vivoxLoginPath = "https://{0}/api2/viv_signin.php?userid={1}&pwd={2}";
 
         /// <summary>
         /// Perform administrative login for Vivox.
@@ -752,7 +753,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
             return VivoxCall(requrl, false);
         }
 
-        private static readonly string m_vivoxLogoutPath = "http://{0}/api2/viv_signout.php?auth_token={1}";
+        private static readonly string m_vivoxLogoutPath = "https://{0}/api2/viv_signout.php?auth_token={1}";
 
         /// <summary>
         /// Perform administrative logout for Vivox.
@@ -763,7 +764,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
             return VivoxCall(requrl, false);
         }
 
-        private static readonly string m_vivoxGetAccountPath = "http://{0}/api2/viv_get_acct.php?auth_token={1}&user_name={2}";
+
+        private static readonly string m_vivoxGetAccountPath = "https://{0}/api2/viv_get_acct.php?auth_token={1}&user_name={2}";
 
         /// <summary>
         /// Retrieve account information for the specified user.
@@ -775,7 +777,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
             return VivoxCall(requrl, true);
         }
 
-        private static readonly string m_vivoxNewAccountPath = "http://{0}/api2/viv_adm_acct_new.php?username={1}&pwd={2}&auth_token={3}";
+
+        private static readonly string m_vivoxNewAccountPath = "https://{0}/api2/viv_adm_acct_new.php?username={1}&pwd={2}&auth_token={3}";
 
         /// <summary>
         /// Creates a new account.
@@ -789,7 +792,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
             return VivoxCall(requrl, true);
         }
 
-        private static readonly string m_vivoxPasswordPath = "http://{0}/api2/viv_adm_password.php?user_name={1}&new_pwd={2}&auth_token={3}";
+
+        private static readonly string m_vivoxPasswordPath = "https://{0}/api2/viv_adm_password.php?user_name={1}&new_pwd={2}&auth_token={3}";
 
         /// <summary>
         /// Change the user's password.
@@ -800,7 +804,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
             return VivoxCall(requrl, true);
         }
 
-        private static readonly string m_vivoxChannelPath = "http://{0}/api2/viv_chan_mod.php?mode={1}&chan_name={2}&auth_token={3}";
+
+        private static readonly string m_vivoxChannelPath = "https://{0}/api2/viv_chan_mod.php?mode={1}&chan_name={2}&auth_token={3}";
 
         /// <summary>
         /// Create a channel.
@@ -872,7 +877,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
             return false;
         }
 
-        private static readonly string m_vivoxChannelSearchPath = "http://{0}/api2/viv_chan_search.php?cond_channame={1}&auth_token={2}";
+        private static readonly string m_vivoxChannelSearchPath = "https://{0}/api2/viv_chan_search.php?cond_channame={1}&auth_token={2}";
 
         /// <summary>
         /// Retrieve a channel.
@@ -1015,7 +1020,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
             return false;
         }
 
-        // private static readonly string m_vivoxChannelById = "http://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}";
+        // private static readonly string m_vivoxChannelById = "https://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}";
 
         // private XmlElement VivoxGetChannelById(string parent, string channelid)
         // {
@@ -1027,7 +1032,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
         //         return VivoxCall(requrl, true);
         // }
 
-        private static readonly string m_vivoxChannelDel = "http://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}";
+        private static readonly string m_vivoxChannelDel = "https://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}";
 
         /// <summary>
         /// Delete a channel.
@@ -1040,6 +1045,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
         /// are required in a later phase.
         /// In this case the call handles parent and description as optional values.
         /// </summary>
+
         private XmlElement VivoxDeleteChannel(string parent, string channelid)
         {
             string requrl = String.Format(m_vivoxChannelDel, m_vivoxServer, "delete", channelid, m_authToken);
@@ -1050,11 +1056,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
             return VivoxCall(requrl, true);
         }
 
-        private static readonly string m_vivoxChannelSearch = "http://{0}/api2/viv_chan_search.php?&cond_chanparent={1}&auth_token={2}";
+        private static readonly string m_vivoxChannelSearch = "https://{0}/api2/viv_chan_search.php?&cond_chanparent={1}&auth_token={2}";
 
         /// <summary>
         /// Return information on channels in the given directory
         /// </summary>
+
         private XmlElement VivoxListChildren(string channelid)
         {
             string requrl = String.Format(m_vivoxChannelSearch, m_vivoxServer, channelid, m_authToken);
@@ -1114,7 +1121,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
             try
             {
                 // Otherwise prepare the request
-                m_log.DebugFormat("[VivoxVoice] Sending request <{0}>", requrl);
+//                m_log.DebugFormat("[VivoxVoice] Sending request <{0}>", requrl);
 
                 HttpWebRequest  req = (HttpWebRequest)WebRequest.Create(requrl);
                 HttpWebResponse rsp = null;
@@ -1316,4 +1323,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
             return false;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index 29f9591..d764936 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -921,7 +921,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             msg.dialog = dialog;
             // msg.dialog = (byte)OpenMetaverse.InstantMessageDialog.GroupNotice;
             msg.fromGroup = true;
-            msg.offline = (byte)0;
+            msg.offline = (byte)1; // Allow this message to be stored for offline use
             msg.ParentEstateID = 0;
             msg.Position = Vector3.Zero;
             msg.RegionID = UUID.Zero.Guid;
diff --git a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
index c1957e2..39cabb5 100644
--- a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
+++ b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
@@ -121,28 +121,40 @@ namespace OpenSim.Region.OptionalModules
 
         private bool CanObjectEnter(UUID objectID, bool enteringRegion, Vector3 newPoint, Scene scene)
         {
+            if (newPoint.X < -1f || newPoint.X > (float)(Constants.RegionSize + 1) ||
+                newPoint.Y < -1f || newPoint.Y > (float)(Constants.RegionSize + 1))
+                return true;
+
             SceneObjectPart obj = scene.GetSceneObjectPart(objectID);
-            Vector3 oldPoint = obj.GroupPosition;
-            int objectCount = obj.ParentGroup.PrimCount;
-            ILandObject oldParcel = scene.LandChannel.GetLandObject(oldPoint.X, oldPoint.Y);
+
+            if (obj == null)
+                return false;
+
+            // Prim counts are determined by the location of the root prim.  if we're
+            // moving a child prim, just let it pass
+            if (!obj.IsRoot)
+            {
+                return true;
+            }
+
             ILandObject newParcel = scene.LandChannel.GetLandObject(newPoint.X, newPoint.Y);
 
-            int usedPrims = newParcel.PrimCounts.Total;
-            int simulatorCapacity = newParcel.GetSimulatorMaxPrimCount();
+            if (newParcel == null)
+                return true;
+
+            Vector3 oldPoint = obj.GroupPosition;
+            ILandObject oldParcel = scene.LandChannel.GetLandObject(oldPoint.X, oldPoint.Y);
             
             // The prim hasn't crossed a region boundry so we don't need to worry
             // about prim counts here
-            if(oldParcel.Equals(newParcel))
+            if(oldParcel != null && oldParcel.Equals(newParcel))
             {
                 return true;
             }
 
-            // Prim counts are determined by the location of the root prim.  if we're
-            // moving a child prim, just let it pass
-            if(!obj.IsRoot)
-            {
-                return true;
-            }
+            int objectCount = obj.ParentGroup.PrimCount;
+            int usedPrims = newParcel.PrimCounts.Total;
+            int simulatorCapacity = newParcel.GetSimulatorMaxPrimCount();
 
             // TODO: Add Special Case here for temporary prims
             
@@ -171,4 +183,4 @@ namespace OpenSim.Region.OptionalModules
             return true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
index 943675e..32549d6 100644
--- a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
@@ -98,7 +98,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcRouterModule
 
         public void RegisterNewReceiver(IScriptModule scriptEngine, UUID channel, UUID objectID, UUID itemID, string uri)
         {
-            scriptEngine.PostScriptEvent(itemID, "xmlrpc_uri", new Object[] {uri});
+            if (m_Enabled)
+            {
+                scriptEngine.PostScriptEvent(itemID, "xmlrpc_uri", new Object[] { uri });
+            }
         }
 
         public void UnRegisterReceiver(string channelID, UUID itemID)
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 7bbf500..57d9217 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -198,7 +198,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
         {
         }
 
-        public bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID, int amount)
+        public bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID, int amount, UUID txn)
         {
             string description = String.Format("Object {0} pays {1}", resolveObjectName(objectID), resolveAgentName(toID));
 
@@ -840,6 +840,10 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
             if (module != null)
                 module.BuyObject(remoteClient, categoryID, localID, saleType, salePrice);
         }
+
+        public void MoveMoney(UUID fromAgentID, UUID toAgentID, int amount, string text)
+        {
+        }
     }
 
     public enum TransactionType : int
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 6bd27f0..d665126 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         private readonly string m_firstname;
         private readonly string m_lastname;
         private readonly Vector3 m_startPos;
-        private readonly UUID m_uuid = UUID.Random();
+        private UUID m_uuid = UUID.Random();
         private readonly Scene m_scene;
         private readonly UUID m_ownerID;
 
@@ -221,7 +221,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
 #pragma warning disable 67
         public event Action<IClientAPI> OnLogout;
         public event ObjectPermissions OnObjectPermissions;
-
+        public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
         public event MoneyTransferRequest OnMoneyTransferRequest;
         public event ParcelBuy OnParcelBuy;
         public event Action<IClientAPI> OnConnectionClosed;
@@ -241,6 +241,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         public event ObjectDrop OnObjectDrop;
         public event StartAnim OnStartAnim;
         public event StopAnim OnStopAnim;
+        public event ChangeAnim OnChangeAnim;
         public event LinkObjects OnLinkObjects;
         public event DelinkObjects OnDelinkObjects;
         public event RequestMapBlocks OnRequestMapBlocks;
@@ -290,6 +291,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         public event UpdatePrimTexture OnUpdatePrimTexture;
         public event UpdateVector OnUpdatePrimGroupPosition;
         public event UpdateVector OnUpdatePrimSinglePosition;
+        public event ClientChangeObject onClientChangeObject;
         public event UpdatePrimRotation OnUpdatePrimGroupRotation;
         public event UpdatePrimSingleRotationPosition OnUpdatePrimSingleRotationPosition;
         public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;
@@ -427,7 +429,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         public event ClassifiedInfoRequest OnClassifiedInfoRequest;
         public event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
         public event ClassifiedDelete OnClassifiedDelete;
-        public event ClassifiedDelete OnClassifiedGodDelete;
+        public event ClassifiedGodDelete OnClassifiedGodDelete;
 
         public event EventNotificationAddRequest OnEventNotificationAddRequest;
         public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
@@ -466,11 +468,12 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
         public event SimWideDeletesDelegate OnSimWideDeletes;
         public event SendPostcard OnSendPostcard;
+        public event ChangeInventoryItemFlags OnChangeInventoryItemFlags;
         public event MuteListEntryUpdate OnUpdateMuteListEntry;
         public event MuteListEntryRemove OnRemoveMuteListEntry;
         public event GodlikeMessage onGodlikeMessage;
         public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate;
-
+        public event GenericCall2 OnUpdateThrottles;
 #pragma warning restore 67
 
         #endregion
@@ -493,6 +496,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         public virtual UUID AgentId
         {
             get { return m_uuid; }
+            set { m_uuid = value; }
         }
 
         public UUID SessionId
@@ -593,6 +597,12 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         public virtual void SetChildAgentThrottle(byte[] throttle)
         {
         }
+
+        public void SetAgentThrottleSilent(int throttle, int setting)
+        {
+
+
+        }
         public byte[] GetThrottlesPacked(float multiplier)
         {
             return new byte[0];
@@ -737,6 +747,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         {
         }
 
+        public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId)
+        {
+        }
+
         public virtual void SendRemoveInventoryItem(UUID itemID)
         {
         }
@@ -753,7 +767,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         {
         }
 
-        public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data)
+        public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory)
         {
         }
         public virtual void SendAbortXferPacket(ulong xferID)
@@ -903,10 +917,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC
 
         public void Close()
         {
-            Close(false);
+            Close(true, false);
         }
 
-        public void Close(bool force)
+        public void Close(bool sendStop, bool force)
         {
             // Remove ourselves from the scene
             m_scene.RemoveClient(AgentId, false);
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index 7d46d92..8c9c006 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -143,10 +143,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC
             npcAvatar.CircuitCode = (uint)Util.RandomClass.Next(0,
                     int.MaxValue);
 
-            m_log.DebugFormat(
-                    "[NPC MODULE]: Creating NPC {0} {1} {2}, owner={3}, senseAsAgent={4} at {5} in {6}",
-                    firstname, lastname, npcAvatar.AgentId, owner,
-                    senseAsAgent, position, scene.RegionInfo.RegionName);
+//            m_log.DebugFormat(
+//                "[NPC MODULE]: Creating NPC {0} {1} {2}, owner={3}, senseAsAgent={4} at {5} in {6}",
+//                firstname, lastname, npcAvatar.AgentId, owner, senseAsAgent, position, scene.RegionInfo.RegionName);
 
             AgentCircuitData acd = new AgentCircuitData();
             acd.AgentID = npcAvatar.AgentId;
@@ -169,36 +168,30 @@ namespace OpenSim.Region.OptionalModules.World.NPC
             }
             */
 
-            lock (m_avatars)
-            {
-                scene.AuthenticateHandler.AddNewCircuit(npcAvatar.CircuitCode,
-                        acd);
-                scene.AddNewClient(npcAvatar, PresenceType.Npc);
+            ManualResetEvent ev = new ManualResetEvent(false);
 
-                ScenePresence sp;
-                if (scene.TryGetScenePresence(npcAvatar.AgentId, out sp))
+            Util.FireAndForget(delegate(object x) {
+                lock (m_avatars)
                 {
-                    /*
-                    m_log.DebugFormat(
-                            "[NPC MODULE]: Successfully retrieved scene presence for NPC {0} {1}",
-                            sp.Name, sp.UUID);
-                    */
-
-                    sp.CompleteMovement(npcAvatar, false);
-                    m_avatars.Add(npcAvatar.AgentId, npcAvatar);
-                    m_log.DebugFormat("[NPC MODULE]: Created NPC {0} {1}",
-                            npcAvatar.AgentId, sp.Name);
+                    scene.AuthenticateHandler.AddNewCircuit(npcAvatar.CircuitCode, acd);
+                    scene.AddNewClient(npcAvatar, PresenceType.Npc);
 
-                    return npcAvatar.AgentId;
-                }
-                else
-                {
-                    m_log.WarnFormat(
-                            "[NPC MODULE]: Could not find scene presence for NPC {0} {1}",
-                            sp.Name, sp.UUID);
-                    return UUID.Zero;
+                    ScenePresence sp;
+                    if (scene.TryGetScenePresence(npcAvatar.AgentId, out sp))
+                    {
+                        sp.CompleteMovement(npcAvatar, false);
+                        m_avatars.Add(npcAvatar.AgentId, npcAvatar);
+//                        m_log.DebugFormat("[NPC MODULE]: Created NPC {0} {1}", npcAvatar.AgentId, sp.Name);
+                    }
                 }
-            }
+                ev.Set();
+            });
+
+            ev.WaitOne();
+
+//            m_log.DebugFormat("[NPC MODULE]: Created NPC with id {0}", npcAvatar.AgentId);
+
+            return npcAvatar.AgentId;
         }
 
         public bool MoveToTarget(UUID agentID, Scene scene, Vector3 pos,
@@ -211,10 +204,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                     ScenePresence sp;
                     if (scene.TryGetScenePresence(agentID, out sp))
                     {
-                        m_log.DebugFormat(
-                                "[NPC MODULE]: Moving {0} to {1} in {2}, noFly {3}, landAtTarget {4}",
-                                sp.Name, pos, scene.RegionInfo.RegionName,
-                                noFly, landAtTarget);
+//                        m_log.DebugFormat(
+//                            "[NPC MODULE]: Moving {0} to {1} in {2}, noFly {3}, landAtTarget {4}",
+//                            sp.Name, pos, scene.RegionInfo.RegionName, noFly, landAtTarget);
 
                         sp.MoveToTarget(pos, noFly, landAtTarget);
                         sp.SetAlwaysRun = running;
@@ -385,10 +377,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                     */
                     scene.RemoveClient(agentID, false);
                     m_avatars.Remove(agentID);
-                    /*
-                    m_log.DebugFormat("[NPC MODULE]: Removed NPC {0} {1}",
-                            agentID, av.Name);
-                    */
+
+//                    m_log.DebugFormat("[NPC MODULE]: Removed NPC {0} {1}", agentID, av.Name);
                     return true;
                 }
             }
@@ -405,9 +395,15 @@ namespace OpenSim.Region.OptionalModules.World.NPC
             {
                 NPCAvatar av;
                 if (m_avatars.TryGetValue(npcID, out av))
+                {
+                    if (npcID == callerID)
+                        return true;
                     return CheckPermissions(av, callerID);
+                }
                 else
+                {
                     return false;
+                }
             }
         }
 
@@ -419,8 +415,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         /// <returns>true if they do, false if they don't.</returns>
         private bool CheckPermissions(NPCAvatar av, UUID callerID)
         {
-            return callerID == UUID.Zero || av.OwnerID == UUID.Zero ||
-                    av.OwnerID == callerID;
+            return callerID == UUID.Zero || av.OwnerID == UUID.Zero || av.OwnerID == callerID || av.AgentId == callerID;
         }
     }
 }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
index bf23040..34362af 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
             // ScenePresence.SendInitialData() to reset our entire appearance.
             m_scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId));
 
-            m_afMod.SetAppearance(sp, originalTe, null);
+            m_afMod.SetAppearance(sp, originalTe, null, new WearableCacheItem[0] );
 
             UUID npcId = m_npcMod.CreateNPC("John", "Smith", new Vector3(128, 128, 30), UUID.Zero, true, m_scene, sp.Appearance);
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index 15747c9..096b300 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -632,8 +632,10 @@ public sealed class BSShapeCollection : IDisposable
         else
         {
             IMesh meshData = PhysicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod, 
+                                        true,
                                         false,  // say it is not physical so a bounding box is not built
-                                        false   // do not cache the mesh and do not use previously built versions
+                                        false,  // do not cache the mesh and do not use previously built versions
+                                        false   // It's NOT for ODE
                                         );
 
             if (meshData != null)
@@ -740,7 +742,7 @@ public sealed class BSShapeCollection : IDisposable
         {
             // Build a new hull in the physical world
             // Pass true for physicalness as this creates some sort of bounding box which we don't need
-            IMesh meshData = PhysicsScene.mesher.CreateMesh(objName, pbs, size, lod, true, false);
+            IMesh meshData = PhysicsScene.mesher.CreateMesh(objName, pbs, size, lod, true, false, false, false);
             if (meshData != null)
             {
 
diff --git a/OpenSim/Region/Physics/ChOdePlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/ChOdePlugin/AssemblyInfo.cs
new file mode 100644
index 0000000..d65929a
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/AssemblyInfo.cs
@@ -0,0 +1,58 @@
+/*
+ * 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.Reflection;
+using System.Runtime.InteropServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly : AssemblyTitle("OdePlugin")]
+[assembly : AssemblyDescription("")]
+[assembly : AssemblyConfiguration("")]
+[assembly : AssemblyCompany("http://opensimulator.org")]
+[assembly : AssemblyProduct("OdePlugin")]
+[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2009")]
+[assembly : AssemblyTrademark("")]
+[assembly : AssemblyCulture("")]
+
+// This sets the default COM visibility of types in the assembly to invisible.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+
+[assembly : ComVisible(false)]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// 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.6.5.*")]
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
new file mode 100644
index 0000000..ec717d7
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
@@ -0,0 +1,1467 @@
+/*
+ * 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.Reflection;
+using OpenMetaverse;
+using Ode.NET;
+using OpenSim.Framework;
+using OpenSim.Region.Physics.Manager;
+using log4net;
+
+namespace OpenSim.Region.Physics.OdePlugin
+{
+    /// <summary>
+    /// Various properties that ODE uses for AMotors but isn't exposed in ODE.NET so we must define them ourselves.
+    /// </summary>
+
+    public enum dParam : int
+    {
+        LowStop = 0,
+        HiStop = 1,
+        Vel = 2,
+        FMax = 3,
+        FudgeFactor = 4,
+        Bounce = 5,
+        CFM = 6,
+        StopERP = 7,
+        StopCFM = 8,
+        LoStop2 = 256,
+        HiStop2 = 257,
+        Vel2 = 258,
+        FMax2 = 259,
+        StopERP2 = 7 + 256,
+        StopCFM2 = 8 + 256,
+        LoStop3 = 512,
+        HiStop3 = 513,
+        Vel3 = 514,
+        FMax3 = 515,
+        StopERP3 = 7 + 512,
+        StopCFM3 = 8 + 512
+    }
+    public class OdeCharacter : PhysicsActor
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private Vector3 _position;
+        private d.Vector3 _zeroPosition;
+        // private d.Matrix3 m_StandUpRotation;
+        private bool _zeroFlag = false;
+        private bool m_lastUpdateSent = false;
+        private Vector3 _velocity;
+        private Vector3 _target_velocity;
+        private Vector3 _acceleration;
+        private Vector3 m_rotationalVelocity;
+        private float m_mass = 80f;
+        public float m_density = 60f;
+        private bool m_pidControllerActive = true;
+        public float PID_D = 800.0f;
+        public float PID_P = 900.0f;
+        //private static float POSTURE_SERVO = 10000.0f;
+        public float CAPSULE_RADIUS = 0.37f;
+        public float CAPSULE_LENGTH = 2.140599f;
+        public float m_tensor = 3800000f;
+        public float heightFudgeFactor = 0.52f;
+        public float walkDivisor = 1.3f;
+        public float runDivisor = 0.8f;
+        private bool flying = false;
+        private bool jumping = false;       // add for jumping
+        private bool m_iscolliding = false;
+        private bool m_iscollidingGround = false;
+        private bool m_wascolliding = false;
+        private bool m_wascollidingGround = false;
+        private bool m_iscollidingObj = false;
+        private bool m_alwaysRun = false;
+        private bool m_hackSentFall = false;
+        private bool m_hackSentFly = false;
+        private int m_requestedUpdateFrequency = 0;
+        private Vector3 m_taintPosition = Vector3.Zero;
+        public uint m_localID = 0;
+        public bool m_returnCollisions = false;
+        // taints and their non-tainted counterparts
+        public bool m_isPhysical = false; // the current physical status
+        public bool m_tainted_isPhysical = false; // set when the physical status is tainted (false=not existing in physics engine, true=existing)
+        public float MinimumGroundFlightOffset = 3f;
+
+        private float m_tainted_CAPSULE_LENGTH; // set when the capsule length changes. 
+        private float m_tiltMagnitudeWhenProjectedOnXYPlane = 0.1131371f; // used to introduce a fixed tilt because a straight-up capsule falls through terrain, probably a bug in terrain collider
+
+
+        private float m_buoyancy = 0f;
+
+        // private CollisionLocker ode;
+
+        private string m_name = String.Empty;
+
+        private bool[] m_colliderarr = new bool[11];
+        private bool[] m_colliderGroundarr = new bool[11];
+
+        // Default we're a Character
+        private CollisionCategories m_collisionCategories = (CollisionCategories.Character);
+
+        // Default, Collide with Other Geometries, spaces, bodies and characters.
+        private CollisionCategories m_collisionFlags = (CollisionCategories.Geom
+                                                        | CollisionCategories.Space
+                                                        | CollisionCategories.Body
+                                                        | CollisionCategories.Character
+                                                        | CollisionCategories.Land);
+        public IntPtr Body = IntPtr.Zero;
+        private OdeScene _parent_scene;
+        public IntPtr Shell = IntPtr.Zero;
+        public IntPtr Amotor = IntPtr.Zero;
+        public d.Mass ShellMass;
+        public bool collidelock = false;
+
+        public int m_eventsubscription = 0;
+        private CollisionEventUpdate CollisionEventsThisFrame = new CollisionEventUpdate();
+
+        private Vector3 m_taintMomentum = Vector3.Zero;
+        private bool m_haveTaintMomentum = false;
+
+
+        // unique UUID of this character object
+        public UUID m_uuid;
+        public bool bad = false;
+        private Object m_syncRoot = new Object();
+        
+        public OdeCharacter(String avName, OdeScene parent_scene, Vector3 pos, CollisionLocker dode, Vector3 size, float pid_d, float pid_p, float capsule_radius, float tensor, float density, float height_fudge_factor, float walk_divisor, float rundivisor)
+        {
+            m_uuid = UUID.Random();
+
+            if (pos.IsFinite())
+            {
+                if (pos.Z > 9999999f)
+                {
+                    pos.Z = parent_scene.GetTerrainHeightAtXY(127, 127) + 5;
+                }
+                if (pos.Z < -90000f)
+                {
+                    pos.Z = parent_scene.GetTerrainHeightAtXY(127, 127) + 5;
+                }
+                _position = pos;
+                m_taintPosition.X = pos.X;
+                m_taintPosition.Y = pos.Y;
+                m_taintPosition.Z = pos.Z;
+            }
+            else
+            {
+                _position = new Vector3(((float)_parent_scene.WorldExtents.X * 0.5f), ((float)_parent_scene.WorldExtents.Y * 0.5f), parent_scene.GetTerrainHeightAtXY(128f, 128f) + 10f);
+                m_taintPosition.X = _position.X;
+                m_taintPosition.Y = _position.Y;
+                m_taintPosition.Z = _position.Z;
+                m_log.Warn("[PHYSICS]: Got NaN Position on Character Create");
+            }
+
+            _parent_scene = parent_scene;
+
+            PID_D = pid_d;
+            PID_P = pid_p;
+            CAPSULE_RADIUS = capsule_radius;
+            m_tensor = tensor;
+            m_density = density;
+            heightFudgeFactor = height_fudge_factor;
+            walkDivisor = walk_divisor;
+            runDivisor = rundivisor;
+
+            // m_StandUpRotation =
+            //     new d.Matrix3(0.5f, 0.7071068f, 0.5f, -0.7071068f, 0f, 0.7071068f, 0.5f, -0.7071068f,
+            //                   0.5f);
+
+            for (int i = 0; i < 11; i++)
+            {
+                m_colliderarr[i] = false;
+            }
+            CAPSULE_LENGTH = (size.Z * 1.15f) - CAPSULE_RADIUS * 2.0f;
+            //m_log.Info("[SIZE]: " + CAPSULE_LENGTH.ToString());
+            m_tainted_CAPSULE_LENGTH = CAPSULE_LENGTH;
+
+            m_isPhysical = false; // current status: no ODE information exists
+            m_tainted_isPhysical = true; // new tainted status: need to create ODE information
+
+            _parent_scene.AddPhysicsActorTaint(this);
+            
+            m_name = avName;
+        }
+
+        public override int PhysicsActorType
+        {
+            get { return (int) ActorTypes.Agent; }
+            set { return; }
+        }
+
+        /// <summary>
+        /// If this is set, the avatar will move faster
+        /// </summary>
+        public override bool SetAlwaysRun
+        {
+            get { return m_alwaysRun; }
+            set { m_alwaysRun = value; }
+        }
+
+        public override uint LocalID
+        {
+            set { m_localID = value; }
+        }
+
+        public override bool Grabbed
+        {
+            set { return; }
+        }
+
+        public override bool Selected
+        {
+//            set { return; }
+            set { jumping = value; }    // add for jumping flag
+        }
+
+        public override float Buoyancy
+        {
+            get { return m_buoyancy; }
+            set { m_buoyancy = value; }
+        }
+
+        public override bool FloatOnWater
+        {
+            set { return; }
+        }
+
+        public override bool IsPhysical
+        {
+            get { return false; }
+            set { return; }
+        }
+
+        public override bool ThrottleUpdates
+        {
+            get { return false; }
+            set { return; }
+        }
+
+        public override bool Flying
+        {
+            get { return flying; }
+            set { flying = value; }
+        }
+
+        /// <summary>
+        /// Returns if the avatar is colliding in general.
+        /// This includes the ground and objects and avatar.
+        /// </summary>
+        public override bool IsColliding
+        {
+//#@            get { return m_iscolliding; }
+            get {  //##
+//Console.WriteLine(">>>>>>>>>>>> IC get = {0}", m_iscolliding);  //##
+                return m_iscolliding; }  //##
+            set
+            {
+                int i;
+                int truecount = 0;
+                int falsecount = 0;
+
+                if (m_colliderarr.Length >= 10)
+                {
+                    for (i = 0; i < 10; i++)
+                    {
+                        m_colliderarr[i] = m_colliderarr[i + 1];
+                    }
+                }
+                m_colliderarr[10] = value;
+
+                for (i = 0; i < 11; i++)
+                {
+                    if (m_colliderarr[i])
+                    {
+                        truecount++;
+                    }
+                    else
+                    {
+                        falsecount++;
+                    }
+                }
+
+                // Equal truecounts and false counts means we're colliding with something.
+
+                if (falsecount > 1.2*truecount)
+                {
+                    m_iscolliding = false;
+                }
+                else
+                {
+                    m_iscolliding = true;
+                }
+// ## Console.WriteLine("IC SET = {0}   t{1}  f{2}  i {3}", value, truecount, falsecount, m_iscolliding);
+                if (m_wascolliding != m_iscolliding)
+                {
+                    //base.SendCollisionUpdate(new CollisionEventUpdate());
+                }
+                m_wascolliding = m_iscolliding;
+            }
+        }
+
+        /// <summary>
+        /// Returns if an avatar is colliding with the ground
+        /// </summary>
+        public override bool CollidingGround
+        {
+            get { return m_iscollidingGround; }
+            set
+            {
+                // Collisions against the ground are not really reliable
+                // So, to get a consistant value we have to average the current result over time
+                // Currently we use 1 second = 10 calls to this.
+                int i;
+                int truecount = 0;
+                int falsecount = 0;
+
+                if (m_colliderGroundarr.Length >= 10)
+                {
+                    for (i = 0; i < 10; i++)
+                    {
+                        m_colliderGroundarr[i] = m_colliderGroundarr[i + 1];
+                    }
+                }
+                m_colliderGroundarr[10] = value;
+
+                for (i = 0; i < 11; i++)
+                {
+                    if (m_colliderGroundarr[i])
+                    {
+                        truecount++;
+                    }
+                    else
+                    {
+                        falsecount++;
+                    }
+                }
+
+                // Equal truecounts and false counts means we're colliding with something.
+
+                if (falsecount > 1.2*truecount)
+                {
+                    m_iscollidingGround = false;
+                }
+                else
+                {
+                    m_iscollidingGround = true;
+                }
+                if (m_wascollidingGround != m_iscollidingGround)
+                {
+                    //base.SendCollisionUpdate(new CollisionEventUpdate());
+                }
+                m_wascollidingGround = m_iscollidingGround;
+            }
+        }
+
+        /// <summary>
+        /// Returns if the avatar is colliding with an object
+        /// </summary>
+        public override bool CollidingObj
+        {
+            get { return m_iscollidingObj; }
+            set
+            {
+                m_iscollidingObj = value;
+                if (value)
+                    m_pidControllerActive = false;
+                else
+                    m_pidControllerActive = true;
+            }
+        }
+
+        /// <summary>
+        /// turn the PID controller on or off.
+        /// The PID Controller will turn on all by itself in many situations
+        /// </summary>
+        /// <param name="status"></param>
+        public void SetPidStatus(bool status)
+        {
+            m_pidControllerActive = status;
+        }
+
+        public override bool Stopped
+        {
+            get { return _zeroFlag; }
+        }
+
+        /// <summary>
+        /// This 'puts' an avatar somewhere in the physics space.
+        /// Not really a good choice unless you 'know' it's a good
+        /// spot otherwise you're likely to orbit the avatar.
+        /// </summary>
+        public override Vector3 Position
+        {
+            get { return _position; }
+            set
+            {
+                if (Body == IntPtr.Zero || Shell == IntPtr.Zero)
+                {
+                    if (value.IsFinite())
+                    {
+                        if (value.Z > 9999999f)
+                        {
+                            value.Z = _parent_scene.GetTerrainHeightAtXY(127, 127) + 5;
+                        }
+                        if (value.Z < -90000f)
+                        {
+                            value.Z = _parent_scene.GetTerrainHeightAtXY(127, 127) + 5;
+                        }
+
+                        _position.X = value.X;
+                        _position.Y = value.Y;
+                        _position.Z = value.Z;
+
+                        m_taintPosition.X = value.X;
+                        m_taintPosition.Y = value.Y;
+                        m_taintPosition.Z = value.Z;
+                        _parent_scene.AddPhysicsActorTaint(this);
+                    }
+                    else
+                    {
+                        m_log.Warn("[PHYSICS]: Got a NaN Position from Scene on a Character");
+                    }
+                }
+            }
+        }
+
+        public override Vector3 RotationalVelocity
+        {
+            get { return m_rotationalVelocity; }
+            set { m_rotationalVelocity = value; }
+        }
+
+        /// <summary>
+        /// This property sets the height of the avatar only.  We use the height to make sure the avatar stands up straight
+        /// and use it to offset landings properly
+        /// </summary>
+        public override Vector3 Size
+        {
+            get { return new Vector3(CAPSULE_RADIUS * 2, CAPSULE_RADIUS * 2, CAPSULE_LENGTH); }
+            set
+            {
+                if (value.IsFinite())
+                {
+                    m_pidControllerActive = true;
+
+                    Vector3 SetSize = value;
+                    m_tainted_CAPSULE_LENGTH = (SetSize.Z*1.15f) - CAPSULE_RADIUS*2.0f;
+                    //m_log.Info("[SIZE]: " + CAPSULE_LENGTH.ToString());
+
+                    Velocity = Vector3.Zero;
+                                        m_taintPosition = _position; // update the stale taint position
+                    _parent_scene.AddPhysicsActorTaint(this);
+                }
+                else
+                {
+                    m_log.Warn("[PHYSICS]: Got a NaN Size from Scene on a Character");
+                }
+            }
+        }
+
+        private void AlignAvatarTiltWithCurrentDirectionOfMovement(Vector3 movementVector)
+        {
+            movementVector.Z = 0f;
+            float magnitude = (float)Math.Sqrt((double)(movementVector.X * movementVector.X + movementVector.Y * movementVector.Y));
+            if (magnitude < 0.1f) return;
+
+            // normalize the velocity vector
+            float invMagnitude = 1.0f / magnitude;
+            movementVector.X *= invMagnitude;
+            movementVector.Y *= invMagnitude;
+
+            // if we change the capsule heading too often, the capsule can fall down
+            // therefore we snap movement vector to just 1 of 4 predefined directions (ne, nw, se, sw),
+            // meaning only 4 possible capsule tilt orientations
+            if (movementVector.X > 0)
+            {
+                // east
+                if (movementVector.Y > 0)
+                {
+                    // northeast
+                    movementVector.X = (float)Math.Sqrt(2.0);
+                    movementVector.Y = (float)Math.Sqrt(2.0);
+                }
+                else
+                {
+                    // southeast
+                    movementVector.X = (float)Math.Sqrt(2.0);
+                    movementVector.Y = -(float)Math.Sqrt(2.0);
+                }
+            }
+            else
+            {
+                // west
+                if (movementVector.Y > 0)
+                {
+                    // northwest
+                    movementVector.X = -(float)Math.Sqrt(2.0);
+                    movementVector.Y = (float)Math.Sqrt(2.0);
+                }
+                else
+                {
+                    // southwest
+                    movementVector.X = -(float)Math.Sqrt(2.0);
+                    movementVector.Y = -(float)Math.Sqrt(2.0);
+                }
+            }
+
+
+            // movementVector.Z is zero
+
+            // calculate tilt components based on desired amount of tilt and current (snapped) heading.
+            // the "-" sign is to force the tilt to be OPPOSITE the direction of movement.
+            float xTiltComponent = -movementVector.X * m_tiltMagnitudeWhenProjectedOnXYPlane;
+            float yTiltComponent = -movementVector.Y * m_tiltMagnitudeWhenProjectedOnXYPlane;
+
+            //m_log.Debug("[PHYSICS] changing avatar tilt");
+            d.JointSetAMotorParam(Amotor, (int)dParam.LowStop, xTiltComponent);
+            d.JointSetAMotorParam(Amotor, (int)dParam.HiStop, xTiltComponent); // must be same as lowstop, else a different, spurious tilt is introduced
+            d.JointSetAMotorParam(Amotor, (int)dParam.LoStop2, yTiltComponent);
+            d.JointSetAMotorParam(Amotor, (int)dParam.HiStop2, yTiltComponent); // same as lowstop
+            d.JointSetAMotorParam(Amotor, (int)dParam.LoStop3, 0f);
+            d.JointSetAMotorParam(Amotor, (int)dParam.HiStop3, 0f); // same as lowstop
+        }
+
+        /// <summary>
+        /// This creates the Avatar's physical Surrogate at the position supplied
+        /// </summary>
+        /// <param name="npositionX"></param>
+        /// <param name="npositionY"></param>
+        /// <param name="npositionZ"></param>
+
+        // WARNING: This MUST NOT be called outside of ProcessTaints, else we can have unsynchronized access
+        // to ODE internals. ProcessTaints is called from within thread-locked Simulate(), so it is the only 
+        // place that is safe to call this routine AvatarGeomAndBodyCreation.
+        private void AvatarGeomAndBodyCreation(float npositionX, float npositionY, float npositionZ, float tensor)
+        {
+            //CAPSULE_LENGTH = -5;
+            //CAPSULE_RADIUS = -5;
+            int dAMotorEuler = 1;
+            _parent_scene.waitForSpaceUnlock(_parent_scene.space);
+            if (CAPSULE_LENGTH <= 0)
+            {
+                m_log.Warn("[PHYSICS]: The capsule size you specified in opensim.ini is invalid!  Setting it to the smallest possible size!");
+                CAPSULE_LENGTH = 0.01f;
+
+            }
+
+            if (CAPSULE_RADIUS <= 0)
+            {
+                m_log.Warn("[PHYSICS]: The capsule size you specified in opensim.ini is invalid!  Setting it to the smallest possible size!");
+                CAPSULE_RADIUS = 0.01f;
+
+            }
+
+            if(Shell != IntPtr.Zero)
+            {
+                try
+                {
+                    d.GeomDestroy(Shell);
+                }
+                catch (System.AccessViolationException)
+                {
+                    m_log.Error("[PHYSICS]: PrimGeom dead");
+                }
+                // Remove any old entries
+//string tShell;
+//_parent_scene.geom_name_map.TryGetValue(Shell, out tShell);
+//Console.WriteLine("**** Remove {0}", tShell);
+                if(_parent_scene.geom_name_map.ContainsKey(Shell)) _parent_scene.geom_name_map.Remove(Shell);
+                if(_parent_scene.actor_name_map.ContainsKey(Shell)) _parent_scene.actor_name_map.Remove(Shell);
+            }
+
+            Shell = d.CreateCapsule(_parent_scene.space, CAPSULE_RADIUS, CAPSULE_LENGTH);
+            _parent_scene.geom_name_map[Shell] = m_name;
+            _parent_scene.actor_name_map[Shell] = (PhysicsActor)this;
+//Console.WriteLine("**** Create {2}    Dicts: actor={0}   name={1}  height={3} rad={4}", _parent_scene.actor_name_map.Count, _parent_scene.geom_name_map.Count, m_name, CAPSULE_LENGTH, CAPSULE_RADIUS);
+
+            d.GeomSetCategoryBits(Shell, (int)m_collisionCategories);
+            d.GeomSetCollideBits(Shell, (int)m_collisionFlags);
+
+            d.MassSetCapsuleTotal(out ShellMass, m_mass, 2, CAPSULE_RADIUS, CAPSULE_LENGTH);
+            Body = d.BodyCreate(_parent_scene.world);
+            d.BodySetPosition(Body, npositionX, npositionY, npositionZ);
+            
+            _position.X = npositionX;
+            _position.Y = npositionY;
+            _position.Z = npositionZ;
+
+            
+            m_taintPosition.X = npositionX;
+            m_taintPosition.Y = npositionY;
+            m_taintPosition.Z = npositionZ;
+
+            d.BodySetMass(Body, ref ShellMass);
+            d.Matrix3 m_caprot;
+            // 90 Stand up on the cap of the capped cyllinder
+            if (_parent_scene.IsAvCapsuleTilted)
+            {
+                d.RFromAxisAndAngle(out m_caprot, 1, 0, 1, (float)(Math.PI / 2));
+            }
+            else
+            {
+                d.RFromAxisAndAngle(out m_caprot, 0, 0, 1, (float)(Math.PI / 2));
+            }
+
+
+            d.GeomSetRotation(Shell, ref m_caprot);
+            d.BodySetRotation(Body, ref m_caprot);
+
+            d.GeomSetBody(Shell, Body);
+
+
+            // The purpose of the AMotor here is to keep the avatar's physical
+            // surrogate from rotating while moving
+            Amotor = d.JointCreateAMotor(_parent_scene.world, IntPtr.Zero);
+            d.JointAttach(Amotor, Body, IntPtr.Zero);
+            d.JointSetAMotorMode(Amotor, dAMotorEuler);
+            d.JointSetAMotorNumAxes(Amotor, 3);
+            d.JointSetAMotorAxis(Amotor, 0, 0, 1, 0, 0);
+            d.JointSetAMotorAxis(Amotor, 1, 0, 0, 1, 0);
+            d.JointSetAMotorAxis(Amotor, 2, 0, 0, 0, 1);
+            d.JointSetAMotorAngle(Amotor, 0, 0);
+            d.JointSetAMotorAngle(Amotor, 1, 0);
+            d.JointSetAMotorAngle(Amotor, 2, 0);
+
+            // These lowstops and high stops are effectively (no wiggle room)
+            if (_parent_scene.IsAvCapsuleTilted)
+            {
+                d.JointSetAMotorParam(Amotor, (int)dParam.LowStop, -0.000000000001f);
+                d.JointSetAMotorParam(Amotor, (int)dParam.LoStop3, -0.000000000001f);
+                d.JointSetAMotorParam(Amotor, (int)dParam.LoStop2, -0.000000000001f);
+                d.JointSetAMotorParam(Amotor, (int)dParam.HiStop, 0.000000000001f);
+                d.JointSetAMotorParam(Amotor, (int)dParam.HiStop3, 0.000000000001f);
+                d.JointSetAMotorParam(Amotor, (int)dParam.HiStop2, 0.000000000001f);
+            }
+            else
+            {
+                #region Documentation of capsule motor LowStop and HighStop parameters
+                // Intentionally introduce some tilt into the capsule by setting
+                // the motor stops to small epsilon values. This small tilt prevents
+                // the capsule from falling into the terrain; a straight-up capsule
+                // (with -0..0 motor stops) falls into the terrain for reasons yet
+                // to be comprehended in their entirety.
+                #endregion
+                AlignAvatarTiltWithCurrentDirectionOfMovement(Vector3.Zero);
+                d.JointSetAMotorParam(Amotor, (int)dParam.LowStop, 0.08f);
+                d.JointSetAMotorParam(Amotor, (int)dParam.LoStop3, -0f);
+                d.JointSetAMotorParam(Amotor, (int)dParam.LoStop2, 0.08f);
+                d.JointSetAMotorParam(Amotor, (int)dParam.HiStop,  0.08f); // must be same as lowstop, else a different, spurious tilt is introduced
+                d.JointSetAMotorParam(Amotor, (int)dParam.HiStop3, 0f); // same as lowstop
+                d.JointSetAMotorParam(Amotor, (int)dParam.HiStop2, 0.08f); // same as lowstop
+            }
+
+            // Fudge factor is 1f by default, we're setting it to 0.  We don't want it to Fudge or the
+            // capped cyllinder will fall over
+            d.JointSetAMotorParam(Amotor, (int)dParam.FudgeFactor, 0f);
+            d.JointSetAMotorParam(Amotor, (int)dParam.FMax, tensor);
+
+            //d.Matrix3 bodyrotation = d.BodyGetRotation(Body);
+            //d.QfromR(
+            //d.Matrix3 checkrotation = new d.Matrix3(0.7071068,0.5, -0.7071068,
+            //
+            //m_log.Info("[PHYSICSAV]: Rotation: " + bodyrotation.M00 + " : " + bodyrotation.M01 + " : " + bodyrotation.M02 + " : " + bodyrotation.M10 + " : " + bodyrotation.M11 + " : " + bodyrotation.M12 + " : " + bodyrotation.M20 + " : " + bodyrotation.M21 + " : " + bodyrotation.M22);
+            //standupStraight();
+        }
+
+        //
+        /// <summary>
+        /// Uses the capped cyllinder volume formula to calculate the avatar's mass.
+        /// This may be used in calculations in the scene/scenepresence
+        /// </summary>
+        public override float Mass
+        {
+            get
+            {
+                float AVvolume = (float) (Math.PI*Math.Pow(CAPSULE_RADIUS, 2)*CAPSULE_LENGTH);
+                return m_density*AVvolume;
+            }
+        }
+        public override void link(PhysicsActor obj)
+        {
+
+        }
+
+        public override void delink()
+        {
+
+        }
+
+        public override void LockAngularMotion(Vector3 axis)
+        {
+
+        }
+
+//      This code is very useful. Written by DanX0r. We're just not using it right now.
+//      Commented out to prevent a warning.
+//
+//         private void standupStraight()
+//         {
+//             // The purpose of this routine here is to quickly stabilize the Body while it's popped up in the air.
+//             // The amotor needs a few seconds to stabilize so without it, the avatar shoots up sky high when you
+//             // change appearance and when you enter the simulator
+//             // After this routine is done, the amotor stabilizes much quicker
+//             d.Vector3 feet;
+//             d.Vector3 head;
+//             d.BodyGetRelPointPos(Body, 0.0f, 0.0f, -1.0f, out feet);
+//             d.BodyGetRelPointPos(Body, 0.0f, 0.0f, 1.0f, out head);
+//             float posture = head.Z - feet.Z;
+
+//             // restoring force proportional to lack of posture:
+//             float servo = (2.5f - posture) * POSTURE_SERVO;
+//             d.BodyAddForceAtRelPos(Body, 0.0f, 0.0f, servo, 0.0f, 0.0f, 1.0f);
+//             d.BodyAddForceAtRelPos(Body, 0.0f, 0.0f, -servo, 0.0f, 0.0f, -1.0f);
+//             //d.Matrix3 bodyrotation = d.BodyGetRotation(Body);
+//             //m_log.Info("[PHYSICSAV]: Rotation: " + bodyrotation.M00 + " : " + bodyrotation.M01 + " : " + bodyrotation.M02 + " : " + bodyrotation.M10 + " : " + bodyrotation.M11 + " : " + bodyrotation.M12 + " : " + bodyrotation.M20 + " : " + bodyrotation.M21 + " : " + bodyrotation.M22);
+//         }
+
+        public override Vector3 Force
+        {
+            get { return _target_velocity; }
+            set { return; }
+        }
+
+        public override int VehicleType
+        {
+            get { return 0; }
+            set { return; }
+        }
+
+        public override void VehicleFloatParam(int param, float value)
+        {
+
+        }
+
+        public override void VehicleVectorParam(int param, Vector3 value)
+        {
+
+        }
+
+        public override void VehicleRotationParam(int param, Quaternion rotation)
+        {
+
+        }
+        
+        public override void VehicleFlags(int flags, bool remove)
+        {
+        }
+
+        public override void SetVolumeDetect(int param)
+        {
+
+        }
+
+        public override Vector3 CenterOfMass
+        {
+            get { return Vector3.Zero; }
+        }
+
+        public override Vector3 GeometricCenter
+        {
+            get { return Vector3.Zero; }
+        }
+
+        public override PrimitiveBaseShape Shape
+        {
+            set { return; }
+        }
+
+        public override Vector3 Velocity
+        {
+            get {
+                // There's a problem with Vector3.Zero! Don't Use it Here!
+                if (_zeroFlag)
+                    return Vector3.Zero;
+                m_lastUpdateSent = false;
+                return _velocity;
+            }
+            set
+            {
+                if (value.IsFinite())
+                {
+                    _target_velocity = value;
+                    m_pidControllerActive = true;
+                }
+                else
+                {
+                    m_log.Warn("[PHYSICS]: Got a NaN velocity from Scene in a Character");
+                }
+            }
+        }
+
+        public override Vector3 Torque
+        {
+            get { return Vector3.Zero; }
+            set { return; }
+        }
+
+        public override float CollisionScore
+        {
+            get { return 0f; }
+            set { }
+        }
+
+        public override bool Kinematic
+        {
+            get { return false; }
+            set { }
+        }
+
+        public override Quaternion Orientation
+        {
+            get { return Quaternion.Identity; }
+            set {
+                //Matrix3 or = Orientation.ToRotationMatrix();
+                //d.Matrix3 ord = new d.Matrix3(or.m00, or.m10, or.m20, or.m01, or.m11, or.m21, or.m02, or.m12, or.m22);
+                //d.BodySetRotation(Body, ref ord);
+            }
+        }
+
+        public override Vector3 Acceleration
+        {
+            get { return _acceleration; }
+            set { _acceleration = value; }
+        }
+
+        public void SetAcceleration(Vector3 accel)
+        {
+            m_pidControllerActive = true;
+            _acceleration = accel;
+        }
+
+        /// <summary>
+        /// Adds the force supplied to the Target Velocity
+        /// The PID controller takes this target velocity and tries to make it a reality
+        /// </summary>
+        /// <param name="force"></param>
+        public override void AddForce(Vector3 force, bool pushforce)
+        {
+            if (force.IsFinite())
+            {
+                if (pushforce)
+                {
+                    m_pidControllerActive = false;
+                    force *= 100f;
+//Console.WriteLine("DF 1"); // ##
+                    if (!force.ApproxEquals(Vector3.Zero, 0.01f))
+                        doForce(force);
+                    // If uncommented, things get pushed off world
+                    //
+                    // m_log.Debug("Push!");
+                    // _target_velocity.X += force.X;
+                    // _target_velocity.Y += force.Y;
+                    // _target_velocity.Z += force.Z;
+                }
+                else
+                {
+                    m_pidControllerActive = true;
+                    _target_velocity.X += force.X;
+                    _target_velocity.Y += force.Y;
+                    _target_velocity.Z += force.Z;
+                }
+            }
+            else
+            {
+                m_log.Warn("[PHYSICS]: Got a NaN force applied to a Character");
+            }
+            //m_lastUpdateSent = false;
+        }
+
+        public override void AddAngularForce(Vector3 force, bool pushforce)
+        {
+
+        }
+
+        /// <summary>
+        /// After all of the forces add up with 'add force' we apply them with doForce
+        /// </summary>
+        /// <param name="force"></param>
+        public void doForce(Vector3 force)
+        {
+            if (!collidelock)
+            {
+                d.BodyAddForce(Body, force.X, force.Y, force.Z);
+                //d.BodySetRotation(Body, ref m_StandUpRotation);
+                //standupStraight();
+           d.Vector3 vel = d.BodyGetLinearVel(Body);  //##
+//Console.WriteLine("AvVel <{0},{1},{2}>", vel.X, vel.Y, vel.Z); //##
+            }
+        }
+
+        public override void SetMomentum(Vector3 momentum)
+        {
+            if (momentum.IsFinite())
+            {
+                m_taintMomentum = momentum;
+                m_haveTaintMomentum = true;
+                _parent_scene.AddPhysicsActorTaint(this);
+            }
+            else
+                m_log.Warn("[PHYSICS] !isFinite momentum");
+        }
+
+
+        /// <summary>
+        /// Called from Simulate
+        /// This is the avatar's movement control + PID Controller
+        /// </summary>
+        /// <param name="timeStep"></param>
+        public void Move(float timeStep, List<OdeCharacter> defects)
+        {
+            //  no lock; for now it's only called from within Simulate()
+
+            // If the PID Controller isn't active then we set our force
+            // calculating base velocity to the current position
+                
+            if (Body == IntPtr.Zero)
+                return;
+
+            if (m_pidControllerActive == false)
+            {
+                _zeroPosition = d.BodyGetPosition(Body);
+            }
+            //PidStatus = true;
+
+            d.Vector3 localpos = d.BodyGetPosition(Body);
+            Vector3 localPos = new Vector3(localpos.X, localpos.Y, localpos.Z);
+            
+            if (!localPos.IsFinite())
+            {
+
+                m_log.Warn("[PHYSICS]: Avatar Position is non-finite!");
+                defects.Add(this);
+                // _parent_scene.RemoveCharacter(this);
+
+                // destroy avatar capsule and related ODE data
+                if (Amotor != IntPtr.Zero)
+                {
+                    // Kill the Amotor
+                    d.JointDestroy(Amotor);
+                    Amotor = IntPtr.Zero;
+                }
+
+                //kill the Geometry
+                _parent_scene.waitForSpaceUnlock(_parent_scene.space);
+
+                if (Body != IntPtr.Zero)
+                {
+                    //kill the body
+                    d.BodyDestroy(Body);
+
+                    Body = IntPtr.Zero;
+                }
+
+                    if(Shell != IntPtr.Zero)
+                {
+                    try
+                    {
+                        d.GeomDestroy(Shell);
+                    }
+                    catch (System.AccessViolationException)
+                    {
+                        m_log.Error("[PHYSICS]: PrimGeom dead");
+                    }
+                    // Remove any old entries
+//string tShell;
+//_parent_scene.geom_name_map.TryGetValue(Shell, out tShell);
+//Console.WriteLine("**** Remove {0}", tShell);
+
+                    if(_parent_scene.geom_name_map.ContainsKey(Shell)) _parent_scene.geom_name_map.Remove(Shell);
+                    if(_parent_scene.actor_name_map.ContainsKey(Shell)) _parent_scene.actor_name_map.Remove(Shell);
+                    Shell = IntPtr.Zero;
+                }
+
+                return;
+            }
+
+            Vector3 vec = Vector3.Zero;
+            d.Vector3 vel = d.BodyGetLinearVel(Body);
+
+            float movementdivisor = 1f;
+
+            if (!m_alwaysRun)
+            {
+                movementdivisor = walkDivisor;
+            }
+            else
+            {
+                movementdivisor = runDivisor;
+            }
+
+            //  if velocity is zero, use position control; otherwise, velocity control
+            if (_target_velocity.X == 0.0f && _target_velocity.Y == 0.0f && _target_velocity.Z == 0.0f && m_iscolliding)
+            {
+                //  keep track of where we stopped.  No more slippin' & slidin'
+                if (!_zeroFlag)
+                {
+                    _zeroFlag = true;
+                    _zeroPosition = d.BodyGetPosition(Body);
+                }
+                if (m_pidControllerActive)
+                {
+                    // We only want to deactivate the PID Controller if we think we want to have our surrogate
+                    // react to the physics scene by moving it's position.
+                    // Avatar to Avatar collisions
+                    // Prim to avatar collisions
+
+                    d.Vector3 pos = d.BodyGetPosition(Body);
+                    float errX = _zeroPosition.X - pos.X;
+                    float errY = _zeroPosition.Y - pos.Y;
+                    if( (Math.Abs(errX) > 0.1f) || (Math.Abs(errY) > 0.1f) )
+                    {
+                        vec.X = (_target_velocity.X - vel.X) * (PID_D) + (errX) * (PID_P * 2);
+                        vec.Y = (_target_velocity.Y - vel.Y) * (PID_D) + (errY) * (PID_P * 2);
+                    }
+                    else
+                    {   // close, jump to lateral destination
+                        d.BodySetPosition(Body, _zeroPosition.X, _zeroPosition.Y, pos.Z);
+                    }
+//                    if (flying)
+                    if (flying || jumping)  // add for jumping
+                    {
+                        vec.Z = (_target_velocity.Z - vel.Z) * (PID_D) + (_zeroPosition.Z - pos.Z) * PID_P;
+                    }
+                }
+                //PidStatus = true;
+            }
+            else
+            {
+                m_pidControllerActive = true;
+                _zeroFlag = false;
+                if (m_iscolliding && !flying)
+                {
+                    // We're standing on something
+                    vec.X = ((_target_velocity.X / movementdivisor) - vel.X) * (PID_D);
+                    vec.Y = ((_target_velocity.Y / movementdivisor) - vel.Y) * (PID_D);
+                }
+                else if (m_iscolliding && flying)
+                {
+                    // We're flying and colliding with something
+                    vec.X = ((_target_velocity.X/movementdivisor) - vel.X)*(PID_D / 16);
+                    vec.Y = ((_target_velocity.Y/movementdivisor) - vel.Y)*(PID_D / 16);
+                }
+                else if (!m_iscolliding && flying)
+                {
+                    // we're in mid air suspended
+                    vec.X = ((_target_velocity.X / movementdivisor) - vel.X) * (PID_D/6);
+                    vec.Y = ((_target_velocity.Y / movementdivisor) - vel.Y) * (PID_D/6);
+                }
+
+                if (m_iscolliding && !flying && _target_velocity.Z > 0.0f)
+                {
+                    // We're colliding with something and we're not flying but we're moving
+                    // This means we're walking or running.
+                    d.Vector3 pos = d.BodyGetPosition(Body);
+                    vec.Z = (_target_velocity.Z - vel.Z)*PID_D + (_zeroPosition.Z - pos.Z)*PID_P;
+                    if (_target_velocity.X > 0)
+                    {
+                        vec.X = ((_target_velocity.X - vel.X)/1.2f)*PID_D;
+                    }
+                    if (_target_velocity.Y > 0)
+                    {
+                        vec.Y = ((_target_velocity.Y - vel.Y)/1.2f)*PID_D;
+                    }
+                }
+                else if (!m_iscolliding && !flying)
+                {
+                    // we're not colliding and we're not flying so that means we're falling!
+                    // m_iscolliding includes collisions with the ground.
+
+                    // d.Vector3 pos = d.BodyGetPosition(Body);
+                    if (Math.Abs(_target_velocity.X) > 0)
+                    {
+                        vec.X = ((_target_velocity.X - vel.X)/1.2f)*PID_D;
+                    }
+                    if (Math.Abs(_target_velocity.Y) > 0)
+                    {
+                        vec.Y = ((_target_velocity.Y - vel.Y)/1.2f)*PID_D;
+                    }
+                }
+
+                if (flying)
+                {
+                    vec.Z = (_target_velocity.Z - vel.Z) * (PID_D);
+                }
+            }
+            if (flying)
+            {
+                vec.Z += ((-1 * _parent_scene.gravityz)*m_mass);
+
+                //Added for auto fly height. Kitto Flora
+                //d.Vector3 pos = d.BodyGetPosition(Body);
+                float target_altitude = _parent_scene.GetTerrainHeightAtXY(_position.X, _position.Y) + MinimumGroundFlightOffset;
+                
+                if (_position.Z < target_altitude)
+                {
+                    vec.Z += (target_altitude - _position.Z) * PID_P * 5.0f;
+                }
+                // end add Kitto Flora
+            }
+
+            if (vel.X * vel.X + vel.Y * vel.Y + vel.Z * vel.Z > 2500.0f) // 50ms apply breaks
+            {
+                float breakfactor = 0.16f * m_mass; // will give aprox 60m/s terminal velocity at free fall
+                vec.X -= breakfactor * vel.X;
+                vec.Y -= breakfactor * vel.Y;
+                vec.Z -= breakfactor * vel.Z;
+            }
+
+            if (vec.IsFinite())
+            {
+                if (vec.LengthSquared() > 0.0004f)     // 0.01 allows 0.002 !!
+                {
+//Console.WriteLine("DF 2"); // ##
+
+                        doForce(vec);
+                        if (!_zeroFlag)
+                        {
+//                        AlignAvatarTiltWithCurrentDirectionOfMovement(vec);
+                        }
+                    }
+            }
+            else
+            {
+                m_log.Warn("[PHYSICS]: Got a NaN force vector in Move()");
+                m_log.Warn("[PHYSICS]: Avatar Position is non-finite!");
+                defects.Add(this);
+                // _parent_scene.RemoveCharacter(this);
+                // destroy avatar capsule and related ODE data
+                if (Amotor != IntPtr.Zero)
+                {
+                    // Kill the Amotor
+                    d.JointDestroy(Amotor);
+                    Amotor = IntPtr.Zero;
+                }
+                //kill the Geometry
+                _parent_scene.waitForSpaceUnlock(_parent_scene.space);
+
+                if (Body != IntPtr.Zero)
+                {
+                    //kill the body
+                    d.BodyDestroy(Body);
+
+                    Body = IntPtr.Zero;
+                }
+    
+                    if(Shell != IntPtr.Zero)
+                {
+                    try
+                    {
+                        d.GeomDestroy(Shell);
+                    }
+                    catch (System.AccessViolationException)
+                    {
+                        m_log.Error("[PHYSICS]: PrimGeom dead");
+                    }
+                    // Remove any old entries
+//string tShell;
+//_parent_scene.geom_name_map.TryGetValue(Shell, out tShell);
+//Console.WriteLine("**** Remove {0}", tShell);
+
+                    if(_parent_scene.geom_name_map.ContainsKey(Shell)) _parent_scene.geom_name_map.Remove(Shell);
+                    if(_parent_scene.actor_name_map.ContainsKey(Shell)) _parent_scene.actor_name_map.Remove(Shell);
+                    Shell = IntPtr.Zero;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Updates the reported position and velocity.  This essentially sends the data up to ScenePresence.
+        /// </summary>
+        public void UpdatePositionAndVelocity()
+        {
+            //  no lock; called from Simulate() -- if you call this from elsewhere, gotta lock or do Monitor.Enter/Exit!
+            d.Vector3 vec;
+            try
+            {
+                vec = d.BodyGetPosition(Body);
+            }
+            catch (NullReferenceException)
+            {
+                bad = true;
+                _parent_scene.BadCharacter(this);
+                vec = new d.Vector3(_position.X, _position.Y, _position.Z);
+                base.RaiseOutOfBounds(_position); // Tells ScenePresence that there's a problem!
+                m_log.WarnFormat("[ODEPLUGIN]: Avatar Null reference for Avatar {0}, physical actor {1}", m_name, m_uuid);
+            }
+            
+
+            //  kluge to keep things in bounds.  ODE lets dead avatars drift away (they should be removed!)
+            if (vec.X < 0.0f) vec.X = 0.0f;
+            if (vec.Y < 0.0f) vec.Y = 0.0f;
+            if (vec.X > (int)_parent_scene.WorldExtents.X - 0.05f) vec.X = (int)_parent_scene.WorldExtents.X - 0.05f;
+            if (vec.Y > (int)_parent_scene.WorldExtents.Y - 0.05f) vec.Y = (int)_parent_scene.WorldExtents.Y - 0.05f;
+
+            _position.X = vec.X;
+            _position.Y = vec.Y;
+            _position.Z = vec.Z;
+
+            // Did we move last? = zeroflag
+            // This helps keep us from sliding all over
+
+            if (_zeroFlag)
+            {
+                _velocity.X = 0.0f;
+                _velocity.Y = 0.0f;
+                _velocity.Z = 0.0f;
+
+                // Did we send out the 'stopped' message?
+                if (!m_lastUpdateSent)
+                {
+                    m_lastUpdateSent = true;
+                    //base.RequestPhysicsterseUpdate();
+
+                }
+            }
+            else
+            {
+                m_lastUpdateSent = false;
+                try
+                {
+                    vec = d.BodyGetLinearVel(Body);
+                }
+                catch (NullReferenceException)
+                {
+                    vec.X = _velocity.X;
+                    vec.Y = _velocity.Y;
+                    vec.Z = _velocity.Z;
+                }
+                _velocity.X = (vec.X);
+                _velocity.Y = (vec.Y);
+
+                _velocity.Z = (vec.Z);
+
+                if (_velocity.Z < -6 && !m_hackSentFall)
+                {
+                    m_hackSentFall = true;
+                    m_pidControllerActive = false;
+                }
+                else if (flying && !m_hackSentFly)
+                {
+                    //m_hackSentFly = true;
+                    //base.SendCollisionUpdate(new CollisionEventUpdate());
+                }
+                else
+                {
+                    m_hackSentFly = false;
+                    m_hackSentFall = false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Cleanup the things we use in the scene.
+        /// </summary>
+        public void Destroy()
+        {
+            m_tainted_isPhysical = false;
+            _parent_scene.AddPhysicsActorTaint(this);
+        }
+
+        public override void CrossingFailure()
+        {
+        }
+
+        public override Vector3 PIDTarget { set { return; } }
+        public override bool PIDActive { set { return; } }
+        public override float PIDTau { set { return; } }
+
+        public override float PIDHoverHeight { set { return; } }
+        public override bool PIDHoverActive { set { return; } }
+        public override PIDHoverType PIDHoverType { set { return; } }
+        public override float PIDHoverTau { set { return; } }
+
+        public override Quaternion APIDTarget{ set { return; } }
+
+        public override bool APIDActive{ set { return; } }
+
+        public override float APIDStrength{ set { return; } }
+
+        public override float APIDDamping{ set { return; } }
+
+                
+        public override void SubscribeEvents(int ms)
+        {
+            m_requestedUpdateFrequency = ms;
+            m_eventsubscription = ms;
+            _parent_scene.addCollisionEventReporting(this);
+        }
+        public override void UnSubscribeEvents()
+        {
+            _parent_scene.remCollisionEventReporting(this);
+            m_requestedUpdateFrequency = 0;
+            m_eventsubscription = 0;
+        }
+        public void AddCollisionEvent(uint CollidedWith, ContactPoint contact)
+        {
+            if (m_eventsubscription > 0)
+            {
+                CollisionEventsThisFrame.AddCollider(CollidedWith, contact);
+            }
+        }
+
+        public void SendCollisions()
+        {
+            if (m_eventsubscription > m_requestedUpdateFrequency)
+            {
+                if (CollisionEventsThisFrame != null)
+                {
+                    base.SendCollisionUpdate(CollisionEventsThisFrame);
+                }
+                CollisionEventsThisFrame = new CollisionEventUpdate();
+                m_eventsubscription = 0;
+            }
+        }
+        public override bool SubscribedEvents()
+        {
+            if (m_eventsubscription > 0)
+                return true;
+            return false;
+        }
+
+        public void ProcessTaints(float timestep)
+        {
+            lock (m_syncRoot)
+            {
+                if (m_tainted_isPhysical != m_isPhysical)
+                {
+                    if (m_tainted_isPhysical)
+                    {
+                        // Create avatar capsule and related ODE data
+                        if (!(Shell == IntPtr.Zero && Body == IntPtr.Zero && Amotor == IntPtr.Zero))
+                        {
+                            m_log.Warn("[PHYSICS]: re-creating the following avatar ODE data, even though it already exists - "
+                                + (Shell!=IntPtr.Zero ? "Shell ":"")
+                                + (Body!=IntPtr.Zero ? "Body ":"")
+                                + (Amotor!=IntPtr.Zero ? "Amotor ":""));
+                        }
+                        AvatarGeomAndBodyCreation(_position.X, _position.Y, _position.Z, m_tensor);
+                        _parent_scene.AddCharacter(this);
+                    }
+                    else
+                    {
+                        _parent_scene.RemoveCharacter(this);
+                        // destroy avatar capsule and related ODE data
+                        if (Amotor != IntPtr.Zero)
+                        {
+                            // Kill the Amotor
+                            d.JointDestroy(Amotor);
+                            Amotor = IntPtr.Zero;
+                        }
+                        //kill the Geometry
+                        _parent_scene.waitForSpaceUnlock(_parent_scene.space);
+
+                        if (Body != IntPtr.Zero)
+                        {
+                            //kill the body
+                            d.BodyDestroy(Body);
+                            Body = IntPtr.Zero;
+                        }
+
+                        if(Shell != IntPtr.Zero)
+                        {
+                            try
+                            {
+                                d.GeomDestroy(Shell);
+                            }
+                            catch (Exception e)
+                            {
+                                m_log.ErrorFormat("[PHYSICS]: Failed to destroy character shell {0}",e.Message);
+                            }
+                            // Remove any old entries
+    //string tShell;
+    //_parent_scene.geom_name_map.TryGetValue(Shell, out tShell);
+    //Console.WriteLine("**** Remove {0}", tShell);
+
+                            if(_parent_scene.geom_name_map.ContainsKey(Shell)) _parent_scene.geom_name_map.Remove(Shell);
+                            if(_parent_scene.actor_name_map.ContainsKey(Shell)) _parent_scene.actor_name_map.Remove(Shell);
+                            Shell = IntPtr.Zero;
+                        }
+                    }
+
+                    m_isPhysical = m_tainted_isPhysical;
+                }
+
+                if (m_tainted_CAPSULE_LENGTH != CAPSULE_LENGTH)
+                {
+                    if (Shell != IntPtr.Zero && Body != IntPtr.Zero && Amotor != IntPtr.Zero)
+                    {
+
+                        m_pidControllerActive = true;
+                        // no lock needed on _parent_scene.OdeLock because we are called from within the thread lock in OdePlugin's simulate()
+                        d.JointDestroy(Amotor);
+                        float prevCapsule = CAPSULE_LENGTH;
+                        CAPSULE_LENGTH = m_tainted_CAPSULE_LENGTH;
+                        //m_log.Info("[SIZE]: " + CAPSULE_LENGTH.ToString());
+                        d.BodyDestroy(Body);
+                        AvatarGeomAndBodyCreation(_position.X, _position.Y,
+                                          _position.Z + (Math.Abs(CAPSULE_LENGTH - prevCapsule) * 2), m_tensor);
+                        Velocity = Vector3.Zero;
+                    }
+                    else
+                    {
+                        m_log.Warn("[PHYSICS]: trying to change capsule size, but the following ODE data is missing - " 
+                            + (Shell==IntPtr.Zero ? "Shell ":"")
+                            + (Body==IntPtr.Zero ? "Body ":"")
+                            + (Amotor==IntPtr.Zero ? "Amotor ":""));
+                    }
+                }
+
+                if (!m_taintPosition.ApproxEquals(_position, 0.05f))
+                {
+                    if (Body != IntPtr.Zero)
+                    {
+                        d.BodySetPosition(Body, m_taintPosition.X, m_taintPosition.Y, m_taintPosition.Z);
+
+                    }
+                    _position.X = m_taintPosition.X;
+                    _position.Y = m_taintPosition.Y;
+                    _position.Z = m_taintPosition.Z;
+                }
+
+                if (m_haveTaintMomentum)
+                {
+                    m_haveTaintMomentum = false;
+                    _velocity = m_taintMomentum;
+                    _target_velocity = m_taintMomentum;
+                    m_pidControllerActive = true;
+                    if (Body != IntPtr.Zero)
+                        d.BodySetLinearVel(Body, _velocity.X, _velocity.Y, _velocity.Z);
+                }
+            }
+        }
+
+        internal void AddCollisionFrameTime(int p)
+        {
+            // protect it from overflow crashing
+            if (m_eventsubscription + p >= int.MaxValue)
+                m_eventsubscription = 0;
+            m_eventsubscription += p;
+        }
+    }
+}
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
new file mode 100644
index 0000000..ba24aa7
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
@@ -0,0 +1,4124 @@
+/* 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.
+ *
+ * Revised March 5th 2010 by Kitto Flora. ODEDynamics.cs
+ * Ubit 2012
+ * rolled into ODEPrim.cs
+ */
+
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Threading;
+using log4net;
+using OpenMetaverse;
+using Ode.NET;
+using OpenSim.Framework;
+using OpenSim.Region.Physics.Manager;
+
+namespace OpenSim.Region.Physics.OdePlugin
+{
+    /// <summary>
+    /// Various properties that ODE uses for AMotors but isn't exposed in ODE.NET so we must define them ourselves.
+    /// </summary>
+
+    public class OdePrim : PhysicsActor
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public class SerialControl
+        {
+            public object alock = new object();
+            public byte[] data = new byte[0];
+        }
+        private Vector3 _position;
+        private Vector3 _velocity;
+        private Vector3 _torque;
+        private Vector3 m_lastVelocity;
+        private Vector3 m_lastposition;
+        private Quaternion m_lastorientation = new Quaternion();
+        private Vector3 m_rotationalVelocity;
+        private Vector3 _size;
+        private Vector3 _acceleration;
+        // private d.Vector3 _zeroPosition = new d.Vector3(0.0f, 0.0f, 0.0f);
+        private Quaternion _orientation;
+        private Vector3 m_taintposition;
+        private Vector3 m_taintsize;
+        private Vector3 m_taintVelocity;
+        private Vector3 m_taintTorque;
+        private Quaternion m_taintrot;
+        private Vector3 m_rotateEnable = Vector3.One;                           // Current setting
+        private Vector3 m_rotateEnableRequest = Vector3.One;                    // Request from LSL
+        private bool m_rotateEnableUpdate = false;
+        private Vector3 m_lockX;
+        private Vector3 m_lockY;
+        private Vector3 m_lockZ;
+        private IntPtr Amotor = IntPtr.Zero;
+        private IntPtr AmotorX = IntPtr.Zero;
+        private IntPtr AmotorY = IntPtr.Zero;
+        private IntPtr AmotorZ = IntPtr.Zero;
+
+        private Vector3 m_PIDTarget;
+        private float m_PIDTau;
+        private float PID_D = 35f;
+        private float PID_G = 25f;
+        private bool m_usePID = false;
+
+        private Quaternion m_APIDTarget = new Quaternion();
+        private float m_APIDStrength = 0.5f;
+        private float m_APIDDamping = 0.5f;
+        private bool m_useAPID = false;
+        private float m_APIDdamper = 1.0f;
+
+        // These next 7 params apply to llSetHoverHeight(float height, integer water, float tau),
+        // do not confuse with VEHICLE HOVER
+
+        private float m_PIDHoverHeight;
+        private float m_PIDHoverTau;
+        private bool m_useHoverPID;
+        private PIDHoverType m_PIDHoverType = PIDHoverType.Ground;
+        private float m_targetHoverHeight;
+        private float m_groundHeight;
+        private float m_waterHeight;
+        private float m_buoyancy;                               //m_buoyancy set by llSetBuoyancy() 
+
+        // private float m_tensor = 5f;
+        private int body_autodisable_frames = 20;
+
+
+        private const CollisionCategories m_default_collisionFlags = (CollisionCategories.Geom
+                                                        | CollisionCategories.Space
+                                                        | CollisionCategories.Body
+                                                        | CollisionCategories.Character
+                                                        );
+        private bool m_taintshape;
+        private bool m_taintPhysics;
+        private bool m_collidesLand = true;
+        private bool m_collidesWater;
+        //        public bool m_returnCollisions;
+
+        // Default we're a Geometry
+        private CollisionCategories m_collisionCategories = (CollisionCategories.Geom);
+
+        // Default, Collide with Other Geometries, spaces and Bodies
+        private CollisionCategories m_collisionFlags = m_default_collisionFlags;
+
+        public bool m_taintremove;
+        public bool m_taintdisable;
+        public bool m_disabled;
+        public bool m_taintadd;
+        public bool m_taintselected;
+        public bool m_taintphantom;
+        public bool m_taintCollidesWater;
+
+        public uint m_localID;
+
+        //public GCHandle gc;
+        private CollisionLocker ode;
+
+        private bool m_meshfailed = false;
+        private bool m_taintforce = false;
+        private bool m_taintaddangularforce = false;
+        private Vector3 m_force;
+        private List<Vector3> m_forcelist = new List<Vector3>();
+        private List<Vector3> m_angularforcelist = new List<Vector3>();
+
+        private IMesh _mesh;
+        private PrimitiveBaseShape _pbs;
+        private OdeScene _parent_scene;
+        public IntPtr m_targetSpace = IntPtr.Zero;
+        public IntPtr prim_geom;
+        //        public IntPtr prev_geom;
+        public IntPtr _triMeshData;
+
+        private IntPtr _linkJointGroup = IntPtr.Zero;
+        private PhysicsActor _parent;
+        private PhysicsActor m_taintparent;
+
+        private List<OdePrim> childrenPrim = new List<OdePrim>();
+
+        private bool iscolliding;
+        private bool m_isphysical;
+        private bool m_isphantom;
+        private bool m_isSelected;
+
+        private bool m_NoColide;  // for now only for internal use for bad meshs
+
+        internal bool m_isVolumeDetect; // If true, this prim only detects collisions but doesn't collide actively
+
+        private bool m_throttleUpdates;
+        private int throttleCounter;
+        public int m_interpenetrationcount;
+        public float m_collisionscore;
+        //        public int m_roundsUnderMotionThreshold;
+        //        private int m_crossingfailures;
+
+        public bool m_outofBounds;
+        private float m_density = 10.000006836f; // Aluminum g/cm3;
+
+        private float m_primMass = 10.000006836f; // Aluminum g/cm3;
+
+        private byte m_shapetype;
+        private byte m_taintshapetype;
+
+        public bool _zeroFlag;                                   // if body has been stopped
+        private bool m_lastUpdateSent;
+
+        public IntPtr Body = IntPtr.Zero;
+        public String m_primName;
+        private Vector3 _target_velocity;
+        public d.Mass pMass;
+
+        public int m_eventsubscription;
+        private CollisionEventUpdate CollisionEventsThisFrame;
+
+        private IntPtr m_linkJoint = IntPtr.Zero;
+
+        public volatile bool childPrim;
+
+        internal int m_material = (int)Material.Wood;
+
+        private IntPtr m_body = IntPtr.Zero;
+
+        // Vehicle properties ============================================================================================
+        private Vehicle m_type = Vehicle.TYPE_NONE;                                             // If a 'VEHICLE', and what kind
+        // private Quaternion m_referenceFrame = Quaternion.Identity;   // Axis modifier
+        private VehicleFlag m_flags = (VehicleFlag)0;                                   // Bit settings:
+        // HOVER_TERRAIN_ONLY
+        // HOVER_GLOBAL_HEIGHT
+        // NO_DEFLECTION_UP
+        // HOVER_WATER_ONLY
+        // HOVER_UP_ONLY
+        // LIMIT_MOTOR_UP
+        // LIMIT_ROLL_ONLY
+
+        // Linear properties
+        private Vector3 m_linearMotorDirection = Vector3.Zero;                  // (was m_linearMotorDirectionLASTSET) the (local) Velocity 
+        //requested by LSL
+        private float m_linearMotorTimescale = 0;                                               // Motor Attack rate set by LSL
+        private float m_linearMotorDecayTimescale = 0;                          // Motor Decay rate set by LSL
+        private Vector3 m_linearFrictionTimescale = Vector3.Zero;               // General Friction set by LSL
+
+        private Vector3 m_lLinMotorDVel = Vector3.Zero;                                 // decayed motor
+        private Vector3 m_lLinObjectVel = Vector3.Zero;                                 // local frame object velocity
+        private Vector3 m_wLinObjectVel = Vector3.Zero;                                 // world frame object velocity
+
+        //Angular properties
+        private Vector3 m_angularMotorDirection = Vector3.Zero;                 // angular velocity requested by LSL motor 
+
+        private float m_angularMotorTimescale = 0;                                              // motor angular Attack rate set by LSL
+        private float m_angularMotorDecayTimescale = 0;                                 // motor angular Decay rate set by LSL
+        private Vector3 m_angularFrictionTimescale = Vector3.Zero;              // body angular Friction set by LSL
+
+        private Vector3 m_angularMotorDVel = Vector3.Zero;                              // decayed angular motor
+        //        private Vector3 m_angObjectVel = Vector3.Zero;                                        // current body angular velocity
+        private Vector3 m_lastAngularVelocity = Vector3.Zero;                   // what was last applied to body
+
+        //Deflection properties        
+        // private float m_angularDeflectionEfficiency = 0;
+        // private float m_angularDeflectionTimescale = 0;
+        // private float m_linearDeflectionEfficiency = 0;
+        // private float m_linearDeflectionTimescale = 0;
+
+        //Banking properties
+        // private float m_bankingEfficiency = 0;
+        // private float m_bankingMix = 0;
+        // private float m_bankingTimescale = 0;
+
+        //Hover and Buoyancy properties
+        private float m_VhoverHeight = 0f;
+        //        private float m_VhoverEfficiency = 0f;
+        private float m_VhoverTimescale = 0f;
+        private float m_VhoverTargetHeight = -1.0f;     // if <0 then no hover, else its the current target height 
+        private float m_VehicleBuoyancy = 0f;                   // Set by VEHICLE_BUOYANCY, for a vehicle.
+        // Modifies gravity. Slider between -1 (double-gravity) and 1 (full anti-gravity) 
+        // KF: So far I have found no good method to combine a script-requested .Z velocity and gravity.
+        // Therefore only m_VehicleBuoyancy=1 (0g) will use the script-requested .Z velocity. 
+
+        //Attractor properties                                                                                                  
+        private float m_verticalAttractionEfficiency = 1.0f;            // damped     
+        private float m_verticalAttractionTimescale = 500f;                     // Timescale > 300  means no vert attractor.
+
+//        SerialControl m_taintserial = null;
+        object m_taintvehicledata = null;
+
+        public void DoSetVehicle()
+        {
+            VehicleData vd = (VehicleData)m_taintvehicledata;
+
+        m_type = vd.m_type;
+        m_flags = vd.m_flags;
+
+        // Linear properties
+        m_linearMotorDirection = vd.m_linearMotorDirection;
+        m_linearFrictionTimescale = vd.m_linearFrictionTimescale;
+        m_linearMotorDecayTimescale = vd.m_linearMotorDecayTimescale;
+        m_linearMotorTimescale = vd.m_linearMotorTimescale;
+//        m_linearMotorOffset = vd.m_linearMotorOffset;
+
+        //Angular properties
+        m_angularMotorDirection = vd.m_angularMotorDirection;
+        m_angularMotorTimescale = vd.m_angularMotorTimescale;
+        m_angularMotorDecayTimescale = vd.m_angularMotorDecayTimescale;
+        m_angularFrictionTimescale = vd.m_angularFrictionTimescale;
+
+        //Deflection properties
+//        m_angularDeflectionEfficiency = vd.m_angularDeflectionEfficiency;
+//        m_angularDeflectionTimescale = vd.m_angularDeflectionTimescale;
+//        m_linearDeflectionEfficiency = vd.m_linearDeflectionEfficiency;
+//        m_linearDeflectionTimescale = vd.m_linearDeflectionTimescale;
+
+        //Banking properties
+//        m_bankingEfficiency = vd.m_bankingEfficiency;
+//        m_bankingMix = vd.m_bankingMix;
+//        m_bankingTimescale = vd.m_bankingTimescale;
+
+        //Hover and Buoyancy properties
+        m_VhoverHeight = vd.m_VhoverHeight;
+//        m_VhoverEfficiency = vd.m_VhoverEfficiency;
+        m_VhoverTimescale = vd.m_VhoverTimescale;
+        m_VehicleBuoyancy = vd.m_VehicleBuoyancy;
+
+        //Attractor properties
+        m_verticalAttractionEfficiency = vd.m_verticalAttractionEfficiency;
+        m_verticalAttractionTimescale = vd.m_verticalAttractionTimescale;
+
+        // Axis
+//        m_referenceFrame = vd.m_referenceFrame;
+
+
+            m_taintvehicledata = null;
+        }
+
+        public override void SetVehicle(object vdata)
+        {
+            m_taintvehicledata = vdata;
+            _parent_scene.AddPhysicsActorTaint(this);
+        }
+
+        public OdePrim(String primName, OdeScene parent_scene, Vector3 pos, Vector3 size,
+                       Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical,
+                       bool pisPhantom,byte shapetype, CollisionLocker dode, uint localid)
+        {
+            m_localID = localid;
+            ode = dode;
+            if (!pos.IsFinite())
+            {
+                pos = new Vector3(((float)Constants.RegionSize * 0.5f), ((float)Constants.RegionSize * 0.5f),
+                    parent_scene.GetTerrainHeightAtXY(((float)Constants.RegionSize * 0.5f), ((float)Constants.RegionSize * 0.5f)) + 0.5f);
+                m_log.Warn("[PHYSICS]: Got nonFinite Object create Position");
+            }
+
+            _position = pos;
+            m_taintposition = pos;
+            PID_D = parent_scene.bodyPIDD;
+            PID_G = parent_scene.bodyPIDG;
+            m_density = parent_scene.geomDefaultDensity;
+            // m_tensor = parent_scene.bodyMotorJointMaxforceTensor;
+            body_autodisable_frames = parent_scene.bodyFramesAutoDisable;
+
+            prim_geom = IntPtr.Zero;
+            //            prev_geom = IntPtr.Zero;
+
+            if (!pos.IsFinite())
+            {
+                size = new Vector3(0.5f, 0.5f, 0.5f);
+                m_log.Warn("[PHYSICS]: Got nonFinite Object create Size");
+            }
+
+            if (size.X <= 0) size.X = 0.01f;
+            if (size.Y <= 0) size.Y = 0.01f;
+            if (size.Z <= 0) size.Z = 0.01f;
+
+            _size = size;
+            m_taintsize = _size;
+
+            if (!QuaternionIsFinite(rotation))
+            {
+                rotation = Quaternion.Identity;
+                m_log.Warn("[PHYSICS]: Got nonFinite Object create Rotation");
+            }
+
+            _orientation = rotation;
+            m_taintrot = _orientation;
+            _mesh = mesh;
+            _pbs = pbs;
+            m_shapetype = shapetype;
+            m_taintshapetype = shapetype;
+
+            _parent_scene = parent_scene;
+            m_targetSpace = (IntPtr)0;
+
+            //            if (pos.Z < 0)
+            if (pos.Z < parent_scene.GetTerrainHeightAtXY(pos.X, pos.Y))
+                m_isphysical = false;
+            else
+            {
+                m_isphysical = pisPhysical;
+                // If we're physical, we need to be in the master space for now.
+                // linksets *should* be in a space together..  but are not currently
+                if (m_isphysical)
+                    m_targetSpace = _parent_scene.space;
+            }
+
+            m_isphantom = pisPhantom;
+            m_taintphantom = pisPhantom;
+
+            _triMeshData = IntPtr.Zero;
+            m_NoColide = false;
+
+//            m_taintserial = null;
+            m_primName = primName;
+            m_taintadd = true;
+            _parent_scene.AddPhysicsActorTaint(this);
+            //  don't do .add() here; old geoms get recycled with the same hash
+        }
+
+        public override int PhysicsActorType
+        {
+            get { return (int)ActorTypes.Prim; }
+            set { return; }
+        }
+
+        public override bool SetAlwaysRun
+        {
+            get { return false; }
+            set { return; }
+        }
+
+        public override uint LocalID
+        {
+            set
+            {
+                //m_log.Info("[PHYSICS]: Setting TrackerID: " + value);
+                m_localID = value;
+            }
+        }
+
+        public override bool Grabbed
+        {
+            set { return; }
+        }
+
+        public override bool Selected
+        {
+            set
+            {
+                //Console.WriteLine("Sel {0}  {1}  {2}", m_primName, value,   m_isphysical);        
+                // This only makes the object not collidable if the object
+                // is physical or the object is modified somehow *IN THE FUTURE*
+                // without this, if an avatar selects prim, they can walk right
+                // through it while it's selected
+                m_collisionscore = 0;
+                if ((m_isphysical && !_zeroFlag) || !value)
+                {
+                    m_taintselected = value;
+                    _parent_scene.AddPhysicsActorTaint(this);
+                }
+                else
+                {
+                    m_taintselected = value;
+                    m_isSelected = value;
+                }
+                if (m_isSelected) disableBodySoft();
+            }
+        }
+
+        public override bool IsPhysical
+        {
+            get { return m_isphysical; }
+            set
+            {
+                m_isphysical = value;
+                if (!m_isphysical)
+                {               // Zero the remembered last velocity
+                    m_lastVelocity = Vector3.Zero;
+                    if (m_type != Vehicle.TYPE_NONE) Halt();
+                }
+            }
+        }
+
+        public override bool IsVolumeDtc
+        {
+            set { return; }
+            get { return m_isVolumeDetect; }
+
+        }
+
+        public override bool Phantom
+        {
+            get { return m_isphantom; }
+            set
+            {
+                m_isphantom = value;
+            }
+        }
+
+        public void setPrimForRemoval()
+        {
+            m_taintremove = true;
+        }
+
+        public override bool Flying
+        {
+            // no flying prims for you
+            get { return false; }
+            set { }
+        }
+
+        public override bool IsColliding
+        {
+            get { return iscolliding; }
+            set { iscolliding = value; }
+        }
+
+        public override bool CollidingGround
+        {
+            get { return false; }
+            set { return; }
+        }
+
+        public override bool CollidingObj
+        {
+            get { return false; }
+            set { return; }
+        }
+
+        public override bool ThrottleUpdates
+        {
+            get { return m_throttleUpdates; }
+            set { m_throttleUpdates = value; }
+        }
+
+        public override bool Stopped
+        {
+            get { return _zeroFlag; }
+        }
+
+        public override Vector3 Position
+        {
+            get { return _position; }
+
+            set
+            {
+                _position = value;
+                //m_log.Info("[PHYSICS]: " + _position.ToString());
+            }
+        }
+
+        public override Vector3 Size
+        {
+            get { return _size; }
+            set
+            {
+                if (value.IsFinite())
+                {
+                    _size = value;
+                }
+                else
+                {
+                    m_log.Warn("[PHYSICS]: Got NaN Size on object");
+                }
+            }
+        }
+
+        public override float Mass
+        {
+            get
+            {
+                CalculateMass();
+                return m_primMass;
+            }
+        }
+
+        public override Vector3 Force
+        {
+            //get { return Vector3.Zero; }
+            get { return m_force; }
+            set
+            {
+                if (value.IsFinite())
+                {
+                    m_force = value;
+                }
+                else
+                {
+                    m_log.Warn("[PHYSICS]: NaN in Force Applied to an Object");
+                }
+            }
+        }
+
+        public override int VehicleType
+        {
+            get { return (int)m_type; }
+            set { ProcessTypeChange((Vehicle)value); }
+        }
+
+        public override void VehicleFloatParam(int param, float value)
+        {
+            ProcessFloatVehicleParam((Vehicle)param, value);
+        }
+
+        public override void VehicleVectorParam(int param, Vector3 value)
+        {
+            ProcessVectorVehicleParam((Vehicle)param, value);
+        }
+
+        public override void VehicleRotationParam(int param, Quaternion rotation)
+        {
+            ProcessRotationVehicleParam((Vehicle)param, rotation);
+        }
+
+        public override void VehicleFlags(int param, bool remove)
+        {
+            ProcessVehicleFlags(param, remove);
+        }
+
+        public override void SetVolumeDetect(int param)
+        {
+            lock (_parent_scene.OdeLock)
+            {
+                m_isVolumeDetect = (param != 0);
+            }
+        }
+
+
+        public override Vector3 CenterOfMass
+        {
+            get { return Vector3.Zero; }
+        }
+
+        public override Vector3 GeometricCenter
+        {
+            get { return Vector3.Zero; }
+        }
+
+        public override PrimitiveBaseShape Shape
+        {
+            set
+            {
+                _pbs = value;
+                m_taintshape = true;
+            }
+        }
+
+        public override byte PhysicsShapeType
+        {
+            get
+            {
+                return m_shapetype;
+            }
+            set
+            {
+                m_taintshapetype = value;
+                _parent_scene.AddPhysicsActorTaint(this);
+            }
+        }
+
+        public override Vector3 Velocity
+        {
+            get
+            {
+                // Averate previous velocity with the new one so
+                // client object interpolation works a 'little' better
+                if (_zeroFlag)
+                    return Vector3.Zero;
+
+                Vector3 returnVelocity = Vector3.Zero;
+                returnVelocity.X = (m_lastVelocity.X + _velocity.X) / 2;
+                returnVelocity.Y = (m_lastVelocity.Y + _velocity.Y) / 2;
+                returnVelocity.Z = (m_lastVelocity.Z + _velocity.Z) / 2;
+                return returnVelocity;
+            }
+            set
+            {
+                if (value.IsFinite())
+                {
+                    _velocity = value;
+                    if (_velocity.ApproxEquals(Vector3.Zero, 0.001f))
+                        _acceleration = Vector3.Zero;
+
+                    m_taintVelocity = value;
+                    _parent_scene.AddPhysicsActorTaint(this);
+                }
+                else
+                {
+                    m_log.Warn("[PHYSICS]: Got NaN Velocity in Object");
+                }
+
+            }
+        }
+
+        public override Vector3 Torque
+        {
+            get
+            {
+                if (!m_isphysical || Body == IntPtr.Zero)
+                    return Vector3.Zero;
+
+                return _torque;
+            }
+
+            set
+            {
+                if (value.IsFinite())
+                {
+                    m_taintTorque = value;
+                    _parent_scene.AddPhysicsActorTaint(this);
+                }
+                else
+                {
+                    m_log.Warn("[PHYSICS]: Got NaN Torque in Object");
+                }
+            }
+        }
+
+        public override float CollisionScore
+        {
+            get { return m_collisionscore; }
+            set { m_collisionscore = value; }
+        }
+
+        public override bool Kinematic
+        {
+            get { return false; }
+            set { }
+        }
+
+        public override Quaternion Orientation
+        {
+            get { return _orientation; }
+            set
+            {
+                if (QuaternionIsFinite(value))
+                {
+                    _orientation = value;
+                }
+                else
+                    m_log.Warn("[PHYSICS]: Got NaN quaternion Orientation from Scene in Object");
+
+            }
+        }
+
+        public override bool FloatOnWater
+        {
+            set
+            {
+                m_taintCollidesWater = value;
+                _parent_scene.AddPhysicsActorTaint(this);
+            }
+        }
+
+        public override void SetMomentum(Vector3 momentum)
+        {
+        }
+
+        public override Vector3 PIDTarget
+        {
+            set
+            {
+                if (value.IsFinite())
+                {
+                    m_PIDTarget = value;
+                }
+                else
+                    m_log.Warn("[PHYSICS]: Got NaN PIDTarget from Scene on Object");
+            }
+        }
+        public override bool PIDActive { set { m_usePID = value; } }
+        public override float PIDTau { set { m_PIDTau = value; } }
+
+        // For RotLookAt        
+        public override Quaternion APIDTarget { set { m_APIDTarget = value; } }
+        public override bool APIDActive { set { m_useAPID = value; } }
+        public override float APIDStrength { set { m_APIDStrength = value; } }
+        public override float APIDDamping { set { m_APIDDamping = value; } }
+
+        public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } }
+        public override bool PIDHoverActive { set { m_useHoverPID = value; } }
+        public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } }
+        public override float PIDHoverTau { set { m_PIDHoverTau = value; } }
+
+        internal static bool QuaternionIsFinite(Quaternion q)
+        {
+            if (Single.IsNaN(q.X) || Single.IsInfinity(q.X))
+                return false;
+            if (Single.IsNaN(q.Y) || Single.IsInfinity(q.Y))
+                return false;
+            if (Single.IsNaN(q.Z) || Single.IsInfinity(q.Z))
+                return false;
+            if (Single.IsNaN(q.W) || Single.IsInfinity(q.W))
+                return false;
+            return true;
+        }
+
+        public override Vector3 Acceleration            // client updates read data via here
+        {
+            get
+            {
+                if (_zeroFlag)
+                {
+                    return Vector3.Zero;
+                }
+                return _acceleration;
+            }
+            set { _acceleration = value; }
+        }
+
+
+        public void SetAcceleration(Vector3 accel) // No one calls this, and it would not do anything.
+        {
+            _acceleration = accel;
+        }
+
+        public override void AddForce(Vector3 force, bool pushforce)
+        {
+            if (force.IsFinite())
+            {
+                lock (m_forcelist)
+                    m_forcelist.Add(force);
+
+                m_taintforce = true;
+            }
+            else
+            {
+                m_log.Warn("[PHYSICS]: Got Invalid linear force vector from Scene in Object");
+            }
+            //m_log.Info("[PHYSICS]: Added Force:" + force.ToString() +  " to prim at " + Position.ToString());
+        }
+
+        public override void AddAngularForce(Vector3 force, bool pushforce)
+        {
+            if (force.IsFinite())
+            {
+                m_angularforcelist.Add(force);
+                m_taintaddangularforce = true;
+            }
+            else
+            {
+                m_log.Warn("[PHYSICS]: Got Invalid Angular force vector from Scene in Object");
+            }
+        }
+
+        public override Vector3 RotationalVelocity
+        {
+            get
+            {
+                return m_rotationalVelocity;
+            }
+            set
+            {
+                if (value.IsFinite())
+                {
+                    m_rotationalVelocity = value;
+                }
+                else
+                {
+                    m_log.Warn("[PHYSICS]: Got NaN RotationalVelocity in Object");
+                }
+            }
+        }
+
+        public override void CrossingFailure()
+        {
+            if (m_outofBounds)
+            {
+                _position.X = Util.Clip(_position.X, 0.5f, _parent_scene.WorldExtents.X - 0.5f);
+                _position.Y = Util.Clip(_position.Y, 0.5f, _parent_scene.WorldExtents.Y - 0.5f);
+                _position.Z = Util.Clip(_position.Z, -100f, 50000f);
+                d.BodySetPosition(Body, _position.X, _position.Y, _position.Z);
+
+                m_lastposition = _position;
+
+                _velocity = Vector3.Zero;
+                m_lastVelocity = _velocity;
+
+
+                if (m_type != Vehicle.TYPE_NONE)
+                    Halt();
+
+                d.BodySetLinearVel(Body, 0, 0, 0);
+                base.RequestPhysicsterseUpdate();
+                m_outofBounds = false;
+            }
+            /*
+                        int tmp = Interlocked.Increment(ref m_crossingfailures);
+                        if (tmp > _parent_scene.geomCrossingFailuresBeforeOutofbounds)
+                        {
+                            base.RaiseOutOfBounds(_position);
+                            return;
+                        }
+                        else if (tmp == _parent_scene.geomCrossingFailuresBeforeOutofbounds)
+                        {
+                            m_log.Warn("[PHYSICS]: Too many crossing failures for: " + m_primName);
+                        }
+             */
+        }
+
+        public override float Buoyancy
+        {
+            get { return m_buoyancy; }
+            set { m_buoyancy = value; }
+        }
+
+        public override void link(PhysicsActor obj)
+        {
+            m_taintparent = obj;
+        }
+
+        public override void delink()
+        {
+            m_taintparent = null;
+        }
+
+        public override void LockAngularMotion(Vector3 axis)
+        {
+            // This is actually ROTATION ENABLE, not a lock.
+            // default is <1,1,1> which is all enabled. 
+            // The lock value is updated inside Move(), no point in using the taint system.
+            // OS 'm_taintAngularLock' etc change to m_rotateEnable.
+            if (axis.IsFinite())
+            {
+                axis.X = (axis.X > 0) ? 1f : 0f;
+                axis.Y = (axis.Y > 0) ? 1f : 0f;
+                axis.Z = (axis.Z > 0) ? 1f : 0f;
+                m_log.DebugFormat("[axislock]: <{0},{1},{2}>", axis.X, axis.Y, axis.Z);
+                m_rotateEnableRequest = axis;
+                m_rotateEnableUpdate = true;
+            }
+            else
+            {
+                m_log.Warn("[PHYSICS]: Got NaN locking axis from Scene on Object");
+            }
+        }
+
+        public void SetGeom(IntPtr geom)
+        {
+            if (prim_geom != IntPtr.Zero)
+            {
+                // Remove any old entries
+                //string tPA;
+                //_parent_scene.geom_name_map.TryGetValue(prim_geom, out tPA);
+                //Console.WriteLine("**** Remove {0}", tPA);
+                if (_parent_scene.geom_name_map.ContainsKey(prim_geom)) _parent_scene.geom_name_map.Remove(prim_geom);
+                if (_parent_scene.actor_name_map.ContainsKey(prim_geom)) _parent_scene.actor_name_map.Remove(prim_geom);
+                d.GeomDestroy(prim_geom);
+            }
+
+            prim_geom = geom;
+            //Console.WriteLine("SetGeom to " + prim_geom + " for " + m_primName);     
+            if (prim_geom != IntPtr.Zero)
+            {
+                _parent_scene.geom_name_map[prim_geom] = this.m_primName;
+                _parent_scene.actor_name_map[prim_geom] = (PhysicsActor)this;
+                //Console.WriteLine("**** Create {2}    Dicts: actor={0}   name={1}", _parent_scene.actor_name_map.Count, _parent_scene.geom_name_map.Count, this.m_primName);
+                if (m_NoColide)
+                {
+                    d.GeomSetCategoryBits(prim_geom, 0);
+                    if (m_isphysical && !m_isVolumeDetect)
+                    {
+                        d.GeomSetCollideBits(prim_geom, (int)CollisionCategories.Land);
+                    }
+                    else
+                    {
+                        d.GeomSetCollideBits(prim_geom, 0);
+                        d.GeomDisable(prim_geom);
+                    }
+                }
+                else
+                {
+                    d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
+                    d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
+                }
+            }
+
+            if (childPrim)
+            {
+                if (_parent != null && _parent is OdePrim)
+                {
+                    OdePrim parent = (OdePrim)_parent;
+                    //Console.WriteLine("SetGeom calls ChildSetGeom");                    
+                    parent.ChildSetGeom(this);
+                }
+            }
+            //m_log.Warn("Setting Geom to: " + prim_geom);
+        }
+
+        public void enableBodySoft()
+        {
+            if (!childPrim)
+            {
+                if (m_isphysical && Body != IntPtr.Zero)
+                {
+                    d.BodyEnable(Body);
+                    if (m_type != Vehicle.TYPE_NONE)
+                        Enable(Body, _parent_scene);
+                }
+
+                m_disabled = false;
+            }
+        }
+
+        public void disableBodySoft()
+        {
+            m_disabled = true;
+
+            if (m_isphysical && Body != IntPtr.Zero)
+            {
+                d.BodyDisable(Body);
+                Halt();
+            }
+        }
+
+        public void enableBody()
+        {
+            // Don't enable this body if we're a child prim
+            // this should be taken care of in the parent function not here
+            if (!childPrim)
+            {
+                // Sets the geom to a body
+                Body = d.BodyCreate(_parent_scene.world);
+
+                setMass();
+                d.BodySetPosition(Body, _position.X, _position.Y, _position.Z);
+                d.Quaternion myrot = new d.Quaternion();
+                myrot.X = _orientation.X;
+                myrot.Y = _orientation.Y;
+                myrot.Z = _orientation.Z;
+                myrot.W = _orientation.W;
+                d.BodySetQuaternion(Body, ref myrot);
+                d.GeomSetBody(prim_geom, Body);
+
+                m_collisionCategories |= CollisionCategories.Body;
+                m_collisionFlags |= (CollisionCategories.Land | CollisionCategories.Wind);
+
+                if (m_NoColide)
+                {
+                    d.GeomSetCategoryBits(prim_geom, 0);
+                    d.GeomSetCollideBits(prim_geom, (int)CollisionCategories.Land);
+                }
+                else
+                {
+                    d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
+                    d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
+                }
+
+                d.BodySetAutoDisableFlag(Body, true);
+                d.BodySetAutoDisableSteps(Body, body_autodisable_frames);
+
+                // disconnect from world gravity so we can apply buoyancy
+                d.BodySetGravityMode(Body, false);
+
+                m_interpenetrationcount = 0;
+                m_collisionscore = 0;
+                m_disabled = false;
+
+                if (m_type != Vehicle.TYPE_NONE)
+                {
+                    Enable(Body, _parent_scene);
+                }
+
+                _parent_scene.addActivePrim(this);
+            }
+        }
+
+        #region Mass Calculation
+
+        private float CalculateMass()
+        {
+            float volume = _size.X * _size.Y * _size.Z; // default
+            float tmp;
+
+            float returnMass = 0;
+            float hollowAmount = (float)_pbs.ProfileHollow * 2.0e-5f;
+            float hollowVolume = hollowAmount * hollowAmount;
+
+            switch (_pbs.ProfileShape)
+            {
+                case ProfileShape.Square:
+                    // default box
+
+                    if (_pbs.PathCurve == (byte)Extrusion.Straight)
+                    {
+                        if (hollowAmount > 0.0)
+                        {
+                            switch (_pbs.HollowShape)
+                            {
+                                case HollowShape.Square:
+                                case HollowShape.Same:
+                                    break;
+
+                                case HollowShape.Circle:
+
+                                    hollowVolume *= 0.78539816339f;
+                                    break;
+
+                                case HollowShape.Triangle:
+
+                                    hollowVolume *= (0.5f * .5f);
+                                    break;
+
+                                default:
+                                    hollowVolume = 0;
+                                    break;
+                            }
+                            volume *= (1.0f - hollowVolume);
+                        }
+                    }
+
+                    else if (_pbs.PathCurve == (byte)Extrusion.Curve1)
+                    {
+                        //a tube 
+
+                        volume *= 0.78539816339e-2f * (float)(200 - _pbs.PathScaleX);
+                        tmp = 1.0f - 2.0e-2f * (float)(200 - _pbs.PathScaleY);
+                        volume -= volume * tmp * tmp;
+
+                        if (hollowAmount > 0.0)
+                        {
+                            hollowVolume *= hollowAmount;
+
+                            switch (_pbs.HollowShape)
+                            {
+                                case HollowShape.Square:
+                                case HollowShape.Same:
+                                    break;
+
+                                case HollowShape.Circle:
+                                    hollowVolume *= 0.78539816339f; ;
+                                    break;
+
+                                case HollowShape.Triangle:
+                                    hollowVolume *= 0.5f * 0.5f;
+                                    break;
+                                default:
+                                    hollowVolume = 0;
+                                    break;
+                            }
+                            volume *= (1.0f - hollowVolume);
+                        }
+                    }
+
+                    break;
+
+                case ProfileShape.Circle:
+
+                    if (_pbs.PathCurve == (byte)Extrusion.Straight)
+                    {
+                        volume *= 0.78539816339f; // elipse base
+
+                        if (hollowAmount > 0.0)
+                        {
+                            switch (_pbs.HollowShape)
+                            {
+                                case HollowShape.Same:
+                                case HollowShape.Circle:
+                                    break;
+
+                                case HollowShape.Square:
+                                    hollowVolume *= 0.5f * 2.5984480504799f;
+                                    break;
+
+                                case HollowShape.Triangle:
+                                    hollowVolume *= .5f * 1.27323954473516f;
+                                    break;
+
+                                default:
+                                    hollowVolume = 0;
+                                    break;
+                            }
+                            volume *= (1.0f - hollowVolume);
+                        }
+                    }
+
+                    else if (_pbs.PathCurve == (byte)Extrusion.Curve1)
+                    {
+                        volume *= 0.61685027506808491367715568749226e-2f * (float)(200 - _pbs.PathScaleX);
+                        tmp = 1.0f - .02f * (float)(200 - _pbs.PathScaleY);
+                        volume *= (1.0f - tmp * tmp);
+
+                        if (hollowAmount > 0.0)
+                        {
+
+                            // calculate the hollow volume by it's shape compared to the prim shape
+                            hollowVolume *= hollowAmount;
+
+                            switch (_pbs.HollowShape)
+                            {
+                                case HollowShape.Same:
+                                case HollowShape.Circle:
+                                    break;
+
+                                case HollowShape.Square:
+                                    hollowVolume *= 0.5f * 2.5984480504799f;
+                                    break;
+
+                                case HollowShape.Triangle:
+                                    hollowVolume *= .5f * 1.27323954473516f;
+                                    break;
+
+                                default:
+                                    hollowVolume = 0;
+                                    break;
+                            }
+                            volume *= (1.0f - hollowVolume);
+                        }
+                    }
+                    break;
+
+                case ProfileShape.HalfCircle:
+                    if (_pbs.PathCurve == (byte)Extrusion.Curve1)
+                    {
+                        volume *= 0.52359877559829887307710723054658f;
+                    }
+                    break;
+
+                case ProfileShape.EquilateralTriangle:
+
+                    if (_pbs.PathCurve == (byte)Extrusion.Straight)
+                    {
+                        volume *= 0.32475953f;
+
+                        if (hollowAmount > 0.0)
+                        {
+
+                            // calculate the hollow volume by it's shape compared to the prim shape
+                            switch (_pbs.HollowShape)
+                            {
+                                case HollowShape.Same:
+                                case HollowShape.Triangle:
+                                    hollowVolume *= .25f;
+                                    break;
+
+                                case HollowShape.Square:
+                                    hollowVolume *= 0.499849f * 3.07920140172638f;
+                                    break;
+
+                                case HollowShape.Circle:
+                                    // Hollow shape is a perfect cyllinder in respect to the cube's scale
+                                    // Cyllinder hollow volume calculation
+
+                                    hollowVolume *= 0.1963495f * 3.07920140172638f;
+                                    break;
+
+                                default:
+                                    hollowVolume = 0;
+                                    break;
+                            }
+                            volume *= (1.0f - hollowVolume);
+                        }
+                    }
+                    else if (_pbs.PathCurve == (byte)Extrusion.Curve1)
+                    {
+                        volume *= 0.32475953f;
+                        volume *= 0.01f * (float)(200 - _pbs.PathScaleX);
+                        tmp = 1.0f - .02f * (float)(200 - _pbs.PathScaleY);
+                        volume *= (1.0f - tmp * tmp);
+
+                        if (hollowAmount > 0.0)
+                        {
+
+                            hollowVolume *= hollowAmount;
+
+                            switch (_pbs.HollowShape)
+                            {
+                                case HollowShape.Same:
+                                case HollowShape.Triangle:
+                                    hollowVolume *= .25f;
+                                    break;
+
+                                case HollowShape.Square:
+                                    hollowVolume *= 0.499849f * 3.07920140172638f;
+                                    break;
+
+                                case HollowShape.Circle:
+
+                                    hollowVolume *= 0.1963495f * 3.07920140172638f;
+                                    break;
+
+                                default:
+                                    hollowVolume = 0;
+                                    break;
+                            }
+                            volume *= (1.0f - hollowVolume);
+                        }
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+
+
+
+            float taperX1;
+            float taperY1;
+            float taperX;
+            float taperY;
+            float pathBegin;
+            float pathEnd;
+            float profileBegin;
+            float profileEnd;
+
+            if (_pbs.PathCurve == (byte)Extrusion.Straight || _pbs.PathCurve == (byte)Extrusion.Flexible)
+            {
+                taperX1 = _pbs.PathScaleX * 0.01f;
+                if (taperX1 > 1.0f)
+                    taperX1 = 2.0f - taperX1;
+                taperX = 1.0f - taperX1;
+
+                taperY1 = _pbs.PathScaleY * 0.01f;
+                if (taperY1 > 1.0f)
+                    taperY1 = 2.0f - taperY1;
+                taperY = 1.0f - taperY1;
+            }
+            else
+            {
+                taperX = _pbs.PathTaperX * 0.01f;
+                if (taperX < 0.0f)
+                    taperX = -taperX;
+                taperX1 = 1.0f - taperX;
+
+                taperY = _pbs.PathTaperY * 0.01f;
+                if (taperY < 0.0f)
+                    taperY = -taperY;
+                taperY1 = 1.0f - taperY;
+
+            }
+
+
+            volume *= (taperX1 * taperY1 + 0.5f * (taperX1 * taperY + taperX * taperY1) + 0.3333333333f * taperX * taperY);
+
+            pathBegin = (float)_pbs.PathBegin * 2.0e-5f;
+            pathEnd = 1.0f - (float)_pbs.PathEnd * 2.0e-5f;
+            volume *= (pathEnd - pathBegin);
+
+            // this is crude aproximation
+            profileBegin = (float)_pbs.ProfileBegin * 2.0e-5f;
+            profileEnd = 1.0f - (float)_pbs.ProfileEnd * 2.0e-5f;
+            volume *= (profileEnd - profileBegin);
+
+            returnMass = m_density * volume;
+
+            if (returnMass <= 0)
+                returnMass = 0.0001f;//ckrinke: Mass must be greater then zero.
+            //            else if (returnMass > _parent_scene.maximumMassObject)
+            //                returnMass = _parent_scene.maximumMassObject;
+
+
+
+            m_primMass = returnMass;
+            if (m_primMass > _parent_scene.maximumMassObject)
+                m_primMass = _parent_scene.maximumMassObject;
+
+            // Recursively calculate mass
+            bool HasChildPrim = false;
+            lock (childrenPrim)
+            {
+                if (childrenPrim.Count > 0)
+                {
+                    HasChildPrim = true;
+                }
+
+            }
+            if (HasChildPrim)
+            {
+                OdePrim[] childPrimArr = new OdePrim[0];
+
+                lock (childrenPrim)
+                    childPrimArr = childrenPrim.ToArray();
+
+                for (int i = 0; i < childPrimArr.Length; i++)
+                {
+                    if (childPrimArr[i] != null && !childPrimArr[i].m_taintremove)
+                        returnMass += childPrimArr[i].CalculateMass();
+                    // failsafe, this shouldn't happen but with OpenSim, you never know :)
+                    if (i > 256)
+                        break;
+                }
+            }
+            if (returnMass > _parent_scene.maximumMassObject)
+                returnMass = _parent_scene.maximumMassObject;
+            return returnMass;
+        }// end CalculateMass
+
+        #endregion
+
+        public void setMass()
+        {
+            if (Body != (IntPtr)0)
+            {
+                float newmass = CalculateMass();
+
+                //m_log.Info("[PHYSICS]: New Mass: " + newmass.ToString());
+
+                d.MassSetBoxTotal(out pMass, newmass, _size.X, _size.Y, _size.Z);
+                d.BodySetMass(Body, ref pMass);
+            }
+        }
+
+
+        private void UpdateDataFromGeom()
+        {
+            if (prim_geom != IntPtr.Zero)
+            {
+                d.Quaternion qtmp;
+                d.GeomCopyQuaternion(prim_geom, out qtmp);
+                _orientation.W = qtmp.W;
+                _orientation.X = qtmp.X;
+                _orientation.Y = qtmp.Y;
+                _orientation.Z = qtmp.Z;
+
+                d.Vector3 lpos = d.GeomGetPosition(prim_geom);
+                _position.X = lpos.X;
+                _position.Y = lpos.Y;
+                _position.Z = lpos.Z;
+            }
+        }
+
+        public void disableBody()
+        {
+            //this kills the body so things like 'mesh' can re-create it.
+            lock (this)
+            {
+                if (!childPrim)
+                {
+                    if (Body != IntPtr.Zero)
+                    {
+                        _parent_scene.remActivePrim(this);
+                        m_collisionCategories &= ~CollisionCategories.Body;
+                        m_collisionFlags &= ~(CollisionCategories.Wind | CollisionCategories.Land);
+
+                        if (prim_geom != IntPtr.Zero)
+                        {
+                            if (m_NoColide)
+                            {
+                                d.GeomSetCategoryBits(prim_geom, 0);
+                                d.GeomSetCollideBits(prim_geom, 0);
+                                d.GeomDisable(prim_geom);
+                            }
+                            else
+                            {
+                                d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
+                                d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
+                            }
+                        }
+
+                        UpdateDataFromGeom();
+
+                        lock (childrenPrim)
+                        {
+                            if (childrenPrim.Count > 0)
+                            {
+                                foreach (OdePrim prm in childrenPrim)
+                                {
+                                    if (prm.prim_geom != IntPtr.Zero)
+                                    {
+                                        if (prm.m_NoColide)
+                                        {
+                                            d.GeomSetCategoryBits(prm.prim_geom, 0);
+                                            d.GeomSetCollideBits(prm.prim_geom, 0);
+                                            d.GeomDisable(prm.prim_geom);
+
+                                        }
+                                        prm.UpdateDataFromGeom();
+                                    }
+                                    _parent_scene.remActivePrim(prm);
+                                    prm.Body = IntPtr.Zero;
+                                }
+                            }
+                        }
+                        d.BodyDestroy(Body);
+                        Body = IntPtr.Zero;
+                    }
+                }
+                else
+                {
+                    _parent_scene.remActivePrim(this);
+
+                    m_collisionCategories &= ~CollisionCategories.Body;
+                    m_collisionFlags &= ~(CollisionCategories.Wind | CollisionCategories.Land);
+
+                    if (prim_geom != IntPtr.Zero)
+                    {
+                        if (m_NoColide)
+                        {
+                            d.GeomSetCategoryBits(prim_geom, 0);
+                            d.GeomSetCollideBits(prim_geom, 0);
+                            d.GeomDisable(prim_geom);
+                        }
+                        else
+                        {
+                            d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
+                            d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
+                        }
+                    }
+
+                    Body = IntPtr.Zero;
+                }
+            }
+            m_disabled = true;
+            m_collisionscore = 0;
+        }
+
+//        private static Dictionary<IMesh, IntPtr> m_MeshToTriMeshMap = new Dictionary<IMesh, IntPtr>();
+
+        public bool setMesh(OdeScene parent_scene, IMesh mesh)
+        {
+            //Kill Body so that mesh can re-make the geom
+            if (IsPhysical && Body != IntPtr.Zero)
+            {
+                if (childPrim)
+                {
+                    if (_parent != null)
+                    {
+                        OdePrim parent = (OdePrim)_parent;
+                        parent.ChildDelink(this);
+                    }
+                }
+                else
+                {
+                    disableBody();
+                }
+            }
+
+            IntPtr vertices, indices;
+            int vertexCount, indexCount;
+            int vertexStride, triStride;
+            mesh.getVertexListAsPtrToFloatArray(out vertices, out vertexStride, out vertexCount); // Note, that vertices are fixed in unmanaged heap
+            mesh.getIndexListAsPtrToIntArray(out indices, out triStride, out indexCount); // Also fixed, needs release after usage
+
+            // warning this destroys the mesh for eventual future use. Only pinned float arrays stay valid
+            mesh.releaseSourceMeshData(); // free up the original mesh data to save memory
+
+            if (vertexCount == 0 || indexCount == 0)
+            {
+                m_log.WarnFormat("[PHYSICS]: Got invalid mesh on prim {0} at <{1},{2},{3}>. mesh UUID {4}", Name, _position.X, _position.Y, _position.Z, _pbs.SculptTexture.ToString());
+                return false;
+            }
+
+            IntPtr geo = IntPtr.Zero;
+            try
+            {
+                _triMeshData = d.GeomTriMeshDataCreate();
+                d.GeomTriMeshDataBuildSimple(_triMeshData, vertices, vertexStride, vertexCount, indices, indexCount, triStride);
+                d.GeomTriMeshDataPreprocess(_triMeshData);
+
+                _parent_scene.waitForSpaceUnlock(m_targetSpace);
+
+                 geo = d.CreateTriMesh(m_targetSpace, _triMeshData, null, null, null);
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[PHYSICS]: Create trimesh failed on prim {0} : {1}",Name,e.Message);
+
+                if (_triMeshData != IntPtr.Zero)
+                {
+                    d.GeomTriMeshDataDestroy(_triMeshData);
+                    _triMeshData = IntPtr.Zero;
+                }
+                return false;
+            }
+
+            SetGeom(geo);
+
+            return true;
+        }
+
+        public void ProcessTaints(float timestep) //=============================================================================
+        {
+            if (m_taintadd)
+            {
+                changeadd(timestep);
+            }
+
+            if (m_taintremove)
+                return;
+
+            if (prim_geom != IntPtr.Zero)
+            {
+                if (!_position.ApproxEquals(m_taintposition, 0f))
+                {
+                    changemove(timestep);
+                }
+                if (m_taintrot != _orientation)
+                {
+                    if (childPrim && IsPhysical)        // For physical child prim...
+                    {
+                        rotate(timestep);
+                        // KF: ODE will also rotate the parent prim!
+                        // so rotate the root back to where it was
+                        OdePrim parent = (OdePrim)_parent;
+                        parent.rotate(timestep);
+                    }
+                    else
+                    {
+                        //Just rotate the prim
+                        rotate(timestep);
+                    }
+                }
+                //
+                if (m_taintphantom != m_isphantom )
+                {
+                    changePhantomStatus();
+                }//
+
+                if (m_taintPhysics != m_isphysical && !(m_taintparent != _parent))
+                {
+                    changePhysicsStatus(timestep);
+                }//
+
+
+                if (!_size.ApproxEquals(m_taintsize, 0f))
+                    changesize(timestep);
+                //
+
+                if(m_taintshapetype != m_shapetype)
+                {
+                    m_shapetype = m_taintshapetype;
+                    changeshape(timestep);
+                }
+
+                if (m_taintshape)
+                    changeshape(timestep);
+                //
+
+                if (m_taintforce)
+                    changeAddForce(timestep);
+
+                if (m_taintaddangularforce)
+                    changeAddAngularForce(timestep);
+
+                if (!m_taintTorque.ApproxEquals(Vector3.Zero, 0.001f))
+                    changeSetTorque(timestep);
+
+                if (m_taintdisable)
+                    changedisable(timestep);
+
+                if (m_taintselected != m_isSelected)
+                    changeSelectedStatus();
+
+                if (!m_taintVelocity.ApproxEquals(Vector3.Zero, 0.001f))
+                    changevelocity(timestep);
+
+                if (m_taintparent != _parent)
+                    changelink(timestep);
+
+                if (m_taintCollidesWater != m_collidesWater)
+                    changefloatonwater(timestep);
+
+                if (m_taintvehicledata != null)
+                    DoSetVehicle();
+
+                /* obsolete                    
+                                if (!m_angularLock.ApproxEquals(m_taintAngularLock,0f))
+                                    changeAngularLock(timestep);
+                 */
+            }
+
+            else
+            {
+                m_log.Error("[PHYSICS]: prim {0} at <{1},{2},{3}> as invalid geom");
+
+                // not sure this will not flame...
+                m_taintremove = true;
+                _parent_scene.AddPhysicsActorTaint(this);
+            }
+
+        }
+
+        private void changelink(float timestep)
+        {
+            // If the newly set parent is not null
+            // create link
+            if (_parent == null && m_taintparent != null)
+            {
+                if (m_taintparent.PhysicsActorType == (int)ActorTypes.Prim)
+                {
+                    OdePrim obj = (OdePrim)m_taintparent;
+                    obj.ParentPrim(this);
+                }
+            }
+            // If the newly set parent is null
+            // destroy link
+            else if (_parent != null && m_taintparent == null)
+            {
+                if (_parent is OdePrim)
+                {
+                    OdePrim obj = (OdePrim)_parent;
+                    obj.ChildDelink(this);
+                    childPrim = false;
+                }
+            }
+
+            _parent = m_taintparent;
+            m_taintPhysics = m_isphysical;
+        }
+
+        // I'm the parent
+        // prim is the child
+        public void ParentPrim(OdePrim prim)
+        {
+            if (this.m_localID != prim.m_localID)
+            {
+                if (Body == IntPtr.Zero)
+                {
+                    Body = d.BodyCreate(_parent_scene.world);
+                    // disconnect from world gravity so we can apply buoyancy
+                    d.BodySetGravityMode(Body, false);
+
+                    setMass();
+                }
+                if (Body != IntPtr.Zero)
+                {
+                    lock (childrenPrim)
+                    {
+                        if (!childrenPrim.Contains(prim))
+                        {
+                            childrenPrim.Add(prim);
+
+                            foreach (OdePrim prm in childrenPrim)
+                            {
+                                d.Mass m2;
+                                d.MassSetZero(out m2);
+                                d.MassSetBoxTotal(out m2, prim.CalculateMass(), prm._size.X, prm._size.Y, prm._size.Z);
+
+
+                                d.Quaternion quat = new d.Quaternion();
+                                quat.W = prm._orientation.W;
+                                quat.X = prm._orientation.X;
+                                quat.Y = prm._orientation.Y;
+                                quat.Z = prm._orientation.Z;
+
+                                d.Matrix3 mat = new d.Matrix3();
+                                d.RfromQ(out mat, ref quat);
+                                d.MassRotate(ref m2, ref mat);
+                                d.MassTranslate(ref m2, Position.X - prm.Position.X, Position.Y - prm.Position.Y, Position.Z - prm.Position.Z);
+                                d.MassAdd(ref pMass, ref m2);
+                            }
+                            foreach (OdePrim prm in childrenPrim)
+                            {
+                                if (m_isphantom && !prm.m_isVolumeDetect)
+                                {
+                                    prm.m_collisionCategories = 0;
+                                    prm.m_collisionFlags = CollisionCategories.Land;
+                                }
+                                else
+                                {
+                                    prm.m_collisionCategories |= CollisionCategories.Body;
+                                    prm.m_collisionFlags |= (CollisionCategories.Land | CollisionCategories.Wind);
+                                }
+                                if (prm.prim_geom == IntPtr.Zero)
+                                {
+                                    m_log.Warn("[PHYSICS]: Unable to link one of the linkset elements.  No geom yet");
+                                    continue;
+                                }
+
+                                if (prm.m_NoColide)
+                                {
+                                    d.GeomSetCategoryBits(prm.prim_geom, 0);
+                                    d.GeomSetCollideBits(prm.prim_geom, (int)CollisionCategories.Land);
+                                }
+                                else
+                                {
+                                    d.GeomSetCategoryBits(prm.prim_geom, (int)prm.m_collisionCategories);
+                                    d.GeomSetCollideBits(prm.prim_geom, (int)prm.m_collisionFlags);
+                                }
+
+                                d.Quaternion quat = new d.Quaternion();
+                                quat.W = prm._orientation.W;
+                                quat.X = prm._orientation.X;
+                                quat.Y = prm._orientation.Y;
+                                quat.Z = prm._orientation.Z;
+
+                                d.Matrix3 mat = new d.Matrix3();
+                                d.RfromQ(out mat, ref quat);
+                                if (Body != IntPtr.Zero)
+                                {
+                                    d.GeomSetBody(prm.prim_geom, Body);
+                                    prm.childPrim = true;
+                                    d.GeomSetOffsetWorldPosition(prm.prim_geom, prm.Position.X, prm.Position.Y, prm.Position.Z);
+                                    //d.GeomSetOffsetPosition(prim.prim_geom,
+                                    //    (Position.X - prm.Position.X) - pMass.c.X,
+                                    //    (Position.Y - prm.Position.Y) - pMass.c.Y,
+                                    //    (Position.Z - prm.Position.Z) - pMass.c.Z);
+                                    d.GeomSetOffsetWorldRotation(prm.prim_geom, ref mat);
+                                    //d.GeomSetOffsetRotation(prm.prim_geom, ref mat);
+                                    d.MassTranslate(ref pMass, -pMass.c.X, -pMass.c.Y, -pMass.c.Z);
+                                    d.BodySetMass(Body, ref pMass);
+                                }
+                                else
+                                {
+                                    m_log.Debug("[PHYSICS]:I ain't got no boooooooooddy, no body");
+                                }
+
+                                prm.m_interpenetrationcount = 0;
+                                prm.m_collisionscore = 0;
+                                prm.m_disabled = false;
+
+                                prm.Body = Body;
+
+                                    _parent_scene.addActivePrim(prm);
+                            }
+
+                            if (m_isphantom && !m_isVolumeDetect)
+                            {
+                                m_collisionCategories = 0;
+                                m_collisionFlags = CollisionCategories.Land;
+                            }
+                            else
+                            {
+                                m_collisionCategories |= CollisionCategories.Body;
+                                m_collisionFlags |= (CollisionCategories.Land | CollisionCategories.Wind);
+                            }
+
+                            if (m_NoColide)
+                            {
+                                d.GeomSetCategoryBits(prim_geom, 0);
+                                d.GeomSetCollideBits(prim_geom, (int)CollisionCategories.Land);
+                            }
+                            else
+                            {
+                                d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
+                                d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
+                            }
+
+                            d.Quaternion quat2 = new d.Quaternion();
+                            quat2.W = _orientation.W;
+                            quat2.X = _orientation.X;
+                            quat2.Y = _orientation.Y;
+                            quat2.Z = _orientation.Z;
+
+                            d.Matrix3 mat2 = new d.Matrix3();
+                            d.RfromQ(out mat2, ref quat2);
+                            d.GeomSetBody(prim_geom, Body);
+                            d.GeomSetOffsetWorldPosition(prim_geom, Position.X - pMass.c.X, Position.Y - pMass.c.Y, Position.Z - pMass.c.Z);
+                            //d.GeomSetOffsetPosition(prim.prim_geom,
+                            //    (Position.X - prm.Position.X) - pMass.c.X,
+                            //    (Position.Y - prm.Position.Y) - pMass.c.Y,
+                            //    (Position.Z - prm.Position.Z) - pMass.c.Z);
+                            //d.GeomSetOffsetRotation(prim_geom, ref mat2);
+                            d.MassTranslate(ref pMass, -pMass.c.X, -pMass.c.Y, -pMass.c.Z);
+                            d.BodySetMass(Body, ref pMass);
+
+                            d.BodySetAutoDisableFlag(Body, true);
+                            d.BodySetAutoDisableSteps(Body, body_autodisable_frames);
+
+                            m_interpenetrationcount = 0;
+                            m_collisionscore = 0;
+                            m_disabled = false;
+
+                            d.BodySetPosition(Body, Position.X, Position.Y, Position.Z);
+                            if (m_type != Vehicle.TYPE_NONE) Enable(Body, _parent_scene);
+
+                            _parent_scene.addActivePrim(this);
+                        }
+                    }
+                }
+            }
+        }
+
+        private void ChildSetGeom(OdePrim odePrim)
+        {
+            lock (childrenPrim)
+            {
+                foreach (OdePrim prm in childrenPrim)
+                {
+                    prm.disableBody();
+                }
+            }
+            disableBody();
+
+            if (Body != IntPtr.Zero)
+            {
+                _parent_scene.remActivePrim(this);
+            }
+
+            lock (childrenPrim)
+            {
+                foreach (OdePrim prm in childrenPrim)
+                {
+                    ParentPrim(prm);
+                }
+            }
+        }
+
+        private void ChildDelink(OdePrim odePrim)
+        {
+            // Okay, we have a delinked child..   need to rebuild the body.
+            lock (childrenPrim)
+            {
+                foreach (OdePrim prm in childrenPrim)
+                {
+                    prm.childPrim = true;
+                    prm.disableBody();
+                }
+            }
+            disableBody();
+
+            lock (childrenPrim)
+            {
+                childrenPrim.Remove(odePrim);
+            }
+
+            if (Body != IntPtr.Zero)
+            {
+                _parent_scene.remActivePrim(this);
+            }
+
+            lock (childrenPrim)
+            {
+                foreach (OdePrim prm in childrenPrim)
+                {
+                    ParentPrim(prm);
+                }
+            }
+        }
+
+        private void changePhantomStatus()
+        {
+            m_taintphantom = m_isphantom;
+            changeSelectedStatus();
+        }
+
+/* not in use
+        private void SetCollider()
+        {
+            SetCollider(m_isSelected, m_isphysical, m_isphantom, m_isSelected);
+        }
+
+        private void SetCollider(bool sel, bool phys, bool phan, bool vdtc)
+        {
+            if (sel)
+            {
+                m_collisionCategories = CollisionCategories.Selected;
+                m_collisionFlags = (CollisionCategories.Sensor | CollisionCategories.Space);
+            }
+            else
+            {
+                if (phan && !vdtc)
+                {
+                    m_collisionCategories = 0;
+                    if (phys)
+                        m_collisionFlags = CollisionCategories.Land;
+                    else
+                        m_collisionFlags = 0; // this case should not happen non physical phantoms should not have physics
+                }
+                else
+                {
+                    m_collisionCategories = CollisionCategories.Geom;
+                    if (phys)
+                        m_collisionCategories |= CollisionCategories.Body;
+
+                    m_collisionFlags = m_default_collisionFlags;
+
+                    if (m_collidesLand)
+                        m_collisionFlags |= CollisionCategories.Land;
+                    if (m_collidesWater)
+                        m_collisionFlags |= CollisionCategories.Water;
+                }
+            }
+
+            if (prim_geom != IntPtr.Zero)
+            {
+                if (m_NoColide)
+                {
+                    d.GeomSetCategoryBits(prim_geom, 0);
+                    if (phys)
+                        d.GeomSetCollideBits(prim_geom, (int)CollisionCategories.Land);
+                    else
+                    {
+                        d.GeomSetCollideBits(prim_geom, 0);
+                        d.GeomDisable(prim_geom);
+                    }
+                }
+                else
+                {
+                    d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
+                    d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
+                }
+            }
+        }
+*/
+
+        private void changeSelectedStatus()
+        {
+            if (m_taintselected)
+            {
+                m_collisionCategories = CollisionCategories.Selected;
+                m_collisionFlags = (CollisionCategories.Sensor | CollisionCategories.Space);
+
+                // We do the body disable soft twice because 'in theory' a collision could have happened
+                // in between the disabling and the collision properties setting
+                // which would wake the physical body up from a soft disabling and potentially cause it to fall
+                // through the ground.
+
+                // NOTE FOR JOINTS: this doesn't always work for jointed assemblies because if you select
+                // just one part of the assembly, the rest of the assembly is non-selected and still simulating,
+                // so that causes the selected part to wake up and continue moving.
+
+                // even if you select all parts of a jointed assembly, it is not guaranteed that the entire
+                // assembly will stop simulating during the selection, because of the lack of atomicity
+                // of select operations (their processing could be interrupted by a thread switch, causing
+                // simulation to continue before all of the selected object notifications trickle down to
+                // the physics engine).
+
+                // e.g. we select 100 prims that are connected by joints. non-atomically, the first 50 are
+                // selected and disabled. then, due to a thread switch, the selection processing is
+                // interrupted and the physics engine continues to simulate, so the last 50 items, whose
+                // selection was not yet processed, continues to simulate. this wakes up ALL of the 
+                // first 50 again. then the last 50 are disabled. then the first 50, which were just woken
+                // up, start simulating again, which in turn wakes up the last 50.
+
+                if (m_isphysical)
+                {
+                    disableBodySoft();
+                }
+
+                if (prim_geom != IntPtr.Zero)
+                {
+                    d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
+                    d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
+                    if (m_NoColide)
+                        d.GeomDisable(prim_geom);
+                }
+
+                if (m_isphysical)
+                {
+                    disableBodySoft();
+                }
+                if (Body != IntPtr.Zero)
+                {
+                    d.BodySetLinearVel(Body, 0f, 0f, 0f);
+                    d.BodySetForce(Body, 0f, 0f, 0f);
+                    d.BodySetAngularVel(Body, 0.0f, 0.0f, 0.0f);
+                    d.BodySetTorque(Body, 0.0f, 0.0f, 0.0f);
+                }
+            }
+            else
+            {
+                if (m_isphantom && !m_isVolumeDetect)
+                {
+                    m_collisionCategories = 0;
+                    if (m_isphysical)
+                        m_collisionFlags = CollisionCategories.Land;
+                    else
+                        m_collisionFlags = 0; // this case should not happen non physical phantoms should not have physics
+                }
+                else
+                {
+                    m_collisionCategories = CollisionCategories.Geom;
+                    if (m_isphysical)
+                        m_collisionCategories |= CollisionCategories.Body;
+
+                    m_collisionFlags = m_default_collisionFlags;
+
+                    if (m_collidesLand)
+                        m_collisionFlags |= CollisionCategories.Land;
+                    if (m_collidesWater)
+                        m_collisionFlags |= CollisionCategories.Water;
+                }
+
+                if (prim_geom != IntPtr.Zero)
+                {
+                    if (m_NoColide)
+                    {
+                        d.GeomSetCategoryBits(prim_geom, 0);
+                        if (m_isphysical)
+                            d.GeomSetCollideBits(prim_geom, (int)CollisionCategories.Land);
+                        else
+                        {
+                            d.GeomSetCollideBits(prim_geom, 0);
+                            d.GeomDisable(prim_geom);
+                        }
+                    }
+                    else
+                    {
+                        d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
+                        d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
+                    }
+                }
+                if (Body != IntPtr.Zero)
+                {
+                    d.BodySetLinearVel(Body, 0f, 0f, 0f);
+                    d.BodySetForce(Body, 0f, 0f, 0f);
+                    d.BodySetAngularVel(Body, 0.0f, 0.0f, 0.0f);
+                    d.BodySetTorque(Body, 0.0f, 0.0f, 0.0f);
+                }
+
+                if (m_isphysical)
+                {
+                    if (Body != IntPtr.Zero)
+                    {
+                        enableBodySoft();
+                    }
+                }
+            }
+
+            resetCollisionAccounting();
+            m_isSelected = m_taintselected;
+        }//end changeSelectedStatus
+
+        public void ResetTaints()
+        {
+            m_taintposition = _position;
+            m_taintrot = _orientation;
+            m_taintPhysics = m_isphysical;
+            m_taintselected = m_isSelected;
+            m_taintsize = _size;
+            m_taintshape = false;
+            m_taintforce = false;
+            m_taintdisable = false;
+            m_taintVelocity = Vector3.Zero;
+        }
+
+        public void CreateGeom(IntPtr m_targetSpace, IMesh _mesh)
+        {
+            bool gottrimesh = false;
+
+            m_NoColide = false; // assume all will go well
+
+            if (_triMeshData != IntPtr.Zero)
+            {
+                d.GeomTriMeshDataDestroy(_triMeshData);
+                _triMeshData = IntPtr.Zero;
+            }
+
+            if (_mesh != null)
+            {
+                gottrimesh = setMesh(_parent_scene, _mesh);
+                if (!gottrimesh)
+                {
+                    // getting a mesh failed,
+                    // lets go on having a basic box or sphere, with prim size but not coliding
+                    // physical colides with land, non with nothing
+
+                    m_NoColide = true;
+                }
+            }
+
+            if (!gottrimesh)
+            { // we will have a basic box or sphere
+                IntPtr geo = IntPtr.Zero;
+
+                if (_pbs.ProfileShape == ProfileShape.HalfCircle && _pbs.PathCurve == (byte)Extrusion.Curve1
+                    && _size.X == _size.Y && _size.X == _size.Z)
+                {
+                    // its a sphere
+                    _parent_scene.waitForSpaceUnlock(m_targetSpace);
+                    try
+                    {
+                        geo = d.CreateSphere(m_targetSpace, _size.X * 0.5f);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.WarnFormat("[PHYSICS]: Unable to create basic sphere for object {0}", e.Message);
+                        geo = IntPtr.Zero;
+                        ode.dunlock(_parent_scene.world);
+                    }
+                }
+                else // make it a box
+                {
+                    _parent_scene.waitForSpaceUnlock(m_targetSpace);
+                    try
+                    {
+                        geo = d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.WarnFormat("[PHYSICS]: Unable to create basic sphere for object {0}", e.Message);
+                        geo = IntPtr.Zero;
+                        ode.dunlock(_parent_scene.world);
+                    }
+                }
+
+                if (geo == IntPtr.Zero) // if this happens it must be fixed
+                {
+                    // if it does lets stop what we can
+                    // not sure this will not flame...
+
+                    m_taintremove = true;
+                    _parent_scene.AddPhysicsActorTaint(this);
+                    return;
+                }
+
+                SetGeom(geo); // this processes the m_NoColide
+            }
+        }
+
+        public void changeadd(float timestep)
+        {
+            int[] iprimspaceArrItem = _parent_scene.calculateSpaceArrayItemFromPos(_position);
+            IntPtr targetspace = _parent_scene.calculateSpaceForGeom(_position);
+
+            if (targetspace == IntPtr.Zero)
+                targetspace = _parent_scene.createprimspace(iprimspaceArrItem[0], iprimspaceArrItem[1]);
+
+            m_targetSpace = targetspace;
+
+            if (_mesh == null) // && m_meshfailed == false)
+            {
+                if (_parent_scene.needsMeshing(_pbs))
+                {
+                    bool convex;
+                    if (m_shapetype == 2)
+                        convex = true;
+                    else
+                        convex = false;
+                    try
+                    {
+                        _mesh = _parent_scene.mesher.CreateMesh(m_primName, _pbs, _size, (int)LevelOfDetail.High, true,false,convex,false);
+                    }
+                    catch
+                    {
+                        //Don't continuously try to mesh prims when meshing has failed
+                        m_meshfailed = true;
+                        _mesh = null;
+                        m_log.WarnFormat("[PHYSICS]: changeAdd CreateMesh fail on prim {0} at <{1},{2},{3}>", Name, _position.X, _position.Y, _position.Z);
+                    }
+                }
+            }
+
+            lock (_parent_scene.OdeLock)
+            {
+                CreateGeom(m_targetSpace, _mesh);
+
+                if (prim_geom != IntPtr.Zero)
+                {
+                    d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
+                    d.Quaternion myrot = new d.Quaternion();
+                    myrot.X = _orientation.X;
+                    myrot.Y = _orientation.Y;
+                    myrot.Z = _orientation.Z;
+                    myrot.W = _orientation.W;
+                    d.GeomSetQuaternion(prim_geom, ref myrot);
+                }
+
+                if (m_isphysical && Body == IntPtr.Zero)
+                {
+                    enableBody();
+                }
+            }
+
+            changeSelectedStatus();
+
+            m_taintadd = false;
+        }
+
+        public void changemove(float timestep)
+        {
+            if (m_isphysical)
+            {
+                //                if (!m_disabled && !m_taintremove && !childPrim)  After one edit m_disabled is sometimes set, disabling further edits!
+                if (!m_taintremove && !childPrim)
+                {
+                    if (Body == IntPtr.Zero)
+                        enableBody();
+                    //Prim auto disable after 20 frames,
+                    //if you move it, re-enable the prim manually.
+                    if (_parent != null)
+                    {
+                        if (m_linkJoint != IntPtr.Zero)
+                        {
+                            d.JointDestroy(m_linkJoint);
+                            m_linkJoint = IntPtr.Zero;
+                        }
+                    }
+                    if (Body != IntPtr.Zero)
+                    {
+                        d.BodySetPosition(Body, _position.X, _position.Y, _position.Z);
+
+                        if (_parent != null)
+                        {
+                            OdePrim odParent = (OdePrim)_parent;
+                            if (Body != (IntPtr)0 && odParent.Body != (IntPtr)0 && Body != odParent.Body)
+                            {
+                                // KF: Fixed Joints were removed? Anyway - this Console.WriteLine does not show up, so routine is not used??
+                                Console.WriteLine("ODEPrim JointCreateFixed !!!");
+                                m_linkJoint = d.JointCreateFixed(_parent_scene.world, _linkJointGroup);
+                                d.JointAttach(m_linkJoint, Body, odParent.Body);
+                                d.JointSetFixed(m_linkJoint);
+                            }
+                        }
+                        d.BodyEnable(Body);
+                        if (m_type != Vehicle.TYPE_NONE)
+                        {
+                            Enable(Body, _parent_scene);
+                        }
+                    }
+                    else
+                    {
+                        m_log.Warn("[PHYSICS]: Body Still null after enableBody().  This is a crash scenario.");
+                    }
+                }
+                //else
+                // {
+                //m_log.Debug("[BUG]: race!");
+                //}
+            }
+            else
+            {
+                // string primScenAvatarIn = _parent_scene.whichspaceamIin(_position);
+                // int[] arrayitem = _parent_scene.calculateSpaceArrayItemFromPos(_position);
+                _parent_scene.waitForSpaceUnlock(m_targetSpace);
+
+                IntPtr tempspace = _parent_scene.recalculateSpaceForGeom(prim_geom, _position, m_targetSpace);
+                m_targetSpace = tempspace;
+
+                _parent_scene.waitForSpaceUnlock(m_targetSpace);
+                if (prim_geom != IntPtr.Zero)
+                {
+                    d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
+
+                    _parent_scene.waitForSpaceUnlock(m_targetSpace);
+                    d.SpaceAdd(m_targetSpace, prim_geom);
+                }
+            }
+
+            changeSelectedStatus();
+
+            resetCollisionAccounting();
+            m_taintposition = _position;
+        }
+
+        public void rotate(float timestep)
+        {
+            d.Quaternion myrot = new d.Quaternion();
+            myrot.X = _orientation.X;
+            myrot.Y = _orientation.Y;
+            myrot.Z = _orientation.Z;
+            myrot.W = _orientation.W;
+            if (Body != IntPtr.Zero)
+            {
+                // KF: If this is a root prim do BodySet
+                d.BodySetQuaternion(Body, ref myrot);
+            }
+            else
+            {
+                // daughter prim, do Geom set
+                d.GeomSetQuaternion(prim_geom, ref myrot);
+            }
+
+            resetCollisionAccounting();
+            m_taintrot = _orientation;
+        }
+
+        private void resetCollisionAccounting()
+        {
+            m_collisionscore = 0;
+            m_interpenetrationcount = 0;
+            m_disabled = false;
+        }
+
+        public void changedisable(float timestep)
+        {
+            m_disabled = true;
+            if (Body != IntPtr.Zero)
+            {
+                d.BodyDisable(Body);
+                Body = IntPtr.Zero;
+            }
+
+            m_taintdisable = false;
+        }
+
+        public void changePhysicsStatus(float timestep)
+        {
+            if (m_isphysical == true)
+            {
+                if (Body == IntPtr.Zero)
+                {
+                    if (_pbs.SculptEntry && _parent_scene.meshSculptedPrim)
+                    {
+                        changeshape(2f);
+                    }
+                    else
+                    {
+                        enableBody();
+                    }
+                }
+            }
+            else
+            {
+                if (Body != IntPtr.Zero)
+                {
+                    if (_pbs.SculptEntry && _parent_scene.meshSculptedPrim)
+                    {
+                        _mesh = null;
+                        changeadd(2f);
+                    }
+                    if (childPrim)
+                    {
+                        if (_parent != null)
+                        {
+                            OdePrim parent = (OdePrim)_parent;
+                            parent.ChildDelink(this);
+                        }
+                    }
+                    else
+                    {
+                        disableBody();
+                    }
+                }
+            }
+
+            changeSelectedStatus();
+
+            resetCollisionAccounting();
+            m_taintPhysics = m_isphysical;
+        }
+
+        public void changesize(float timestamp)
+        {
+
+            string oldname = _parent_scene.geom_name_map[prim_geom];
+
+            if (_size.X <= 0) _size.X = 0.01f;
+            if (_size.Y <= 0) _size.Y = 0.01f;
+            if (_size.Z <= 0) _size.Z = 0.01f;
+
+            // Cleanup of old prim geometry
+            if (_mesh != null)
+            {
+                // Cleanup meshing here
+            }
+            //kill body to rebuild
+            if (IsPhysical && Body != IntPtr.Zero)
+            {
+                if (childPrim)
+                {
+                    if (_parent != null)
+                    {
+                        OdePrim parent = (OdePrim)_parent;
+                        parent.ChildDelink(this);
+                    }
+                }
+                else
+                {
+                    disableBody();
+                }
+            }
+            if (d.SpaceQuery(m_targetSpace, prim_geom))
+            {
+                _parent_scene.waitForSpaceUnlock(m_targetSpace);
+                d.SpaceRemove(m_targetSpace, prim_geom);
+            }
+            // we don't need to do space calculation because the client sends a position update also.
+
+            // Construction of new prim
+            if (_parent_scene.needsMeshing(_pbs))// && m_meshfailed == false)
+            {
+                float meshlod = _parent_scene.meshSculptLOD;
+
+                if (IsPhysical)
+                    meshlod = _parent_scene.MeshSculptphysicalLOD;
+                // Don't need to re-enable body..   it's done in SetMesh
+
+                IMesh mesh = null;
+
+                try
+                {
+                    if (_parent_scene.needsMeshing(_pbs))
+                        mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, (int)LevelOfDetail.High, true);
+                }
+                catch
+                {
+                    m_meshfailed = true;
+                    mesh = null;
+                    m_log.WarnFormat("[PHYSICS]: changeSize CreateMesh fail on prim {0} at <{1},{2},{3}>", Name, _position.X, _position.Y, _position.Z);
+                }
+
+                //IMesh mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical);
+                CreateGeom(m_targetSpace, mesh);
+            }
+            else
+            {
+                _mesh = null;
+                CreateGeom(m_targetSpace, _mesh);
+            }
+
+            d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
+            d.Quaternion myrot = new d.Quaternion();
+            myrot.X = _orientation.X;
+            myrot.Y = _orientation.Y;
+            myrot.Z = _orientation.Z;
+            myrot.W = _orientation.W;
+            d.GeomSetQuaternion(prim_geom, ref myrot);
+
+            //d.GeomBoxSetLengths(prim_geom, _size.X, _size.Y, _size.Z);
+            if (IsPhysical && Body == IntPtr.Zero && !childPrim)
+            {
+                // Re creates body on size.
+                // EnableBody also does setMass()
+                enableBody();
+                d.BodyEnable(Body);
+            }
+
+            _parent_scene.geom_name_map[prim_geom] = oldname;
+
+            changeSelectedStatus();
+            if (childPrim)
+            {
+                if (_parent is OdePrim)
+                {
+                    OdePrim parent = (OdePrim)_parent;
+                    parent.ChildSetGeom(this);
+                }
+            }
+            resetCollisionAccounting();
+            m_taintsize = _size;
+        }
+
+
+
+        public void changefloatonwater(float timestep)
+        {
+            m_collidesWater = m_taintCollidesWater;
+
+            if (prim_geom != IntPtr.Zero)
+            {
+                if (m_collidesWater)
+                {
+                    m_collisionFlags |= CollisionCategories.Water;
+                }
+                else
+                {
+                    m_collisionFlags &= ~CollisionCategories.Water;
+                }
+                d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
+            }
+        }
+
+        public void changeshape(float timestamp)
+        {
+            string oldname = _parent_scene.geom_name_map[prim_geom];
+
+            // Cleanup of old prim geometry and Bodies
+            if (IsPhysical && Body != IntPtr.Zero)
+            {
+                if (childPrim)
+                {
+                    if (_parent != null)
+                    {
+                        OdePrim parent = (OdePrim)_parent;
+                        parent.ChildDelink(this);
+                    }
+                }
+                else
+                {
+                    disableBody();
+                }
+            }
+
+
+            // we don't need to do space calculation because the client sends a position update also.
+            if (_size.X <= 0) _size.X = 0.01f;
+            if (_size.Y <= 0) _size.Y = 0.01f;
+            if (_size.Z <= 0) _size.Z = 0.01f;
+            // Construction of new prim
+
+            if (_parent_scene.needsMeshing(_pbs))// && m_meshfailed == false)
+            {
+                // Don't need to re-enable body..   it's done in SetMesh
+                float meshlod = _parent_scene.meshSculptLOD;
+                IMesh mesh;
+
+                if (IsPhysical)
+                    meshlod = _parent_scene.MeshSculptphysicalLOD;
+
+                bool convex;
+                if (m_shapetype == 2)
+                    convex = true;
+                else
+                    convex = false;
+
+                try
+                {
+                    mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, (int)LevelOfDetail.High, true, false,convex,false);
+                }
+                catch
+                {
+                    mesh = null;
+                    m_meshfailed = true;
+                    m_log.WarnFormat("[PHYSICS]: changeAdd CreateMesh fail on prim {0} at <{1},{2},{3}>", Name, _position.X, _position.Y, _position.Z);
+                }
+
+                CreateGeom(m_targetSpace, mesh);
+
+                // createmesh returns null when it doesn't mesh.
+            }
+            else
+            {
+                _mesh = null;
+                CreateGeom(m_targetSpace, null);
+            }
+
+            d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
+            d.Quaternion myrot = new d.Quaternion();
+            //myrot.W = _orientation.w;
+            myrot.W = _orientation.W;
+            myrot.X = _orientation.X;
+            myrot.Y = _orientation.Y;
+            myrot.Z = _orientation.Z;
+            d.GeomSetQuaternion(prim_geom, ref myrot);
+
+            //d.GeomBoxSetLengths(prim_geom, _size.X, _size.Y, _size.Z);
+            if (IsPhysical && Body == IntPtr.Zero)
+            {
+                // Re creates body on size.
+                // EnableBody also does setMass()
+                enableBody();
+                if (Body != IntPtr.Zero)
+                {
+                    d.BodyEnable(Body);
+                }
+            }
+            _parent_scene.geom_name_map[prim_geom] = oldname;
+
+            changeSelectedStatus();
+            if (childPrim)
+            {
+                if (_parent is OdePrim)
+                {
+                    OdePrim parent = (OdePrim)_parent;
+                    parent.ChildSetGeom(this);
+                }
+            }
+            resetCollisionAccounting();
+            m_taintshape = false;
+        }
+
+        public void changeAddForce(float timestamp)
+        {
+            if (!m_isSelected)
+            {
+                lock (m_forcelist)
+                {
+                    //m_log.Info("[PHYSICS]: dequeing forcelist");
+                    if (IsPhysical)
+                    {
+                        Vector3 iforce = Vector3.Zero;
+                        int i = 0;
+                        try
+                        {
+                            for (i = 0; i < m_forcelist.Count; i++)
+                            {
+
+                                iforce = iforce + (m_forcelist[i] * 100);
+                            }
+                        }
+                        catch (IndexOutOfRangeException)
+                        {
+                            m_forcelist = new List<Vector3>();
+                            m_collisionscore = 0;
+                            m_interpenetrationcount = 0;
+                            m_taintforce = false;
+                            return;
+                        }
+                        catch (ArgumentOutOfRangeException)
+                        {
+                            m_forcelist = new List<Vector3>();
+                            m_collisionscore = 0;
+                            m_interpenetrationcount = 0;
+                            m_taintforce = false;
+                            return;
+                        }
+                        d.BodyEnable(Body);
+
+                        d.BodyAddForce(Body, iforce.X, iforce.Y, iforce.Z);
+                    }
+                    m_forcelist.Clear();
+                }
+
+                m_collisionscore = 0;
+                m_interpenetrationcount = 0;
+            }
+
+            m_taintforce = false;
+
+        }
+
+
+
+        public void changeSetTorque(float timestamp)
+        {
+            if (!m_isSelected)
+            {
+                if (IsPhysical && Body != IntPtr.Zero)
+                {
+                    d.BodySetTorque(Body, m_taintTorque.X, m_taintTorque.Y, m_taintTorque.Z);
+                }
+            }
+
+            m_taintTorque = Vector3.Zero;
+        }
+
+        public void changeAddAngularForce(float timestamp)
+        {
+            if (!m_isSelected)
+            {
+                lock (m_angularforcelist)
+                {
+                    //m_log.Info("[PHYSICS]: dequeing forcelist");
+                    if (IsPhysical)
+                    {
+                        Vector3 iforce = Vector3.Zero;
+                        for (int i = 0; i < m_angularforcelist.Count; i++)
+                        {
+                            iforce = iforce + (m_angularforcelist[i] * 100);
+                        }
+                        d.BodyEnable(Body);
+                        d.BodyAddTorque(Body, iforce.X, iforce.Y, iforce.Z);
+
+                    }
+                    m_angularforcelist.Clear();
+                }
+
+                m_collisionscore = 0;
+                m_interpenetrationcount = 0;
+            }
+
+            m_taintaddangularforce = false;
+        }
+
+        private void changevelocity(float timestep)
+        {
+            if (!m_isSelected)
+            {
+                Thread.Sleep(20);
+                if (IsPhysical)
+                {
+                    if (Body != IntPtr.Zero)
+                        d.BodySetLinearVel(Body, m_taintVelocity.X, m_taintVelocity.Y, m_taintVelocity.Z);
+                }
+
+                //resetCollisionAccounting();
+            }
+            m_taintVelocity = Vector3.Zero;
+        }
+
+        public void UpdatePositionAndVelocity()
+        {
+            return;   // moved to the Move () method
+        }
+
+        public d.Mass FromMatrix4(Matrix4 pMat, ref d.Mass obj)
+        {
+            obj.I.M00 = pMat[0, 0];
+            obj.I.M01 = pMat[0, 1];
+            obj.I.M02 = pMat[0, 2];
+            obj.I.M10 = pMat[1, 0];
+            obj.I.M11 = pMat[1, 1];
+            obj.I.M12 = pMat[1, 2];
+            obj.I.M20 = pMat[2, 0];
+            obj.I.M21 = pMat[2, 1];
+            obj.I.M22 = pMat[2, 2];
+            return obj;
+        }
+
+        public override void SubscribeEvents(int ms)
+        {
+            m_eventsubscription = ms;
+            _parent_scene.addCollisionEventReporting(this);
+        }
+
+        public override void UnSubscribeEvents()
+        {
+            _parent_scene.remCollisionEventReporting(this);
+            m_eventsubscription = 0;
+        }
+
+        public void AddCollisionEvent(uint CollidedWith, ContactPoint contact)
+        {
+            if (CollisionEventsThisFrame == null)
+                CollisionEventsThisFrame = new CollisionEventUpdate();
+            CollisionEventsThisFrame.AddCollider(CollidedWith, contact);
+        }
+
+        public void SendCollisions()
+        {
+            if (CollisionEventsThisFrame == null)
+                return;
+
+            base.SendCollisionUpdate(CollisionEventsThisFrame);
+
+            if (CollisionEventsThisFrame.m_objCollisionList.Count == 0)
+                CollisionEventsThisFrame = null;
+            else
+                CollisionEventsThisFrame = new CollisionEventUpdate();
+        }
+
+        public override bool SubscribedEvents()
+        {
+            if (m_eventsubscription > 0)
+                return true;
+            return false;
+        }
+
+        public static Matrix4 Inverse(Matrix4 pMat)
+        {
+            if (determinant3x3(pMat) == 0)
+            {
+                return Matrix4.Identity; // should probably throw an error.  singluar matrix inverse not possible
+            }
+
+
+
+            return (Adjoint(pMat) / determinant3x3(pMat));
+        }
+
+        public static Matrix4 Adjoint(Matrix4 pMat)
+        {
+            Matrix4 adjointMatrix = new Matrix4();
+            for (int i = 0; i < 4; i++)
+            {
+                for (int j = 0; j < 4; j++)
+                {
+                    Matrix4SetValue(ref adjointMatrix, i, j, (float)(Math.Pow(-1, i + j) * (determinant3x3(Minor(pMat, i, j)))));
+                }
+            }
+
+            adjointMatrix = Transpose(adjointMatrix);
+            return adjointMatrix;
+        }
+
+        public static Matrix4 Minor(Matrix4 matrix, int iRow, int iCol)
+        {
+            Matrix4 minor = new Matrix4();
+            int m = 0, n = 0;
+            for (int i = 0; i < 4; i++)
+            {
+                if (i == iRow)
+                    continue;
+                n = 0;
+                for (int j = 0; j < 4; j++)
+                {
+                    if (j == iCol)
+                        continue;
+                    Matrix4SetValue(ref minor, m, n, matrix[i, j]);
+                    n++;
+                }
+                m++;
+            }
+            return minor;
+        }
+
+        public static Matrix4 Transpose(Matrix4 pMat)
+        {
+            Matrix4 transposeMatrix = new Matrix4();
+            for (int i = 0; i < 4; i++)
+                for (int j = 0; j < 4; j++)
+                    Matrix4SetValue(ref transposeMatrix, i, j, pMat[j, i]);
+            return transposeMatrix;
+        }
+
+        public static void Matrix4SetValue(ref Matrix4 pMat, int r, int c, float val)
+        {
+            switch (r)
+            {
+                case 0:
+                    switch (c)
+                    {
+                        case 0:
+                            pMat.M11 = val;
+                            break;
+                        case 1:
+                            pMat.M12 = val;
+                            break;
+                        case 2:
+                            pMat.M13 = val;
+                            break;
+                        case 3:
+                            pMat.M14 = val;
+                            break;
+                    }
+
+                    break;
+                case 1:
+                    switch (c)
+                    {
+                        case 0:
+                            pMat.M21 = val;
+                            break;
+                        case 1:
+                            pMat.M22 = val;
+                            break;
+                        case 2:
+                            pMat.M23 = val;
+                            break;
+                        case 3:
+                            pMat.M24 = val;
+                            break;
+                    }
+
+                    break;
+                case 2:
+                    switch (c)
+                    {
+                        case 0:
+                            pMat.M31 = val;
+                            break;
+                        case 1:
+                            pMat.M32 = val;
+                            break;
+                        case 2:
+                            pMat.M33 = val;
+                            break;
+                        case 3:
+                            pMat.M34 = val;
+                            break;
+                    }
+
+                    break;
+                case 3:
+                    switch (c)
+                    {
+                        case 0:
+                            pMat.M41 = val;
+                            break;
+                        case 1:
+                            pMat.M42 = val;
+                            break;
+                        case 2:
+                            pMat.M43 = val;
+                            break;
+                        case 3:
+                            pMat.M44 = val;
+                            break;
+                    }
+
+                    break;
+            }
+        }
+        private static float determinant3x3(Matrix4 pMat)
+        {
+            float det = 0;
+            float diag1 = pMat[0, 0] * pMat[1, 1] * pMat[2, 2];
+            float diag2 = pMat[0, 1] * pMat[2, 1] * pMat[2, 0];
+            float diag3 = pMat[0, 2] * pMat[1, 0] * pMat[2, 1];
+            float diag4 = pMat[2, 0] * pMat[1, 1] * pMat[0, 2];
+            float diag5 = pMat[2, 1] * pMat[1, 2] * pMat[0, 0];
+            float diag6 = pMat[2, 2] * pMat[1, 0] * pMat[0, 1];
+
+            det = diag1 + diag2 + diag3 - (diag4 + diag5 + diag6);
+            return det;
+
+        }
+
+        private static void DMassCopy(ref d.Mass src, ref d.Mass dst)
+        {
+            dst.c.W = src.c.W;
+            dst.c.X = src.c.X;
+            dst.c.Y = src.c.Y;
+            dst.c.Z = src.c.Z;
+            dst.mass = src.mass;
+            dst.I.M00 = src.I.M00;
+            dst.I.M01 = src.I.M01;
+            dst.I.M02 = src.I.M02;
+            dst.I.M10 = src.I.M10;
+            dst.I.M11 = src.I.M11;
+            dst.I.M12 = src.I.M12;
+            dst.I.M20 = src.I.M20;
+            dst.I.M21 = src.I.M21;
+            dst.I.M22 = src.I.M22;
+        }
+
+        public override void SetMaterial(int pMaterial)
+        {
+            m_material = pMaterial;
+        }
+
+        internal void ProcessFloatVehicleParam(Vehicle pParam, float pValue)
+        {
+            switch (pParam)
+            {
+                case Vehicle.ANGULAR_DEFLECTION_EFFICIENCY:
+                    if (pValue < 0.01f) pValue = 0.01f;
+                    // m_angularDeflectionEfficiency = pValue;
+                    break;
+                case Vehicle.ANGULAR_DEFLECTION_TIMESCALE:
+                    if (pValue < 0.1f) pValue = 0.1f;
+                    // m_angularDeflectionTimescale = pValue;
+                    break;
+                case Vehicle.ANGULAR_MOTOR_DECAY_TIMESCALE:
+                    if (pValue < 0.3f) pValue = 0.3f;
+                    m_angularMotorDecayTimescale = pValue;
+                    break;
+                case Vehicle.ANGULAR_MOTOR_TIMESCALE:
+                    if (pValue < 0.3f) pValue = 0.3f;
+                    m_angularMotorTimescale = pValue;
+                    break;
+                case Vehicle.BANKING_EFFICIENCY:
+                    if (pValue < 0.01f) pValue = 0.01f;
+                    // m_bankingEfficiency = pValue;
+                    break;
+                case Vehicle.BANKING_MIX:
+                    if (pValue < 0.01f) pValue = 0.01f;
+                    // m_bankingMix = pValue;
+                    break;
+                case Vehicle.BANKING_TIMESCALE:
+                    if (pValue < 0.01f) pValue = 0.01f;
+                    // m_bankingTimescale = pValue;
+                    break;
+                case Vehicle.BUOYANCY:
+                    if (pValue < -1f) pValue = -1f;
+                    if (pValue > 1f) pValue = 1f;
+                    m_VehicleBuoyancy = pValue;
+                    break;
+                //                case Vehicle.HOVER_EFFICIENCY:
+                //                      if (pValue < 0f) pValue = 0f;
+                //                      if (pValue > 1f) pValue = 1f;
+                //                    m_VhoverEfficiency = pValue;
+                //                    break;
+                case Vehicle.HOVER_HEIGHT:
+                    m_VhoverHeight = pValue;
+                    break;
+                case Vehicle.HOVER_TIMESCALE:
+                    if (pValue < 0.1f) pValue = 0.1f;
+                    m_VhoverTimescale = pValue;
+                    break;
+                case Vehicle.LINEAR_DEFLECTION_EFFICIENCY:
+                    if (pValue < 0.01f) pValue = 0.01f;
+                    // m_linearDeflectionEfficiency = pValue;
+                    break;
+                case Vehicle.LINEAR_DEFLECTION_TIMESCALE:
+                    if (pValue < 0.01f) pValue = 0.01f;
+                    // m_linearDeflectionTimescale = pValue;
+                    break;
+                case Vehicle.LINEAR_MOTOR_DECAY_TIMESCALE:
+                    if (pValue < 0.3f) pValue = 0.3f;
+                    m_linearMotorDecayTimescale = pValue;
+                    break;
+                case Vehicle.LINEAR_MOTOR_TIMESCALE:
+                    if (pValue < 0.1f) pValue = 0.1f;
+                    m_linearMotorTimescale = pValue;
+                    break;
+                case Vehicle.VERTICAL_ATTRACTION_EFFICIENCY:
+                    if (pValue < 0.1f) pValue = 0.1f;   // Less goes unstable
+                    if (pValue > 1.0f) pValue = 1.0f;
+                    m_verticalAttractionEfficiency = pValue;
+                    break;
+                case Vehicle.VERTICAL_ATTRACTION_TIMESCALE:
+                    if (pValue < 0.1f) pValue = 0.1f;
+                    m_verticalAttractionTimescale = pValue;
+                    break;
+
+                // These are vector properties but the engine lets you use a single float value to 
+                // set all of the components to the same value
+                case Vehicle.ANGULAR_FRICTION_TIMESCALE:
+                    if (pValue > 30f) pValue = 30f;
+                    if (pValue < 0.1f) pValue = 0.1f;
+                    m_angularFrictionTimescale = new Vector3(pValue, pValue, pValue);
+                    break;
+                case Vehicle.ANGULAR_MOTOR_DIRECTION:
+                    m_angularMotorDirection = new Vector3(pValue, pValue, pValue);
+                    UpdateAngDecay();
+                    break;
+                case Vehicle.LINEAR_FRICTION_TIMESCALE:
+                    if (pValue < 0.1f) pValue = 0.1f;
+                    m_linearFrictionTimescale = new Vector3(pValue, pValue, pValue);
+                    break;
+                case Vehicle.LINEAR_MOTOR_DIRECTION:
+                    m_linearMotorDirection = new Vector3(pValue, pValue, pValue);
+                    UpdateLinDecay();
+                    break;
+                case Vehicle.LINEAR_MOTOR_OFFSET:
+                    // m_linearMotorOffset = new Vector3(pValue, pValue, pValue);
+                    break;
+
+            }
+
+        }//end ProcessFloatVehicleParam
+
+        internal void ProcessVectorVehicleParam(Vehicle pParam, Vector3 pValue)
+        {
+            switch (pParam)
+            {
+                case Vehicle.ANGULAR_FRICTION_TIMESCALE:
+                    if (pValue.X > 30f) pValue.X = 30f;
+                    if (pValue.X < 0.1f) pValue.X = 0.1f;
+                    if (pValue.Y > 30f) pValue.Y = 30f;
+                    if (pValue.Y < 0.1f) pValue.Y = 0.1f;
+                    if (pValue.Z > 30f) pValue.Z = 30f;
+                    if (pValue.Z < 0.1f) pValue.Z = 0.1f;
+                    m_angularFrictionTimescale = new Vector3(pValue.X, pValue.Y, pValue.Z);
+                    break;
+                case Vehicle.ANGULAR_MOTOR_DIRECTION:
+                    m_angularMotorDirection = new Vector3(pValue.X, pValue.Y, pValue.Z);
+                    // Limit requested angular speed to 2 rps= 4 pi rads/sec
+                    if (m_angularMotorDirection.X > 12.56f) m_angularMotorDirection.X = 12.56f;
+                    if (m_angularMotorDirection.X < -12.56f) m_angularMotorDirection.X = -12.56f;
+                    if (m_angularMotorDirection.Y > 12.56f) m_angularMotorDirection.Y = 12.56f;
+                    if (m_angularMotorDirection.Y < -12.56f) m_angularMotorDirection.Y = -12.56f;
+                    if (m_angularMotorDirection.Z > 12.56f) m_angularMotorDirection.Z = 12.56f;
+                    if (m_angularMotorDirection.Z < -12.56f) m_angularMotorDirection.Z = -12.56f;
+                    UpdateAngDecay();
+                    break;
+                case Vehicle.LINEAR_FRICTION_TIMESCALE:
+                    if (pValue.X < 0.1f) pValue.X = 0.1f;
+                    if (pValue.Y < 0.1f) pValue.Y = 0.1f;
+                    if (pValue.Z < 0.1f) pValue.Z = 0.1f;
+                    m_linearFrictionTimescale = new Vector3(pValue.X, pValue.Y, pValue.Z);
+                    break;
+                case Vehicle.LINEAR_MOTOR_DIRECTION:
+                    m_linearMotorDirection = new Vector3(pValue.X, pValue.Y, pValue.Z); // velocity requested by LSL, for max limiting
+                    UpdateLinDecay();
+                    break;
+                case Vehicle.LINEAR_MOTOR_OFFSET:
+                    // m_linearMotorOffset = new Vector3(pValue.X, pValue.Y, pValue.Z);
+                    break;
+            }
+
+        }//end ProcessVectorVehicleParam
+
+        internal void ProcessRotationVehicleParam(Vehicle pParam, Quaternion pValue)
+        {
+            switch (pParam)
+            {
+                case Vehicle.REFERENCE_FRAME:
+                    // m_referenceFrame = pValue;
+                    break;
+            }
+
+        }//end ProcessRotationVehicleParam
+
+        internal void ProcessVehicleFlags(int pParam, bool remove)
+        {
+            if (remove)
+            {
+                m_flags &= ~((VehicleFlag)pParam);
+            }
+            else
+            {
+                m_flags |= (VehicleFlag)pParam;
+            }
+        }
+
+        internal void ProcessTypeChange(Vehicle pType)
+        {
+            // Set Defaults For Type
+            m_type = pType;
+            switch (pType)
+            {
+                case Vehicle.TYPE_SLED:
+                    m_linearFrictionTimescale = new Vector3(30, 1, 1000);
+                    m_angularFrictionTimescale = new Vector3(30, 30, 30);
+                    //                     m_lLinMotorVel = Vector3.Zero;
+                    m_linearMotorTimescale = 1000;
+                    m_linearMotorDecayTimescale = 120;
+                    m_angularMotorDirection = Vector3.Zero;
+                    m_angularMotorDVel = Vector3.Zero;
+                    m_angularMotorTimescale = 1000;
+                    m_angularMotorDecayTimescale = 120;
+                    m_VhoverHeight = 0;
+                    //                    m_VhoverEfficiency = 1;
+                    m_VhoverTimescale = 10;
+                    m_VehicleBuoyancy = 0;
+                    // m_linearDeflectionEfficiency = 1;
+                    // m_linearDeflectionTimescale = 1;
+                    // m_angularDeflectionEfficiency = 1;
+                    // m_angularDeflectionTimescale = 1000;
+                    // m_bankingEfficiency = 0;
+                    // m_bankingMix = 1;
+                    // m_bankingTimescale = 10;
+                    // m_referenceFrame = Quaternion.Identity;
+                    m_flags &=
+                        ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
+                          VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY);
+                    m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.LIMIT_MOTOR_UP);
+                    break;
+                case Vehicle.TYPE_CAR:
+                    m_linearFrictionTimescale = new Vector3(100, 2, 1000);
+                    m_angularFrictionTimescale = new Vector3(30, 30, 30);               // was 1000, but sl max frict time is 30.
+                    //                     m_lLinMotorVel = Vector3.Zero;
+                    m_linearMotorTimescale = 1;
+                    m_linearMotorDecayTimescale = 60;
+                    m_angularMotorDirection = Vector3.Zero;
+                    m_angularMotorDVel = Vector3.Zero;
+                    m_angularMotorTimescale = 1;
+                    m_angularMotorDecayTimescale = 0.8f;
+                    m_VhoverHeight = 0;
+                    //                    m_VhoverEfficiency = 0;
+                    m_VhoverTimescale = 1000;
+                    m_VehicleBuoyancy = 0;
+                    // // m_linearDeflectionEfficiency = 1;
+                    // // m_linearDeflectionTimescale = 2;
+                    // // m_angularDeflectionEfficiency = 0;
+                    // m_angularDeflectionTimescale = 10;
+                    m_verticalAttractionEfficiency = 1f;
+                    m_verticalAttractionTimescale = 10f;
+                    // m_bankingEfficiency = -0.2f;
+                    // m_bankingMix = 1;
+                    // m_bankingTimescale = 1;
+                    // m_referenceFrame = Quaternion.Identity;
+                    m_flags &= ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT);
+                    m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.HOVER_UP_ONLY |
+                                VehicleFlag.LIMIT_MOTOR_UP);
+                    break;
+                case Vehicle.TYPE_BOAT:
+                    m_linearFrictionTimescale = new Vector3(10, 3, 2);
+                    m_angularFrictionTimescale = new Vector3(10, 10, 10);
+                    //                     m_lLinMotorVel = Vector3.Zero;
+                    m_linearMotorTimescale = 5;
+                    m_linearMotorDecayTimescale = 60;
+                    m_angularMotorDirection = Vector3.Zero;
+                    m_angularMotorDVel = Vector3.Zero;
+                    m_angularMotorTimescale = 4;
+                    m_angularMotorDecayTimescale = 4;
+                    m_VhoverHeight = 0;
+                    //                    m_VhoverEfficiency = 0.5f;
+                    m_VhoverTimescale = 2;
+                    m_VehicleBuoyancy = 1;
+                    // m_linearDeflectionEfficiency = 0.5f;
+                    // m_linearDeflectionTimescale = 3;
+                    // m_angularDeflectionEfficiency = 0.5f;
+                    // m_angularDeflectionTimescale = 5;
+                    m_verticalAttractionEfficiency = 0.5f;
+                    m_verticalAttractionTimescale = 5f;
+                    // m_bankingEfficiency = -0.3f;
+                    // m_bankingMix = 0.8f;
+                    // m_bankingTimescale = 1;
+                    // m_referenceFrame = Quaternion.Identity;
+                    m_flags &= ~(VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.LIMIT_ROLL_ONLY |
+                            VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY);
+                    m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.HOVER_WATER_ONLY |
+                                VehicleFlag.LIMIT_MOTOR_UP);
+                    break;
+                case Vehicle.TYPE_AIRPLANE:
+                    m_linearFrictionTimescale = new Vector3(200, 10, 5);
+                    m_angularFrictionTimescale = new Vector3(20, 20, 20);
+                    //                     m_lLinMotorVel = Vector3.Zero;
+                    m_linearMotorTimescale = 2;
+                    m_linearMotorDecayTimescale = 60;
+                    m_angularMotorDirection = Vector3.Zero;
+                    m_angularMotorDVel = Vector3.Zero;
+                    m_angularMotorTimescale = 4;
+                    m_angularMotorDecayTimescale = 4;
+                    m_VhoverHeight = 0;
+                    //                    m_VhoverEfficiency = 0.5f;
+                    m_VhoverTimescale = 1000;
+                    m_VehicleBuoyancy = 0;
+                    // m_linearDeflectionEfficiency = 0.5f;
+                    // m_linearDeflectionTimescale = 3;
+                    // m_angularDeflectionEfficiency = 1;
+                    // m_angularDeflectionTimescale = 2;
+                    m_verticalAttractionEfficiency = 0.9f;
+                    m_verticalAttractionTimescale = 2f;
+                    // m_bankingEfficiency = 1;
+                    // m_bankingMix = 0.7f;
+                    // m_bankingTimescale = 2;
+                    // m_referenceFrame = Quaternion.Identity;
+                    m_flags &= ~(VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
+                        VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY | VehicleFlag.LIMIT_MOTOR_UP);
+                    m_flags |= (VehicleFlag.LIMIT_ROLL_ONLY);
+                    break;
+                case Vehicle.TYPE_BALLOON:
+                    m_linearFrictionTimescale = new Vector3(5, 5, 5);
+                    m_angularFrictionTimescale = new Vector3(10, 10, 10);
+                    m_linearMotorTimescale = 5;
+                    m_linearMotorDecayTimescale = 60;
+                    m_angularMotorDirection = Vector3.Zero;
+                    m_angularMotorDVel = Vector3.Zero;
+                    m_angularMotorTimescale = 6;
+                    m_angularMotorDecayTimescale = 10;
+                    m_VhoverHeight = 5;
+                    //                    m_VhoverEfficiency = 0.8f;
+                    m_VhoverTimescale = 10;
+                    m_VehicleBuoyancy = 1;
+                    // m_linearDeflectionEfficiency = 0;
+                    // m_linearDeflectionTimescale = 5;
+                    // m_angularDeflectionEfficiency = 0;
+                    // m_angularDeflectionTimescale = 5;
+                    m_verticalAttractionEfficiency = 1f;
+                    m_verticalAttractionTimescale = 100f;
+                    // m_bankingEfficiency = 0;
+                    // m_bankingMix = 0.7f;
+                    // m_bankingTimescale = 5;
+                    // m_referenceFrame = Quaternion.Identity;
+                    m_flags &= ~(VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
+                        VehicleFlag.HOVER_UP_ONLY | VehicleFlag.LIMIT_MOTOR_UP);
+                    m_flags |= (VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT);
+                    break;
+
+            }
+        }//end SetDefaultsForType
+
+        internal void Enable(IntPtr pBody, OdeScene pParentScene)
+        {
+            if (m_type == Vehicle.TYPE_NONE)
+                return;
+
+            m_body = pBody;
+        }
+
+
+        internal void Halt()
+        {       // Kill all motions, when non-physical
+            //  m_linearMotorDirection = Vector3.Zero;
+            m_lLinMotorDVel = Vector3.Zero;
+            m_lLinObjectVel = Vector3.Zero;
+            m_wLinObjectVel = Vector3.Zero;
+            m_angularMotorDirection = Vector3.Zero;
+            m_lastAngularVelocity = Vector3.Zero;
+            m_angularMotorDVel = Vector3.Zero;
+            _acceleration = Vector3.Zero;
+        }
+
+        private void UpdateLinDecay()
+        {
+            m_lLinMotorDVel.X = m_linearMotorDirection.X;
+            m_lLinMotorDVel.Y = m_linearMotorDirection.Y;
+            m_lLinMotorDVel.Z = m_linearMotorDirection.Z;
+        } // else let the motor decay on its own
+
+        private void UpdateAngDecay()
+        {
+            m_angularMotorDVel.X = m_angularMotorDirection.X;
+            m_angularMotorDVel.Y = m_angularMotorDirection.Y;
+            m_angularMotorDVel.Z = m_angularMotorDirection.Z;
+        } // else let the motor decay on its own
+
+        public void Move(float timestep)
+        {
+            float fx = 0;
+            float fy = 0;
+            float fz = 0;
+            Vector3 linvel;                             // velocity applied, including any reversal
+
+            // If geomCrossingFailuresBeforeOutofbounds is set to 0 in OpenSim.ini then phys objects bounce off region borders.
+            // This is a temp patch until proper region crossing is developed. 
+
+
+            if (IsPhysical && (Body != IntPtr.Zero) && !m_isSelected && !childPrim && !m_outofBounds)           // Only move root prims.
+            {
+                //  Old public void UpdatePositionAndVelocity(), more accuratley calculated here
+                bool lastZeroFlag = _zeroFlag;  // was it stopped
+
+                d.Vector3 vec = d.BodyGetPosition(Body);
+                Vector3 l_position = Vector3.Zero;
+                l_position.X = vec.X;
+                l_position.Y = vec.Y;
+                l_position.Z = vec.Z;
+                m_lastposition = _position;
+                _position = l_position;
+
+                d.Quaternion ori = d.BodyGetQuaternion(Body);
+                //       Quaternion l_orientation = Quaternion.Identity;
+                _orientation.X = ori.X;
+                _orientation.Y = ori.Y;
+                _orientation.Z = ori.Z;
+                _orientation.W = ori.W;
+                m_lastorientation = _orientation;
+
+                d.Vector3 vel = d.BodyGetLinearVel(Body);
+                m_lastVelocity = _velocity;
+                _velocity.X = vel.X;
+                _velocity.Y = vel.Y;
+                _velocity.Z = vel.Z;
+                _acceleration = ((_velocity - m_lastVelocity) / timestep);
+
+                d.Vector3 torque = d.BodyGetTorque(Body);
+                _torque = new Vector3(torque.X, torque.Y, torque.Z);
+
+
+                if (_position.X < 0f || _position.X > _parent_scene.WorldExtents.X
+                    || _position.Y < 0f || _position.Y > _parent_scene.WorldExtents.Y
+                    )
+                {
+                    // we are outside current region
+                    // clip position to a stop just outside region and stop it only internally
+                    // do it only once using m_crossingfailures as control
+                    _position.X = Util.Clip(l_position.X, -0.2f, _parent_scene.WorldExtents.X + .2f);
+                    _position.Y = Util.Clip(l_position.Y, -0.2f, _parent_scene.WorldExtents.Y + .2f);
+                    _position.Z = Util.Clip(l_position.Z, -100f, 50000f);
+                    d.BodySetPosition(Body, _position.X, _position.Y, _position.Z);
+                    d.BodySetLinearVel(Body, 0, 0, 0);
+                    m_outofBounds = true;
+                    base.RequestPhysicsterseUpdate();
+                    return;
+                }
+
+                base.RequestPhysicsterseUpdate();
+
+                if (l_position.Z < 0)
+                {
+                    // This is so prim that get lost underground don't fall forever and suck up
+                    //
+                    // Sim resources and memory.
+                    // Disables the prim's movement physics....
+                    // It's a hack and will generate a console message if it fails.
+
+                    //IsPhysical = false;
+                    if (_parent == null) base.RaiseOutOfBounds(_position);
+
+
+                    _acceleration.X = 0;                        // This stuff may stop client display but it has no
+                    _acceleration.Y = 0;                        // effect on the object in phys engine!
+                    _acceleration.Z = 0;
+
+                    _velocity.X = 0;
+                    _velocity.Y = 0;
+                    _velocity.Z = 0;
+                    m_lastVelocity = Vector3.Zero;
+                    m_rotationalVelocity.X = 0;
+                    m_rotationalVelocity.Y = 0;
+                    m_rotationalVelocity.Z = 0;
+
+                    if (_parent == null) base.RequestPhysicsterseUpdate();
+
+                    m_throttleUpdates = false;
+                    throttleCounter = 0;
+                    _zeroFlag = true;
+                    //outofBounds = true;
+                }  // end neg Z check
+
+                // Is it moving?
+                /*   if ((Math.Abs(m_lastposition.X - l_position.X) < 0.02)
+                       && (Math.Abs(m_lastposition.Y - l_position.Y) < 0.02)
+                       && (Math.Abs(m_lastposition.Z - l_position.Z) < 0.02) */
+                if ((Vector3.Mag(_velocity) < 0.01) &&                         // moving very slowly
+                     (Vector3.Mag(_velocity) < Vector3.Mag(m_lastVelocity)) &&  // decelerating
+                     (1.0 - Math.Abs(Quaternion.Dot(m_lastorientation, _orientation)) < 0.0001))  // spinning very slowly
+                {
+                    _zeroFlag = true;
+                    m_throttleUpdates = false;
+                }
+                else
+                {
+                    //m_log.Debug(Math.Abs(m_lastposition.X - l_position.X).ToString());
+                    _zeroFlag = false;
+                    m_lastUpdateSent = false;
+                    //m_throttleUpdates = false;
+                }
+
+                if (_zeroFlag)
+                {               // Its stopped
+                    _velocity.X = 0.0f;
+                    _velocity.Y = 0.0f;
+                    //        _velocity.Z = 0.0f;
+
+                    _acceleration.X = 0;
+                    _acceleration.Y = 0;
+                    //        _acceleration.Z = 0;
+
+                    m_rotationalVelocity.X = 0;
+                    m_rotationalVelocity.Y = 0;
+                    m_rotationalVelocity.Z = 0;
+                    // Stop it in the phys engine
+                    d.BodySetLinearVel(Body, 0.0f, 0.0f, _velocity.Z);
+                    d.BodySetAngularVel(Body, 0.0f, 0.0f, 0.0f);
+                    d.BodySetForce(Body, 0f, 0f, 0f);
+
+                    if (!m_lastUpdateSent)
+                    {
+                        m_throttleUpdates = false;
+                        throttleCounter = 0;
+                        if (_parent == null)
+                        {
+                            base.RequestPhysicsterseUpdate();
+                        }
+
+                        m_lastUpdateSent = true;
+                    }
+                }
+                else
+                {                       // Its moving
+                    if (lastZeroFlag != _zeroFlag)
+                    {
+                        if (_parent == null)
+                        {
+                            base.RequestPhysicsterseUpdate();
+                        }
+                    }
+                    m_lastUpdateSent = false;
+                    if (!m_throttleUpdates || throttleCounter > _parent_scene.geomUpdatesPerThrottledUpdate)
+                    {
+                        if (_parent == null)
+                        {
+                            base.RequestPhysicsterseUpdate();
+                        }
+                    }
+                    else
+                    {
+                        throttleCounter++;
+                    }
+                }
+                m_lastposition = l_position;
+
+                /// End UpdatePositionAndVelocity insert     
+
+
+                // Rotation lock  =====================================
+                if (m_rotateEnableUpdate)
+                {
+                    // Snapshot current angles, set up Amotor(s)
+                    m_rotateEnableUpdate = false;
+                    m_rotateEnable = m_rotateEnableRequest;
+                    //Console.WriteLine("RotEnable {0} = {1}",m_primName,  m_rotateEnable);
+
+                    if (Amotor != IntPtr.Zero)
+                    {
+                        d.JointDestroy(Amotor);
+                        Amotor = IntPtr.Zero;
+                        //Console.WriteLine("Old Amotor Destroyed");                        
+                    }
+
+                    if (!m_rotateEnable.ApproxEquals(Vector3.One, 0.003f))
+                    {   // not all are enabled
+                        d.Quaternion r = d.BodyGetQuaternion(Body);
+                        Quaternion locrot = new Quaternion(r.X, r.Y, r.Z, r.W);
+                        // extract the axes vectors
+                        Vector3 vX = new Vector3(1f, 0f, 0f);
+                        Vector3 vY = new Vector3(0f, 1f, 0f);
+                        Vector3 vZ = new Vector3(0f, 0f, 1f);
+                        vX = vX * locrot;
+                        vY = vY * locrot;
+                        vZ = vZ * locrot;
+                        // snapshot the current angle vectors
+                        m_lockX = vX;
+                        m_lockY = vY;
+                        m_lockZ = vZ;
+                        //           m_lockRot = locrot;
+                        Amotor = d.JointCreateAMotor(_parent_scene.world, IntPtr.Zero);
+                        d.JointAttach(Amotor, Body, IntPtr.Zero);
+                        d.JointSetAMotorMode(Amotor, 0);  // User mode??
+                        //Console.WriteLine("New Amotor Created for {0}", m_primName);                   
+
+                        float axisnum = 3;  // how many to lock
+                        axisnum = (axisnum - (m_rotateEnable.X + m_rotateEnable.Y + m_rotateEnable.Z));
+                        d.JointSetAMotorNumAxes(Amotor, (int)axisnum);
+                        //Console.WriteLine("AxisNum={0}",(int)axisnum);                       
+
+                        int i = 0;
+
+                        if (m_rotateEnable.X == 0)
+                        {
+                            d.JointSetAMotorAxis(Amotor, i, 0, m_lockX.X, m_lockX.Y, m_lockX.Z);
+                            //Console.WriteLine("AxisX {0} set to {1}", i,  m_lockX);                           
+                            i++;
+                        }
+
+                        if (m_rotateEnable.Y == 0)
+                        {
+                            d.JointSetAMotorAxis(Amotor, i, 0, m_lockY.X, m_lockY.Y, m_lockY.Z);
+                            //Console.WriteLine("AxisY {0} set to {1}", i,  m_lockY);                           
+                            i++;
+                        }
+
+                        if (m_rotateEnable.Z == 0)
+                        {
+                            d.JointSetAMotorAxis(Amotor, i, 0, m_lockZ.X, m_lockZ.Y, m_lockZ.Z);
+                            //Console.WriteLine("AxisZ {0} set to {1}", i,  m_lockZ);                           
+                            i++;
+                        }
+
+                        // These lowstops and high stops are effectively (no wiggle room)
+                        d.JointSetAMotorParam(Amotor, (int)dParam.LowStop, 0f);
+                        d.JointSetAMotorParam(Amotor, (int)dParam.LoStop3, 0f);
+                        d.JointSetAMotorParam(Amotor, (int)dParam.LoStop2, 0f);
+                        d.JointSetAMotorParam(Amotor, (int)dParam.HiStop, 0f);
+                        d.JointSetAMotorParam(Amotor, (int)dParam.HiStop3, 0f);
+                        d.JointSetAMotorParam(Amotor, (int)dParam.HiStop2, 0f);
+                        d.JointSetAMotorParam(Amotor, (int)dParam.Vel, 0f);
+                        d.JointSetAMotorParam(Amotor, (int)dParam.Vel3, 0f);
+                        d.JointSetAMotorParam(Amotor, (int)dParam.Vel2, 0f);
+                        d.JointSetAMotorParam(Amotor, (int)dParam.StopCFM, 0f);
+                        d.JointSetAMotorParam(Amotor, (int)dParam.StopCFM3, 0f);
+                        d.JointSetAMotorParam(Amotor, (int)dParam.StopCFM2, 0f);
+                    } // else none are locked
+                } // end Rotation Update  
+
+
+                // VEHICLE processing ==========================================            
+                if (m_type != Vehicle.TYPE_NONE)
+                {
+                    // get body attitude
+                    d.Quaternion rot = d.BodyGetQuaternion(Body);
+                    Quaternion rotq = new Quaternion(rot.X, rot.Y, rot.Z, rot.W);       // rotq = rotation of object
+                    Quaternion irotq = Quaternion.Inverse(rotq);
+
+                    // VEHICLE Linear Motion
+                    d.Vector3 velnow = d.BodyGetLinearVel(Body);                                        // this is in world frame
+                    Vector3 vel_now = new Vector3(velnow.X, velnow.Y, velnow.Z);
+                    m_lLinObjectVel = vel_now * irotq;
+                    if (m_linearMotorDecayTimescale < 300.0f) //setting of 300 or more disables decay rate
+                    {
+                        if (Vector3.Mag(m_lLinMotorDVel) < 1.0f)
+                        {
+                            float decayfactor = m_linearMotorDecayTimescale / timestep;
+                            Vector3 decayAmount = (m_lLinMotorDVel / decayfactor);
+                            m_lLinMotorDVel -= decayAmount;
+                        }
+                        else
+                        {
+                            float decayfactor = 3.0f - (0.57f * (float)Math.Log((double)(m_linearMotorDecayTimescale)));
+                            Vector3 decel = Vector3.Normalize(m_lLinMotorDVel) * decayfactor * timestep;
+                            m_lLinMotorDVel -= decel;
+                        }
+                        if (m_lLinMotorDVel.ApproxEquals(Vector3.Zero, 0.01f))
+                        {
+                            m_lLinMotorDVel = Vector3.Zero;
+                        }
+
+                        /*      else
+                            {
+                                if (Math.Abs(m_lLinMotorDVel.X) <  Math.Abs(m_lLinObjectVel.X)) m_lLinObjectVel.X = m_lLinMotorDVel.X;
+                                if (Math.Abs(m_lLinMotorDVel.Y) <  Math.Abs(m_lLinObjectVel.Y)) m_lLinObjectVel.Y = m_lLinMotorDVel.Y;
+                                if (Math.Abs(m_lLinMotorDVel.Z) <  Math.Abs(m_lLinObjectVel.Z)) m_lLinObjectVel.Z = m_lLinMotorDVel.Z;  
+                            } */
+                    }  // end linear motor decay
+
+                    if ((!m_lLinMotorDVel.ApproxEquals(Vector3.Zero, 0.01f)) || (!m_lLinObjectVel.ApproxEquals(Vector3.Zero, 0.01f)))
+                    {
+                        if (!d.BodyIsEnabled(Body)) d.BodyEnable(Body);
+                        if (m_linearMotorTimescale < 300.0f)
+                        {
+                            Vector3 attack_error = m_lLinMotorDVel - m_lLinObjectVel;
+                            float linfactor = m_linearMotorTimescale / timestep;
+                            Vector3 attackAmount = (attack_error / linfactor) * 1.3f;
+                            m_lLinObjectVel += attackAmount;
+                        }
+                        if (m_linearFrictionTimescale.X < 300.0f)
+                        {
+                            float fricfactor = m_linearFrictionTimescale.X / timestep;
+                            float fricX = m_lLinObjectVel.X / fricfactor;
+                            m_lLinObjectVel.X -= fricX;
+                        }
+                        if (m_linearFrictionTimescale.Y < 300.0f)
+                        {
+                            float fricfactor = m_linearFrictionTimescale.Y / timestep;
+                            float fricY = m_lLinObjectVel.Y / fricfactor;
+                            m_lLinObjectVel.Y -= fricY;
+                        }
+                        if (m_linearFrictionTimescale.Z < 300.0f)
+                        {
+                            float fricfactor = m_linearFrictionTimescale.Z / timestep;
+                            float fricZ = m_lLinObjectVel.Z / fricfactor;
+                            m_lLinObjectVel.Z -= fricZ;
+                        }
+                    }
+                    m_wLinObjectVel = m_lLinObjectVel * rotq;
+
+                    // Gravity and Buoyancy
+                    Vector3 grav = Vector3.Zero;
+                    if (m_VehicleBuoyancy < 1.0f)
+                    {
+                        // There is some gravity, make a gravity force vector
+                        // that is applied after object velocity.     
+                        d.Mass objMass;
+                        d.BodyGetMass(Body, out objMass);
+                        // m_VehicleBuoyancy: -1=2g; 0=1g; 1=0g; 
+                        grav.Z = _parent_scene.gravityz * objMass.mass * (1f - m_VehicleBuoyancy); // Applied later as a force
+                    } // else its 1.0, no gravity.
+
+                    // Hovering
+                    if ((m_flags & (VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT)) != 0)
+                    {
+                        // We should hover, get the target height
+                        d.Vector3 pos = d.BodyGetPosition(Body);
+                        if ((m_flags & VehicleFlag.HOVER_WATER_ONLY) == VehicleFlag.HOVER_WATER_ONLY)
+                        {
+                            m_VhoverTargetHeight = _parent_scene.GetWaterLevel() + m_VhoverHeight;
+                        }
+                        else if ((m_flags & VehicleFlag.HOVER_TERRAIN_ONLY) == VehicleFlag.HOVER_TERRAIN_ONLY)
+                        {
+                            m_VhoverTargetHeight = _parent_scene.GetTerrainHeightAtXY(pos.X, pos.Y) + m_VhoverHeight;
+                        }
+                        else if ((m_flags & VehicleFlag.HOVER_GLOBAL_HEIGHT) == VehicleFlag.HOVER_GLOBAL_HEIGHT)
+                        {
+                            m_VhoverTargetHeight = m_VhoverHeight;
+                        }
+
+                        if ((m_flags & VehicleFlag.HOVER_UP_ONLY) == VehicleFlag.HOVER_UP_ONLY)
+                        {
+                            // If body is aready heigher, use its height as target height
+                            if (pos.Z > m_VhoverTargetHeight) m_VhoverTargetHeight = pos.Z;
+                        }
+
+                        //                  m_VhoverEfficiency = 0f;    // 0=boucy, 1=Crit.damped
+                        //                              m_VhoverTimescale = 0f;         // time to acheive height
+                        //                              timestep  is time since last frame,in secs 
+                        float herr0 = pos.Z - m_VhoverTargetHeight;
+                        // Replace Vertical speed with correction figure if significant
+                        if (Math.Abs(herr0) > 0.01f)
+                        {
+                            //?          d.Mass objMass;
+                            //?          d.BodyGetMass(Body, out objMass);
+                            m_wLinObjectVel.Z = -((herr0 * timestep * 50.0f) / m_VhoverTimescale);
+                            //KF: m_VhoverEfficiency is not yet implemented
+                        }
+                        else
+                        {
+                            m_wLinObjectVel.Z = 0f;
+                        }
+                    }
+                    else
+                    {   // not hovering
+                        if (m_wLinObjectVel.Z == 0f)
+                        {               // Gravity rules
+                            m_wLinObjectVel.Z = vel_now.Z;
+                        }  // else the motor has it
+                    }
+                    linvel = m_wLinObjectVel;
+
+                    // Vehicle Linear  Motion done =======================================
+                    // Apply velocity
+                    d.BodySetLinearVel(Body, linvel.X, linvel.Y, linvel.Z);
+                    // apply gravity force
+                    d.BodyAddForce(Body, grav.X, grav.Y, grav.Z);
+                    //if(frcount == 0) Console.WriteLine("Vel={0}    Force={1}",linvel ,  grav);
+                    // end MoveLinear()
+
+
+                    // MoveAngular
+                    /*
+                    private Vector3 m_angularMotorDirection = Vector3.Zero;                     // angular velocity requested by LSL motor 
+        
+                    private float m_angularMotorTimescale = 0;                                          // motor angular Attack rate set by LSL
+                    private float m_angularMotorDecayTimescale = 0;                                     // motor angular Decay rate set by LSL
+                    private Vector3 m_angularFrictionTimescale = Vector3.Zero;          // body angular Friction set by LSL
+
+                    private Vector3 m_angularMotorDVel = Vector3.Zero;                          // decayed angular motor
+                    private Vector3 m_angObjectVel = Vector3.Zero;                                      // what was last applied to body
+                    */
+                    //if(frcount == 0) Console.WriteLine("MoveAngular ");       
+
+                    d.Vector3 angularObjectVel = d.BodyGetAngularVel(Body);
+                    Vector3 angObjectVel = new Vector3(angularObjectVel.X, angularObjectVel.Y, angularObjectVel.Z);
+                    angObjectVel = angObjectVel * irotq;        // ============ Converts to LOCAL rotation
+
+                    //if(frcount == 0) Console.WriteLine("V0 = {0}", angObjectVel);             
+
+                    // Decay Angular Motor 1. In SL this also depends on attack rate! decay ~= 23/Attack.
+                    float atk_decayfactor = 23.0f / (m_angularMotorTimescale * timestep);
+                    m_angularMotorDVel -= m_angularMotorDVel / atk_decayfactor;
+                    // Decay Angular Motor 2.
+                    if (m_angularMotorDecayTimescale < 300.0f)
+                    {
+                        if (Vector3.Mag(m_angularMotorDVel) < 1.0f)
+                        {
+                            float decayfactor = (m_angularMotorDecayTimescale) / timestep;
+                            Vector3 decayAmount = (m_angularMotorDVel / decayfactor);
+                            m_angularMotorDVel -= decayAmount;
+                        }
+                        else
+                        {
+                            Vector3 decel = Vector3.Normalize(m_angularMotorDVel) * timestep / m_angularMotorDecayTimescale;
+                            m_angularMotorDVel -= decel;
+                        }
+
+                        if (m_angularMotorDVel.ApproxEquals(Vector3.Zero, 0.01f))
+                        {
+                            m_angularMotorDVel = Vector3.Zero;
+                        }
+                        else
+                        {
+                            if (Math.Abs(m_angularMotorDVel.X) < Math.Abs(angObjectVel.X)) angObjectVel.X = m_angularMotorDVel.X;
+                            if (Math.Abs(m_angularMotorDVel.Y) < Math.Abs(angObjectVel.Y)) angObjectVel.Y = m_angularMotorDVel.Y;
+                            if (Math.Abs(m_angularMotorDVel.Z) < Math.Abs(angObjectVel.Z)) angObjectVel.Z = m_angularMotorDVel.Z;
+                        }
+                    } // end decay angular motor
+                    //if(frcount == 0) Console.WriteLine("MotorDvel {0}    Obj {1}", m_angularMotorDVel, angObjectVel);
+
+                    //if(frcount == 0) Console.WriteLine("VA = {0}", angObjectVel);   
+
+                    if ((!m_angularMotorDVel.ApproxEquals(Vector3.Zero, 0.01f)) || (!angObjectVel.ApproxEquals(Vector3.Zero, 0.01f)))
+                    {  // if motor or object have motion
+                        if (!d.BodyIsEnabled(Body)) d.BodyEnable(Body);
+
+                        if (m_angularMotorTimescale < 300.0f)
+                        {
+                            Vector3 attack_error = m_angularMotorDVel - angObjectVel;
+                            float angfactor = m_angularMotorTimescale / timestep;
+                            Vector3 attackAmount = (attack_error / angfactor);
+                            angObjectVel += attackAmount;
+                            //if(frcount == 0) Console.WriteLine("Accel {0}      Attk {1}",FrAaccel, attackAmount);                     
+                            //if(frcount == 0) Console.WriteLine("V2+= {0}", angObjectVel);             
+                        }
+
+                        angObjectVel.X -= angObjectVel.X / (m_angularFrictionTimescale.X * 0.7f / timestep);
+                        angObjectVel.Y -= angObjectVel.Y / (m_angularFrictionTimescale.Y * 0.7f / timestep);
+                        angObjectVel.Z -= angObjectVel.Z / (m_angularFrictionTimescale.Z * 0.7f / timestep);
+                    } // else no signif. motion
+
+                    //if(frcount == 0) Console.WriteLine("Dmotor {0}      Obj {1}", m_angularMotorDVel, angObjectVel);
+                    // Bank section tba
+                    // Deflection section tba
+                    //if(frcount == 0) Console.WriteLine("V3 = {0}", angObjectVel);             
+
+
+                    /*                  // Rotation Axis Disables:
+                                if (!m_angularEnable.ApproxEquals(Vector3.One, 0.003f))
+                                {
+                                    if (m_angularEnable.X == 0)
+                                        angObjectVel.X = 0f;
+                                    if (m_angularEnable.Y == 0)
+                                        angObjectVel.Y = 0f;
+                                    if (m_angularEnable.Z == 0)
+                                        angObjectVel.Z = 0f;
+                                }        
+                        */
+                    angObjectVel = angObjectVel * rotq; // ================ Converts to WORLD rotation
+
+                    // Vertical attractor section
+                    Vector3 vertattr = Vector3.Zero;
+
+                    if (m_verticalAttractionTimescale < 300)
+                    {
+                        float VAservo = 1.0f / (m_verticalAttractionTimescale * timestep);
+                        // make a vector pointing up
+                        Vector3 verterr = Vector3.Zero;
+                        verterr.Z = 1.0f;
+                        // rotate it to Body Angle
+                        verterr = verterr * rotq;
+                        // verterr.X and .Y are the World error ammounts. They are 0 when there is no error (Vehicle Body is 'vertical'), and .Z will be 1.
+                        // As the body leans to its side |.X| will increase to 1 and .Z fall to 0. As body inverts |.X| will fall and .Z will go
+                        // negative. Similar for tilt and |.Y|. .X and .Y must be modulated to prevent a stable inverted body.
+
+                        if (verterr.Z < 0.0f)
+                        {       // Deflection from vertical exceeds 90-degrees. This method will ensure stable return to
+                            // vertical, BUT for some reason a z-rotation is imparted to the object. TBI.
+                            //Console.WriteLine("InvertFlip");  
+                            verterr.X = 2.0f - verterr.X;
+                            verterr.Y = 2.0f - verterr.Y;
+                        }
+                        verterr *= 0.5f;
+                        // verterror is 0 (no error) to +/- 1 (max error at 180-deg tilt)
+                        Vector3 xyav = angObjectVel;
+                        xyav.Z = 0.0f;
+                        if ((!xyav.ApproxEquals(Vector3.Zero, 0.001f)) || (verterr.Z < 0.49f))
+                        {
+                            // As the body rotates around the X axis, then verterr.Y increases; Rotated around Y then .X increases, so 
+                            // Change  Body angular velocity  X based on Y, and Y based on X. Z is not changed.
+                            vertattr.X = verterr.Y;
+                            vertattr.Y = -verterr.X;
+                            vertattr.Z = 0f;
+                            //if(frcount == 0) Console.WriteLine("VAerr=" + verterr);   
+
+                            // scaling appears better usingsquare-law
+                            float damped = m_verticalAttractionEfficiency * m_verticalAttractionEfficiency;
+                            float bounce = 1.0f - damped;
+                            // 0 = crit damp, 1 = bouncy
+                            float oavz = angObjectVel.Z;   // retain z velocity
+                            // time-scaled correction, which sums, therefore is bouncy:
+                            angObjectVel = (angObjectVel + (vertattr * VAservo * 0.0333f)) * bounce;
+                            // damped, good @ < 90:
+                            angObjectVel = angObjectVel + (vertattr * VAservo * 0.0667f * damped);
+                            angObjectVel.Z = oavz;
+                            //if(frcount == 0) Console.WriteLine("VA+");                                        
+                            //Console.WriteLine("VAttr {0}         OAvel {1}", vertattr, angObjectVel);
+                        }
+                        else
+                        {
+                            // else error is very small
+                            angObjectVel.X = 0f;
+                            angObjectVel.Y = 0f;
+                            //if(frcount == 0) Console.WriteLine("VA0");                                        
+                        }
+                    } // else vertical attractor is off
+                    //if(frcount == 0) Console.WriteLine("V1 = {0}", angObjectVel);             
+
+
+                    m_lastAngularVelocity = angObjectVel;
+                    // apply Angular Velocity to body
+                    d.BodySetAngularVel(Body, m_lastAngularVelocity.X, m_lastAngularVelocity.Y, m_lastAngularVelocity.Z);
+                    //if(frcount == 0) Console.WriteLine("V4 = {0}", m_lastAngularVelocity);            
+
+                }  // end VEHICLES
+                else
+                {
+                    // Dyamics (NON-'VEHICLES') are dealt with here ================================================================                    
+
+                    if (!d.BodyIsEnabled(Body)) d.BodyEnable(Body); // KF add 161009
+
+                    /// Dynamics Buoyancy
+                    //KF: m_buoyancy is set by llSetBuoyancy() and is for non-vehicle.
+                    // m_buoyancy: (unlimited value) <0=Falls fast; 0=1g; 1=0g; >1 = floats up 
+                    // NB Prims in ODE are no subject to global gravity
+                    // This should only affect gravity operations 
+
+                    float m_mass = CalculateMass();
+                    // calculate z-force due togravity on object.
+                    fz = _parent_scene.gravityz * (1.0f - m_buoyancy) * m_mass; // force = acceleration * mass
+                    if ((m_usePID) && (m_PIDTau > 0.0f))  // Dynamics  llMoveToTarget.
+                    {
+                        fz = 0;     // llMoveToTarget ignores gravity.
+                        // it also ignores mass of object, and any physical resting on it.
+                        // Vector3 m_PIDTarget is where we are going
+                        // float m_PIDTau is time to get there
+                        fx = 0;
+                        fy = 0;
+                        d.Vector3 pos = d.BodyGetPosition(Body);
+                        Vector3 error = new Vector3(
+                                (m_PIDTarget.X - pos.X),
+                                (m_PIDTarget.Y - pos.Y),
+                                (m_PIDTarget.Z - pos.Z));
+                        if (error.ApproxEquals(Vector3.Zero, 0.01f))
+                        {   // Very close, Jump there and quit move
+
+                            d.BodySetPosition(Body, m_PIDTarget.X, m_PIDTarget.Y, m_PIDTarget.Z);
+                            _target_velocity = Vector3.Zero;
+                            d.BodySetLinearVel(Body, _target_velocity.X, _target_velocity.Y, _target_velocity.Z);
+                            d.BodySetForce(Body, 0f, 0f, 0f);
+                        }
+                        else
+                        {
+                            float scale = 50.0f * timestep / m_PIDTau;
+                            if ((error.ApproxEquals(Vector3.Zero, 0.5f)) && (_target_velocity != Vector3.Zero))
+                            {
+                                // Nearby, quit update of velocity
+                            }
+                            else
+                            {  // Far, calc damped velocity
+                                _target_velocity = error * scale;
+                            }
+                            d.BodySetLinearVel(Body, _target_velocity.X, _target_velocity.Y, _target_velocity.Z);
+                        }
+                    } // end PID MoveToTarget
+
+
+                    /// Dynamics Hover ===================================================================================
+                    // Hover PID Controller can only run if the PIDcontroller is not in use.
+                    if (m_useHoverPID && !m_usePID)
+                    {
+                        //Console.WriteLine("Hover " +  m_primName);            
+
+                        // If we're using the PID controller, then we have no gravity
+                        fz = (-1 * _parent_scene.gravityz) * m_mass;
+
+                        //  no lock; for now it's only called from within Simulate()
+
+                        // If the PID Controller isn't active then we set our force
+                        // calculating base velocity to the current position
+
+                        if ((m_PIDTau < 1))
+                        {
+                            PID_G = PID_G / m_PIDTau;
+                        }
+
+                        if ((PID_G - m_PIDTau) <= 0)
+                        {
+                            PID_G = m_PIDTau + 1;
+                        }
+
+
+                        // Where are we, and where are we headed?
+                        d.Vector3 pos = d.BodyGetPosition(Body);
+                        //                          d.Vector3 vel = d.BodyGetLinearVel(Body);
+
+
+                        //    Non-Vehicles have a limited set of Hover options.
+                        // determine what our target height really is based on HoverType
+                        switch (m_PIDHoverType)
+                        {
+                            case PIDHoverType.Ground:
+                                m_groundHeight = _parent_scene.GetTerrainHeightAtXY(pos.X, pos.Y);
+                                m_targetHoverHeight = m_groundHeight + m_PIDHoverHeight;
+                                break;
+                            case PIDHoverType.GroundAndWater:
+                                m_groundHeight = _parent_scene.GetTerrainHeightAtXY(pos.X, pos.Y);
+                                m_waterHeight = _parent_scene.GetWaterLevel();
+                                if (m_groundHeight > m_waterHeight)
+                                {
+                                    m_targetHoverHeight = m_groundHeight + m_PIDHoverHeight;
+                                }
+                                else
+                                {
+                                    m_targetHoverHeight = m_waterHeight + m_PIDHoverHeight;
+                                }
+                                break;
+
+                        }       // end switch (m_PIDHoverType)
+
+
+                        _target_velocity =
+                            new Vector3(0.0f, 0.0f,
+                                (m_targetHoverHeight - pos.Z) * ((PID_G - m_PIDHoverTau) * timestep)
+                                );
+
+                        //  if velocity is zero, use position control; otherwise, velocity control
+
+                        if (_target_velocity.ApproxEquals(Vector3.Zero, 0.1f))
+                        {
+                            //  keep track of where we stopped.  No more slippin' & slidin'
+
+                            // We only want to deactivate the PID Controller if we think we want to have our surrogate
+                            // react to the physics scene by moving it's position.
+                            // Avatar to Avatar collisions
+                            // Prim to avatar collisions
+                            d.Vector3 dlinvel = vel;
+                            d.BodySetPosition(Body, pos.X, pos.Y, m_targetHoverHeight);
+                            d.BodySetLinearVel(Body, dlinvel.X, dlinvel.Y, dlinvel.Z);
+                            d.BodyAddForce(Body, 0, 0, fz);
+                            //KF this prevents furthur motions         return;
+                        }
+                        else
+                        {
+                            _zeroFlag = false;
+
+                            // We're flying and colliding with something
+                            fz = fz + ((_target_velocity.Z - vel.Z) * (PID_D) * m_mass);
+                        }
+                    } // end m_useHoverPID && !m_usePID
+
+
+                    /// Dynamics Apply Forces ===================================================================================
+                    fx *= m_mass;
+                    fy *= m_mass;
+                    //fz *= m_mass;
+                    fx += m_force.X;
+                    fy += m_force.Y;
+                    fz += m_force.Z;
+
+                    //m_log.Info("[OBJPID]: X:" + fx.ToString() + " Y:" + fy.ToString() + " Z:" + fz.ToString());
+                    if (fx != 0 || fy != 0 || fz != 0)
+                    {
+                        //m_taintdisable = true;
+                        //base.RaiseOutOfBounds(Position);
+                        //d.BodySetLinearVel(Body, fx, fy, 0f);
+                        if (!d.BodyIsEnabled(Body))
+                        {
+                            // A physical body at rest on a surface will auto-disable after a while,
+                            // this appears to re-enable it incase the surface it is upon vanishes,
+                            // and the body should fall again. 
+                            d.BodySetLinearVel(Body, 0f, 0f, 0f);
+                            d.BodySetForce(Body, 0f, 0f, 0f);
+                            enableBodySoft();
+                        }
+
+                        // 35x10 = 350n times the mass per second applied maximum.
+                        float nmax = 35f * m_mass;
+                        float nmin = -35f * m_mass;
+
+
+                        if (fx > nmax)
+                            fx = nmax;
+                        if (fx < nmin)
+                            fx = nmin;
+                        if (fy > nmax)
+                            fy = nmax;
+                        if (fy < nmin)
+                            fy = nmin;
+                        d.BodyAddForce(Body, fx, fy, fz);
+                    }  // end apply forces
+                } // end Vehicle/Dynamics
+
+                /// RotLookAt / LookAt =================================================================================
+                if (m_useAPID)
+                {
+                    // RotLookAt, apparently overrides all other rotation sources. Inputs:
+                    // Quaternion m_APIDTarget
+                    // float m_APIDStrength             // From SL experiments, this is the time to get there
+                    // float m_APIDDamping              // From SL experiments, this is damping, 1.0 = damped, 0.1 = wobbly
+                    // Also in SL the mass of the object has no effect on time to get there.
+                    // Factors:
+                    // get present body rotation
+                    float limit = 1.0f;
+                    float rscaler = 50f;                // adjusts rotation damping time
+                    float lscaler = 10f;                // adjusts linear damping time in llLookAt
+                    float RLAservo = 0f;
+                    Vector3 diff_axis;
+                    float diff_angle;
+                    d.Quaternion rot = d.BodyGetQuaternion(Body);                                               // prim present rotation
+                    Quaternion rotq = new Quaternion(rot.X, rot.Y, rot.Z, rot.W);
+                    Quaternion rtarget = new Quaternion();
+
+                    if (m_APIDTarget.W == -99.9f)
+                    {
+                        // this is really a llLookAt(), x,y,z is the target vector
+                        Vector3 target = new Vector3(m_APIDTarget.X, m_APIDTarget.Y, m_APIDTarget.Z);
+                        Vector3 ospin = new Vector3(1.0f, 0.0f, 0.0f) * rotq;
+                        Vector3 error = new Vector3(0.0f, 0.0f, 0.0f);
+                        float twopi = 2.0f * (float)Math.PI;
+                        Vector3 dir = target - _position;
+                        dir.Normalize();
+                        float tzrot = (float)Math.Atan2(dir.Y, dir.X);
+                        float txy = (float)Math.Sqrt((dir.X * dir.X) + (dir.Y * dir.Y));
+                        float terot = (float)Math.Atan2(dir.Z, txy);
+                        float ozrot = (float)Math.Atan2(ospin.Y, ospin.X);
+                        float oxy = (float)Math.Sqrt((ospin.X * ospin.X) + (ospin.Y * ospin.Y));
+                        float oerot = (float)Math.Atan2(ospin.Z, oxy);
+                        float ra = 2.0f * ((rotq.W * rotq.X) + (rotq.Y * rotq.Z));
+                        float rb = 1.0f - 2.0f * ((rotq.Y * rotq.Y) + (rotq.X * rotq.X));
+                        float roll = (float)Math.Atan2(ra, rb);
+                        float errorz = tzrot - ozrot;
+                        if (errorz > (float)Math.PI) errorz -= twopi;
+                        else if (errorz < -(float)Math.PI) errorz += twopi;
+                        float errory = oerot - terot;
+                        if (errory > (float)Math.PI) errory -= twopi;
+                        else if (errory < -(float)Math.PI) errory += twopi;
+                        diff_angle = Math.Abs(errorz) + Math.Abs(errory) + Math.Abs(roll);
+                        if (diff_angle > 0.01f * m_APIDdamper)
+                        {
+                            m_APIDdamper = 1.0f;
+                            RLAservo = timestep / m_APIDStrength * rscaler;
+                            errorz *= RLAservo;
+                            errory *= RLAservo;
+                            error.X = -roll * 8.0f;
+                            error.Y = errory;
+                            error.Z = errorz;
+                            error *= rotq;
+                            d.BodySetAngularVel(Body, error.X, error.Y, error.Z);
+                        }
+                        else
+                        {
+                            d.BodySetAngularVel(Body, 0.0f, 0.0f, 0.0f);
+                            m_APIDdamper = 2.0f;
+                        }
+                    }
+                    else
+                    {
+                        // this is a llRotLookAt()
+                        rtarget = m_APIDTarget;
+
+                        Quaternion rot_diff = Quaternion.Inverse(rotq) * rtarget;               // difference to desired rot
+                        rot_diff.GetAxisAngle(out diff_axis, out diff_angle);                           // convert to axis to point at & error angle
+                        //if(frcount == 0) Console.WriteLine("axis {0}   angle {1}",diff_axis * 57.3f, diff_angle);
+
+                        //   diff_axis.Normalize(); it already is!
+                        if (diff_angle > 0.01f * m_APIDdamper)                  // diff_angle is always +ve                     // if there is enough error
+                        {
+                            m_APIDdamper = 1.0f;
+                            Vector3 rotforce = new Vector3(diff_axis.X, diff_axis.Y, diff_axis.Z);
+                            rotforce = rotforce * rotq;
+                            if (diff_angle > limit) diff_angle = limit;         // cap the rotate rate
+                            RLAservo = timestep / m_APIDStrength * lscaler;
+                            rotforce = rotforce * RLAservo * diff_angle;
+                            d.BodySetAngularVel(Body, rotforce.X, rotforce.Y, rotforce.Z);
+                            //Console.WriteLine("axis= " + diff_axis + "    angle= " + diff_angle + "servo= " + RLAservo);                                                      
+                        }
+                        else
+                        {       // close enough
+                            d.BodySetAngularVel(Body, 0.0f, 0.0f, 0.0f);
+                            m_APIDdamper = 2.0f;
+                        }
+                    } // end llLookAt/llRotLookAt
+                    //if(frcount == 0) Console.WriteLine("mass= " + m_mass + "  servo= " + RLAservo + "   angle= " + diff_angle);
+                } // end m_useAPID
+            } // end root prims
+        }  // end Move()
+    } // end class
+}
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/Physics/ChOdePlugin/ODERayCastRequestManager.cs
new file mode 100644
index 0000000..712029e
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODERayCastRequestManager.cs
@@ -0,0 +1,384 @@
+/*
+ * 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.Reflection;
+using System.Runtime.InteropServices;
+using System.Text;
+using OpenMetaverse;
+using OpenSim.Region.Physics.Manager;
+using Ode.NET;
+using log4net;
+
+namespace OpenSim.Region.Physics.OdePlugin
+{
+    /// <summary>
+    /// Processes raycast requests as ODE is in a state to be able to do them.
+    /// This ensures that it's thread safe and there will be no conflicts.
+    /// Requests get returned by a different thread then they were requested by.
+    /// </summary>
+    public class ODERayCastRequestManager
+    {
+        /// <summary>
+        /// Pending Raycast Requests
+        /// </summary>
+        protected List<ODERayCastRequest> m_PendingRequests = new List<ODERayCastRequest>();
+
+        /// <summary>
+        /// Scene that created this object.
+        /// </summary>
+        private OdeScene m_scene;
+
+        /// <summary>
+        /// ODE contact array to be filled by the collision testing
+        /// </summary>
+        d.ContactGeom[] contacts = new d.ContactGeom[5];
+
+        /// <summary>
+        /// ODE near callback delegate
+        /// </summary>
+        private d.NearCallback nearCallback;
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private List<ContactResult> m_contactResults = new List<ContactResult>();
+
+
+        public ODERayCastRequestManager(OdeScene pScene)
+        {
+            m_scene = pScene;
+            nearCallback = near;
+            
+        }
+
+        /// <summary>
+        /// Queues a raycast
+        /// </summary>
+        /// <param name="position">Origin of Ray</param>
+        /// <param name="direction">Ray normal</param>
+        /// <param name="length">Ray length</param>
+        /// <param name="retMethod">Return method to send the results</param>
+        public void QueueRequest(Vector3 position, Vector3 direction, float length, RaycastCallback retMethod)
+        {
+            lock (m_PendingRequests)
+            {
+                ODERayCastRequest req = new ODERayCastRequest();
+                req.callbackMethod = retMethod;
+                req.length = length;
+                req.Normal = direction;
+                req.Origin = position;
+
+                m_PendingRequests.Add(req);
+            }
+        }
+
+        /// <summary>
+        /// Process all queued raycast requests
+        /// </summary>
+        /// <returns>Time in MS the raycasts took to process.</returns>
+        public int ProcessQueuedRequests()
+        {
+            int time = System.Environment.TickCount;
+            lock (m_PendingRequests)
+            {
+                if (m_PendingRequests.Count > 0)
+                {
+                    ODERayCastRequest[] reqs = m_PendingRequests.ToArray();
+                    for (int i = 0; i < reqs.Length; i++)
+                    {
+                        try
+                        {
+                            if (reqs[i].callbackMethod != null) // quick optimization here, don't raycast 
+                                RayCast(reqs[i]);               // if there isn't anyone to send results   
+                        }
+                        catch
+                        {
+                            //Fail silently
+                            //This can genuinely happen because raycast requests are queued, and the actor may have
+                            //been removed from the scene since it was queued
+                        }
+                    }
+                    /*
+                    foreach (ODERayCastRequest req in m_PendingRequests)
+                    {
+                        if (req.callbackMethod != null) // quick optimization here, don't raycast 
+                            RayCast(req);               // if there isn't anyone to send results to
+                            
+                    }
+                    */
+                    m_PendingRequests.Clear();
+                }
+            }
+
+            lock (m_contactResults)
+                m_contactResults.Clear();
+
+            return System.Environment.TickCount - time;
+        }
+
+        /// <summary>
+        /// Method that actually initiates the raycast
+        /// </summary>
+        /// <param name="req"></param>
+        private void RayCast(ODERayCastRequest req)
+        {
+            // Create the ray
+            IntPtr ray = d.CreateRay(m_scene.space, req.length);
+            d.GeomRaySet(ray, req.Origin.X, req.Origin.Y, req.Origin.Z, req.Normal.X, req.Normal.Y, req.Normal.Z);
+
+            // Collide test
+            d.SpaceCollide2(m_scene.space, ray, IntPtr.Zero, nearCallback);
+
+            // Remove Ray
+            d.GeomDestroy(ray);
+
+
+            // Define default results
+            bool hitYN = false;
+            uint hitConsumerID = 0;
+            float distance = 999999999999f;
+            Vector3 closestcontact = new Vector3(99999f, 99999f, 99999f);
+            Vector3 snormal = Vector3.Zero;
+
+            // Find closest contact and object.
+            lock (m_contactResults)
+            {
+                foreach (ContactResult cResult in m_contactResults)
+                {
+                    if (Vector3.Distance(req.Origin, cResult.Pos) < Vector3.Distance(req.Origin, closestcontact))
+                    {
+                        closestcontact = cResult.Pos;
+                        hitConsumerID = cResult.ConsumerID;
+                        distance = cResult.Depth;
+                        hitYN = true;
+                        snormal = cResult.Normal;
+                    }
+                }
+
+                m_contactResults.Clear();
+            }
+
+            // Return results
+            if (req.callbackMethod != null)
+                req.callbackMethod(hitYN, closestcontact, hitConsumerID, distance, snormal);
+        }
+
+        // This is the standard Near.   Uses space AABBs to speed up detection.
+        private void near(IntPtr space, IntPtr g1, IntPtr g2)
+        {
+
+            //Don't test against heightfield Geom, or you'll be sorry!
+            
+            /*
+             terminate called after throwing an instance of 'std::bad_alloc'
+                  what():  std::bad_alloc
+                Stacktrace:
+                 
+                  at (wrapper managed-to-native) Ode.NET.d.Collide (intptr,intptr,int,Ode.NET.d/ContactGeom[],int) <0x00004>
+                  at (wrapper managed-to-native) Ode.NET.d.Collide (intptr,intptr,int,Ode.NET.d/ContactGeom[],int) <0xffffffff>
+                  at OpenSim.Region.Physics.OdePlugin.ODERayCastRequestManager.near (intptr,intptr,intptr) <0x00280>
+                  at (wrapper native-to-managed) OpenSim.Region.Physics.OdePlugin.ODERayCastRequestManager.near (intptr,intptr,intptr) <0xfff
+                fffff>
+                  at (wrapper managed-to-native) Ode.NET.d.SpaceCollide2 (intptr,intptr,intptr,Ode.NET.d/NearCallback) <0x00004>
+                  at (wrapper managed-to-native) Ode.NET.d.SpaceCollide2 (intptr,intptr,intptr,Ode.NET.d/NearCallback) <0xffffffff>
+                  at OpenSim.Region.Physics.OdePlugin.ODERayCastRequestManager.RayCast (OpenSim.Region.Physics.OdePlugin.ODERayCastRequest) <
+                0x00114>
+                  at OpenSim.Region.Physics.OdePlugin.ODERayCastRequestManager.ProcessQueuedRequests () <0x000eb>
+                  at OpenSim.Region.Physics.OdePlugin.OdeScene.Simulate (single) <0x017e6>
+                  at OpenSim.Region.Framework.Scenes.SceneGraph.UpdatePhysics (double) <0x00042>
+                  at OpenSim.Region.Framework.Scenes.Scene.Update () <0x0039e>
+                  at OpenSim.Region.Framework.Scenes.Scene.Heartbeat (object) <0x00019>
+                  at (wrapper runtime-invoke) object.runtime_invoke_void__this___object (object,intptr,intptr,intptr) <0xffffffff>
+                 
+                Native stacktrace:
+                 
+                        mono [0x80d2a42]
+                        [0xb7f5840c]
+                        /lib/i686/cmov/libc.so.6(abort+0x188) [0xb7d1a018]
+                        /usr/lib/libstdc++.so.6(_ZN9__gnu_cxx27__verbose_terminate_handlerEv+0x158) [0xb45fc988]
+                        /usr/lib/libstdc++.so.6 [0xb45fa865]
+                        /usr/lib/libstdc++.so.6 [0xb45fa8a2]
+                        /usr/lib/libstdc++.so.6 [0xb45fa9da]
+                        /usr/lib/libstdc++.so.6(_Znwj+0x83) [0xb45fb033]
+                        /usr/lib/libstdc++.so.6(_Znaj+0x1d) [0xb45fb11d]
+                        libode.so(_ZN13dxHeightfield23dCollideHeightfieldZoneEiiiiP6dxGeomiiP12dContactGeomi+0xd04) [0xb46678e4]
+                        libode.so(_Z19dCollideHeightfieldP6dxGeomS0_iP12dContactGeomi+0x54b) [0xb466832b]
+                        libode.so(dCollide+0x102) [0xb46571b2]
+                        [0x95cfdec9]
+                        [0x8ea07fe1]
+                        [0xab260146]
+                        libode.so [0xb465a5c4]
+                        libode.so(_ZN11dxHashSpace8collide2EPvP6dxGeomPFvS0_S2_S2_E+0x75) [0xb465bcf5]
+                        libode.so(dSpaceCollide2+0x177) [0xb465ac67]
+                        [0x95cf978e]
+                        [0x8ea07945]
+                        [0x95cf2bbc]
+                        [0xab2787e7]
+                        [0xab419fb3]
+                        [0xab416657]
+                        [0xab415bda]
+                        [0xb609b08e]
+                        mono(mono_runtime_delegate_invoke+0x34) [0x8192534]
+                        mono [0x81a2f0f]
+                        mono [0x81d28b6]
+                        mono [0x81ea2c6]
+                        /lib/i686/cmov/libpthread.so.0 [0xb7e744c0]
+                        /lib/i686/cmov/libc.so.6(clone+0x5e) [0xb7dcd6de]
+             */
+
+            // Exclude heightfield geom
+
+            if (g1 == IntPtr.Zero || g2 == IntPtr.Zero)
+                return;
+            if (d.GeomGetClass(g1) == d.GeomClassID.HeightfieldClass || d.GeomGetClass(g2) == d.GeomClassID.HeightfieldClass)
+                return;
+
+            // Raytest against AABBs of spaces first, then dig into the spaces it hits for actual geoms.
+            if (d.GeomIsSpace(g1) || d.GeomIsSpace(g2))
+            {
+                if (g1 == IntPtr.Zero || g2 == IntPtr.Zero)
+                    return;
+                
+                // Separating static prim geometry spaces.
+                // We'll be calling near recursivly if one
+                // of them is a space to find all of the
+                // contact points in the space
+                try
+                {
+                    d.SpaceCollide2(g1, g2, IntPtr.Zero, nearCallback);
+                }
+                catch (AccessViolationException)
+                {
+                    m_log.Warn("[PHYSICS]: Unable to collide test a space");
+                    return;
+                }
+                //Colliding a space or a geom with a space or a geom. so drill down
+
+                //Collide all geoms in each space..
+                //if (d.GeomIsSpace(g1)) d.SpaceCollide(g1, IntPtr.Zero, nearCallback);
+                //if (d.GeomIsSpace(g2)) d.SpaceCollide(g2, IntPtr.Zero, nearCallback);
+                return;
+            }
+
+            if (g1 == IntPtr.Zero || g2 == IntPtr.Zero)
+                return;
+
+            int count = 0;
+            try
+            {
+                
+                if (g1 == g2)
+                    return; // Can't collide with yourself
+
+                lock (contacts)
+                {
+                    count = d.Collide(g1, g2, contacts.GetLength(0), contacts, d.ContactGeom.SizeOf);
+                }
+            }
+            catch (SEHException)
+            {
+                m_log.Error("[PHYSICS]: The Operating system shut down ODE because of corrupt memory.  This could be a result of really irregular terrain.  If this repeats continuously, restart using Basic Physics and terrain fill your terrain.  Restarting the sim.");
+            }
+            catch (Exception e)
+            {
+                m_log.WarnFormat("[PHYSICS]: Unable to collide test an object: {0}", e.Message);
+                return;
+            }
+
+            PhysicsActor p1 = null;
+            PhysicsActor p2 = null;
+
+            if (g1 != IntPtr.Zero)
+                m_scene.actor_name_map.TryGetValue(g1, out p1);
+
+            if (g2 != IntPtr.Zero)
+                m_scene.actor_name_map.TryGetValue(g1, out p2);
+
+            // Loop over contacts, build results.
+            for (int i = 0; i < count; i++)
+            {
+                if (p1 != null) { 
+                    if (p1 is OdePrim)
+                    {
+                        ContactResult collisionresult = new ContactResult();
+                    
+                        collisionresult.ConsumerID = ((OdePrim)p1).m_localID;
+                        collisionresult.Pos = new Vector3(contacts[i].pos.X, contacts[i].pos.Y, contacts[i].pos.Z);
+                        collisionresult.Depth = contacts[i].depth;
+                        collisionresult.Normal = new Vector3(contacts[i].normal.X, contacts[i].normal.Y,
+                                                             contacts[i].normal.Z);
+                        lock (m_contactResults)
+                            m_contactResults.Add(collisionresult);
+                    }
+                }
+
+                if (p2 != null)
+                {
+                    if (p2 is OdePrim)
+                    {
+                        ContactResult collisionresult = new ContactResult();
+
+                        collisionresult.ConsumerID = ((OdePrim)p2).m_localID;
+                        collisionresult.Pos = new Vector3(contacts[i].pos.X, contacts[i].pos.Y, contacts[i].pos.Z);
+                        collisionresult.Depth = contacts[i].depth;
+                        collisionresult.Normal = new Vector3(contacts[i].normal.X, contacts[i].normal.Y,
+                                      contacts[i].normal.Z);
+
+                        lock (m_contactResults)
+                            m_contactResults.Add(collisionresult);
+                    }
+                }
+
+                
+            }
+
+        }
+
+        /// <summary>
+        /// Dereference the creator scene so that it can be garbage collected if needed.
+        /// </summary>
+        internal void Dispose()
+        {
+            m_scene = null;
+        }
+    }
+
+    public struct ODERayCastRequest
+    {
+        public Vector3 Origin;
+        public Vector3 Normal;
+        public float length;
+        public RaycastCallback callbackMethod;
+    }
+
+    public struct ContactResult
+    {
+        public Vector3 Pos;
+        public float Depth;
+        public uint ConsumerID;
+        public Vector3 Normal;
+    }
+}
diff --git a/OpenSim/Region/Physics/ChOdePlugin/OdePhysicsJoint.cs b/OpenSim/Region/Physics/ChOdePlugin/OdePhysicsJoint.cs
new file mode 100644
index 0000000..b4a3c48
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/OdePhysicsJoint.cs
@@ -0,0 +1,48 @@
+/*
+ * 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 OpenMetaverse;
+using Ode.NET;
+using OpenSim.Framework;
+using OpenSim.Region.Physics.Manager;
+using OpenSim.Region.Physics.OdePlugin;
+
+namespace OpenSim.Region.Physics.OdePlugin
+{
+    class OdePhysicsJoint : PhysicsJoint
+    {
+        public override bool IsInPhysicsEngine
+        {
+            get
+            {
+                return (jointID != IntPtr.Zero);
+            }
+        }
+        public IntPtr jointID;
+    }
+}
diff --git a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
new file mode 100644
index 0000000..00f5122
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
@@ -0,0 +1,3887 @@
+/*
+ * 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.
+ */
+
+//#define USE_DRAWSTUFF
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.IO;
+using System.Diagnostics;
+using log4net;
+using Nini.Config;
+using Ode.NET;
+#if USE_DRAWSTUFF
+using Drawstuff.NET;
+#endif 
+using OpenSim.Framework;
+using OpenSim.Region.Physics.Manager;
+using OpenMetaverse;
+
+//using OpenSim.Region.Physics.OdePlugin.Meshing;
+
+namespace OpenSim.Region.Physics.OdePlugin
+{
+    /// <summary>
+    /// ODE plugin
+    /// </summary>
+    public class OdePlugin : IPhysicsPlugin
+    {
+        //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
+        private CollisionLocker ode;
+        private OdeScene _mScene;
+
+        public OdePlugin()
+        {
+            ode = new CollisionLocker();
+        }
+
+        public bool Init()
+        {
+            return true;
+        }
+
+        public PhysicsScene GetScene(String sceneIdentifier)
+        {
+            if (_mScene == null)
+            {
+                if (Util.IsWindows())
+                    Util.LoadArchSpecificWindowsDll("ode.dll");
+
+                // Initializing ODE only when a scene is created allows alternative ODE plugins to co-habit (according to
+                // http://opensimulator.org/mantis/view.php?id=2750).
+                d.InitODE();
+                
+                _mScene = new OdeScene(ode, sceneIdentifier);
+            }
+            return (_mScene);
+        }
+
+        public string GetName()
+        {
+            return ("ChODE");
+        }
+
+        public void Dispose()
+        {
+        }
+    }
+
+    public enum StatusIndicators : int
+    {
+        Generic = 0,
+        Start = 1,
+        End = 2
+    }
+
+    public struct sCollisionData
+    {
+        public uint ColliderLocalId;
+        public uint CollidedWithLocalId;
+        public int NumberOfCollisions;
+        public int CollisionType;
+        public int StatusIndicator;
+        public int lastframe;
+    }
+
+    [Flags]
+    public enum CollisionCategories : int
+    {
+        Disabled = 0,
+        Geom = 0x00000001,
+        Body = 0x00000002,
+        Space = 0x00000004,
+        Character = 0x00000008,
+        Land = 0x00000010,
+        Water = 0x00000020,
+        Wind = 0x00000040,
+        Sensor = 0x00000080,
+        Selected = 0x00000100
+    }
+
+    /// <summary>
+    /// Material type for a primitive
+    /// </summary>
+    public enum Material : int
+    {
+        /// <summary></summary>
+        Stone = 0,
+        /// <summary></summary>
+        Metal = 1,
+        /// <summary></summary>
+        Glass = 2,
+        /// <summary></summary>
+        Wood = 3,
+        /// <summary></summary>
+        Flesh = 4,
+        /// <summary></summary>
+        Plastic = 5,
+        /// <summary></summary>
+        Rubber = 6
+
+    }
+
+    public sealed class OdeScene : PhysicsScene
+    {
+        private readonly ILog m_log;
+        // private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>();
+
+        CollisionLocker ode;
+
+        private Random fluidRandomizer = new Random(Environment.TickCount);
+
+        private const uint m_regionWidth = Constants.RegionSize;
+        private const uint m_regionHeight = Constants.RegionSize;
+
+        private float ODE_STEPSIZE = 0.020f;
+        private float metersInSpace = 29.9f;
+        private float m_timeDilation = 1.0f;
+
+        public float gravityx = 0f;
+        public float gravityy = 0f;
+        public float gravityz = -9.8f;
+
+        private float contactsurfacelayer = 0.001f;
+
+        private int worldHashspaceLow = -4;
+        private int worldHashspaceHigh = 128;
+
+        private int smallHashspaceLow = -4;
+        private int smallHashspaceHigh = 66;
+
+        private float waterlevel = 0f;
+        private int framecount = 0;
+        //private int m_returncollisions = 10;
+
+        private readonly IntPtr contactgroup;
+
+        internal IntPtr LandGeom;
+        internal IntPtr WaterGeom;
+
+        private float nmTerrainContactFriction = 255.0f;
+        private float nmTerrainContactBounce = 0.1f;
+        private float nmTerrainContactERP = 0.1025f;
+
+        private float mTerrainContactFriction = 75f;
+        private float mTerrainContactBounce = 0.1f;
+        private float mTerrainContactERP = 0.05025f;
+
+        private float nmAvatarObjectContactFriction = 250f;
+        private float nmAvatarObjectContactBounce = 0.1f;
+
+        private float mAvatarObjectContactFriction = 75f;
+        private float mAvatarObjectContactBounce = 0.1f;
+
+        private float avPIDD = 3200f;
+        private float avPIDP = 1400f;
+        private float avCapRadius = 0.37f;
+        private float avStandupTensor = 2000000f;
+        private bool avCapsuleTilted = true; // true = old compatibility mode with leaning capsule; false = new corrected mode
+        public bool IsAvCapsuleTilted { get { return avCapsuleTilted; } set { avCapsuleTilted = value; } }
+        private float avDensity = 80f;
+        private float avHeightFudgeFactor = 0.52f;
+        private float avMovementDivisorWalk = 1.3f;
+        private float avMovementDivisorRun = 0.8f;
+        private float minimumGroundFlightOffset = 3f;
+        public float maximumMassObject = 10000.01f;
+
+        public bool meshSculptedPrim = true;
+        public bool forceSimplePrimMeshing = false;
+
+        public float meshSculptLOD = 32;
+        public float MeshSculptphysicalLOD = 16;
+
+        public float geomDefaultDensity = 10.000006836f;
+
+        public int geomContactPointsStartthrottle = 3;
+        public int geomUpdatesPerThrottledUpdate = 15;
+
+        public float bodyPIDD = 35f;
+        public float bodyPIDG = 25;
+
+        public int geomCrossingFailuresBeforeOutofbounds = 5;
+        public float geomRegionFence = 0.0f;
+
+        public float bodyMotorJointMaxforceTensor = 2;
+
+        public int bodyFramesAutoDisable = 20;
+
+        private DateTime m_lastframe = DateTime.UtcNow;
+
+        private float[] _watermap;
+        private bool m_filterCollisions = true;
+
+        private d.NearCallback nearCallback;
+        public d.TriCallback triCallback;
+        public d.TriArrayCallback triArrayCallback;
+        private readonly HashSet<OdeCharacter> _characters = new HashSet<OdeCharacter>();
+        private readonly HashSet<OdePrim> _prims = new HashSet<OdePrim>();
+        private readonly HashSet<OdePrim> _activeprims = new HashSet<OdePrim>();
+        private readonly HashSet<OdePrim> _taintedPrimH = new HashSet<OdePrim>();
+        private readonly Object _taintedPrimLock = new Object();
+        private readonly List<OdePrim> _taintedPrimL = new List<OdePrim>();
+        private readonly HashSet<OdeCharacter> _taintedActors = new HashSet<OdeCharacter>();
+        private readonly List<d.ContactGeom> _perloopContact = new List<d.ContactGeom>();
+        private readonly List<PhysicsActor> _collisionEventPrim = new List<PhysicsActor>();
+        private readonly HashSet<OdeCharacter> _badCharacter = new HashSet<OdeCharacter>();
+        public Dictionary<IntPtr, String> geom_name_map = new Dictionary<IntPtr, String>();
+        public Dictionary<IntPtr, PhysicsActor> actor_name_map = new Dictionary<IntPtr, PhysicsActor>();
+        private bool m_NINJA_physics_joints_enabled = false;
+        //private Dictionary<String, IntPtr> jointpart_name_map = new Dictionary<String,IntPtr>();
+        private readonly Dictionary<String, List<PhysicsJoint>> joints_connecting_actor = new Dictionary<String, List<PhysicsJoint>>();
+        private d.ContactGeom[] contacts;
+        private readonly List<PhysicsJoint> requestedJointsToBeCreated = new List<PhysicsJoint>(); // lock only briefly. accessed by external code (to request new joints) and by OdeScene.Simulate() to move those joints into pending/active
+        private readonly List<PhysicsJoint> pendingJoints = new List<PhysicsJoint>(); // can lock for longer. accessed only by OdeScene.
+        private readonly List<PhysicsJoint> activeJoints = new List<PhysicsJoint>(); // can lock for longer. accessed only by OdeScene.
+        private readonly List<string> requestedJointsToBeDeleted = new List<string>(); // lock only briefly. accessed by external code (to request deletion of joints) and by OdeScene.Simulate() to move those joints out of pending/active
+        private Object externalJointRequestsLock = new Object();
+        private readonly Dictionary<String, PhysicsJoint> SOPName_to_activeJoint = new Dictionary<String, PhysicsJoint>();
+        private readonly Dictionary<String, PhysicsJoint> SOPName_to_pendingJoint = new Dictionary<String, PhysicsJoint>();
+        private readonly DoubleDictionary<Vector3, IntPtr, IntPtr> RegionTerrain = new DoubleDictionary<Vector3, IntPtr, IntPtr>();
+        private readonly Dictionary<IntPtr,float[]> TerrainHeightFieldHeights = new Dictionary<IntPtr, float[]>();
+
+        private d.Contact ContactCopy;                  // local copy that can be modified
+        private d.Contact TerrainContact;
+        private d.Contact AvatarStaticprimContact;      // was 'contact'
+        private d.Contact AvatarMovementprimContact;
+        private d.Contact AvatarMovementTerrainContact;
+        private d.Contact WaterContact;
+        private d.Contact[,] m_materialContacts;
+
+//Ckrinke: Comment out until used. We declare it, initialize it, but do not use it
+//Ckrinke        private int m_randomizeWater = 200;
+        private int m_physicsiterations = 10;
+        private const float m_SkipFramesAtms = 0.40f; // Drop frames gracefully at a 400 ms lag
+        private readonly PhysicsActor PANull = new NullPhysicsActor();
+        private float step_time = 0.0f;
+//Ckrinke: Comment out until used. We declare it, initialize it, but do not use it
+//Ckrinke        private int ms = 0;
+        public IntPtr world;
+        //private bool returncollisions = false;
+        // private uint obj1LocalID = 0;
+        private uint obj2LocalID = 0;
+        //private int ctype = 0;
+        private OdeCharacter cc1;
+        private OdePrim cp1;
+        private OdeCharacter cc2;
+        private OdePrim cp2;
+        //private int cStartStop = 0;
+        //private string cDictKey = "";
+
+        public IntPtr space;
+
+        //private IntPtr tmpSpace;
+        // split static geometry collision handling into spaces of 30 meters
+        public IntPtr[,] staticPrimspace;
+
+        public Object OdeLock;
+
+        public IMesher mesher;
+
+        private IConfigSource m_config;
+
+        public bool physics_logging = false;
+        public int physics_logging_interval = 0;
+        public bool physics_logging_append_existing_logfile = false;
+
+        public d.Vector3 xyz = new d.Vector3(128.1640f, 128.3079f, 25.7600f);
+        public d.Vector3 hpr = new d.Vector3(125.5000f, -17.0000f, 0.0000f);
+
+        // TODO: unused: private uint heightmapWidth = m_regionWidth + 1;
+        // TODO: unused: private uint heightmapHeight = m_regionHeight + 1;
+        // TODO: unused: private uint heightmapWidthSamples;
+        // TODO: unused: private uint heightmapHeightSamples;
+
+        private volatile int m_global_contactcount = 0;
+
+        private Vector3 m_worldOffset = Vector3.Zero;
+        public Vector2 WorldExtents = new Vector2((int)Constants.RegionSize, (int)Constants.RegionSize);
+        private PhysicsScene m_parentScene = null;
+
+        private ODERayCastRequestManager m_rayCastManager;
+
+        /// <summary>
+        /// Initiailizes the scene
+        /// Sets many properties that ODE requires to be stable
+        /// These settings need to be tweaked 'exactly' right or weird stuff happens.
+        /// </summary>
+        public OdeScene(CollisionLocker dode, string sceneIdentifier)
+        {
+            m_log 
+                = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.ToString() + "." + sceneIdentifier);
+
+            OdeLock = new Object();
+            ode = dode;
+            nearCallback = near;
+            triCallback = TriCallback;
+            triArrayCallback = TriArrayCallback;
+            m_rayCastManager = new ODERayCastRequestManager(this);
+            lock (OdeLock)
+            {
+                // Create the world and the first space
+                world = d.WorldCreate();
+                space = d.HashSpaceCreate(IntPtr.Zero);
+                
+
+                contactgroup = d.JointGroupCreate(0);
+                //contactgroup
+
+                d.WorldSetAutoDisableFlag(world, false);
+                #if USE_DRAWSTUFF
+                
+                Thread viewthread = new Thread(new ParameterizedThreadStart(startvisualization));
+                viewthread.Start();
+                #endif
+            }
+
+
+            _watermap = new float[258 * 258];
+
+            // Zero out the prim spaces array (we split our space into smaller spaces so
+            // we can hit test less.
+        }
+
+#if USE_DRAWSTUFF
+        public void startvisualization(object o)
+        {
+            ds.Functions fn;
+            fn.version = ds.VERSION;
+            fn.start = new ds.CallbackFunction(start);
+            fn.step = new ds.CallbackFunction(step);
+            fn.command = new ds.CallbackFunction(command);
+            fn.stop = null;
+            fn.path_to_textures = "./textures";
+            string[] args = new string[0];
+            ds.SimulationLoop(args.Length, args, 352, 288, ref fn);
+        }
+#endif
+
+        // Initialize the mesh plugin
+        public override void Initialise(IMesher meshmerizer, IConfigSource config)
+        {
+            mesher = meshmerizer;
+            m_config = config;
+            // Defaults
+
+            if (Environment.OSVersion.Platform == PlatformID.Unix)
+            {
+                avPIDD = 3200.0f;
+                avPIDP = 1400.0f;
+                avStandupTensor = 2000000f;
+            }
+            else
+            {
+                avPIDD = 2200.0f;
+                avPIDP = 900.0f;
+                avStandupTensor = 550000f;
+            }
+
+            int contactsPerCollision = 80;
+
+            if (m_config != null)
+            {
+                IConfig physicsconfig = m_config.Configs["ODEPhysicsSettings"];
+                if (physicsconfig != null)
+                {
+                    gravityx = physicsconfig.GetFloat("world_gravityx", 0f);
+                    gravityy = physicsconfig.GetFloat("world_gravityy", 0f);
+                    gravityz = physicsconfig.GetFloat("world_gravityz", -9.8f);
+
+                    worldHashspaceLow = physicsconfig.GetInt("world_hashspace_size_low", -4);
+                    worldHashspaceHigh = physicsconfig.GetInt("world_hashspace_size_high", 128);
+
+                    metersInSpace = physicsconfig.GetFloat("meters_in_small_space", 29.9f);
+                    smallHashspaceLow = physicsconfig.GetInt("small_hashspace_size_low", -4);
+                    smallHashspaceHigh = physicsconfig.GetInt("small_hashspace_size_high", 66);
+
+                    contactsurfacelayer = physicsconfig.GetFloat("world_contact_surface_layer", 0.001f);
+
+                    nmTerrainContactFriction = physicsconfig.GetFloat("nm_terraincontact_friction", 255.0f);
+                    nmTerrainContactBounce = physicsconfig.GetFloat("nm_terraincontact_bounce", 0.1f);
+                    nmTerrainContactERP = physicsconfig.GetFloat("nm_terraincontact_erp", 0.1025f);
+
+                    mTerrainContactFriction = physicsconfig.GetFloat("m_terraincontact_friction", 75f);
+                    mTerrainContactBounce = physicsconfig.GetFloat("m_terraincontact_bounce", 0.05f);
+                    mTerrainContactERP = physicsconfig.GetFloat("m_terraincontact_erp", 0.05025f);
+
+                    nmAvatarObjectContactFriction = physicsconfig.GetFloat("objectcontact_friction", 250f);
+                    nmAvatarObjectContactBounce = physicsconfig.GetFloat("objectcontact_bounce", 0.2f);
+
+                    mAvatarObjectContactFriction = physicsconfig.GetFloat("m_avatarobjectcontact_friction", 75f);
+                    mAvatarObjectContactBounce = physicsconfig.GetFloat("m_avatarobjectcontact_bounce", 0.1f);
+
+                    ODE_STEPSIZE = physicsconfig.GetFloat("world_stepsize", 0.020f);
+                    m_physicsiterations = physicsconfig.GetInt("world_internal_steps_without_collisions", 10);
+
+                    avDensity = physicsconfig.GetFloat("av_density", 80f);
+                    avHeightFudgeFactor = physicsconfig.GetFloat("av_height_fudge_factor", 0.52f);
+                    avMovementDivisorWalk = physicsconfig.GetFloat("av_movement_divisor_walk", 1.3f);
+                    avMovementDivisorRun = physicsconfig.GetFloat("av_movement_divisor_run", 0.8f);
+                    avCapRadius = physicsconfig.GetFloat("av_capsule_radius", 0.37f);
+                    avCapsuleTilted = physicsconfig.GetBoolean("av_capsule_tilted", false);
+
+                    contactsPerCollision = physicsconfig.GetInt("contacts_per_collision", 80);
+
+                    geomContactPointsStartthrottle = physicsconfig.GetInt("geom_contactpoints_start_throttling", 3);
+                    geomUpdatesPerThrottledUpdate = physicsconfig.GetInt("geom_updates_before_throttled_update", 15);
+                    geomCrossingFailuresBeforeOutofbounds = physicsconfig.GetInt("geom_crossing_failures_before_outofbounds", 5);
+                    geomRegionFence = physicsconfig.GetFloat("region_border_fence", 0.0f);
+
+                    geomDefaultDensity = physicsconfig.GetFloat("geometry_default_density", 10.000006836f);
+                    bodyFramesAutoDisable = physicsconfig.GetInt("body_frames_auto_disable", 20);
+
+                    bodyPIDD = physicsconfig.GetFloat("body_pid_derivative", 35f);
+                    bodyPIDG = physicsconfig.GetFloat("body_pid_gain", 25f);
+
+                    forceSimplePrimMeshing = physicsconfig.GetBoolean("force_simple_prim_meshing", forceSimplePrimMeshing);
+                    meshSculptedPrim = physicsconfig.GetBoolean("mesh_sculpted_prim", true);
+                    meshSculptLOD = physicsconfig.GetFloat("mesh_lod", 32f);
+                    MeshSculptphysicalLOD = physicsconfig.GetFloat("mesh_physical_lod", 16f);
+                    m_filterCollisions = physicsconfig.GetBoolean("filter_collisions", false);
+
+                    if (Environment.OSVersion.Platform == PlatformID.Unix)
+                    {
+                        avPIDD = physicsconfig.GetFloat("av_pid_derivative_linux", 2200.0f);
+                        avPIDP = physicsconfig.GetFloat("av_pid_proportional_linux", 900.0f);
+                        avStandupTensor = physicsconfig.GetFloat("av_capsule_standup_tensor_linux", 550000f);
+                        bodyMotorJointMaxforceTensor = physicsconfig.GetFloat("body_motor_joint_maxforce_tensor_linux", 5f);
+                    }
+                    else
+                    {
+                        avPIDD = physicsconfig.GetFloat("av_pid_derivative_win", 2200.0f);
+                        avPIDP = physicsconfig.GetFloat("av_pid_proportional_win", 900.0f);
+                        avStandupTensor = physicsconfig.GetFloat("av_capsule_standup_tensor_win", 550000f);
+                        bodyMotorJointMaxforceTensor = physicsconfig.GetFloat("body_motor_joint_maxforce_tensor_win", 5f);
+                    }
+
+                    physics_logging = physicsconfig.GetBoolean("physics_logging", false);
+                    physics_logging_interval = physicsconfig.GetInt("physics_logging_interval", 0);
+                    physics_logging_append_existing_logfile = physicsconfig.GetBoolean("physics_logging_append_existing_logfile", false);
+
+                    m_NINJA_physics_joints_enabled = physicsconfig.GetBoolean("use_NINJA_physics_joints", false);
+                    minimumGroundFlightOffset = physicsconfig.GetFloat("minimum_ground_flight_offset", 3f);
+                    maximumMassObject = physicsconfig.GetFloat("maximum_mass_object", 10000.01f);
+                }
+            }
+
+            contacts = new d.ContactGeom[contactsPerCollision];
+
+            staticPrimspace = new IntPtr[(int)(300 / metersInSpace), (int)(300 / metersInSpace)];
+
+            // Avatar static on a Prim parameters
+            AvatarStaticprimContact.surface.mode = d.ContactFlags.SoftCFM | d.ContactFlags.SoftERP | d.ContactFlags.Bounce;
+            AvatarStaticprimContact.surface.mu = 255.0f;
+            AvatarStaticprimContact.surface.bounce = 0.0f;
+            AvatarStaticprimContact.surface.soft_cfm = 0.0f;
+            AvatarStaticprimContact.surface.soft_erp = 0.30f;   // If this is too small static Av will fall through a sloping prim. 1.0 prevents fall-thru
+
+            // Avatar moving on a Prim parameters
+            AvatarMovementprimContact.surface.mode = d.ContactFlags.SoftCFM | d.ContactFlags.SoftERP | d.ContactFlags.Bounce;
+            AvatarMovementprimContact.surface.mu = 255.0f;
+            AvatarMovementprimContact.surface.bounce = 0.0f;
+            AvatarMovementprimContact.surface.soft_cfm = 0.0f; // if this is 0.01 then prims become phantom to Avs!
+            AvatarMovementprimContact.surface.soft_erp = 0.3f;
+
+            // Static Avatar on Terrain parameters
+            // Keeps Avatar in place better
+            TerrainContact.surface.mode = d.ContactFlags.SoftCFM | d.ContactFlags.SoftERP | d.ContactFlags.Bounce;
+            TerrainContact.surface.mu = 255.0f;
+            TerrainContact.surface.bounce = 0.0f;
+            TerrainContact.surface.soft_cfm = 0.0f;
+            TerrainContact.surface.soft_erp = 0.05f;
+
+            // Moving Avatar on Terrain parameters
+            AvatarMovementTerrainContact.surface.mode = d.ContactFlags.SoftCFM | d.ContactFlags.SoftERP | d.ContactFlags.Bounce;
+            AvatarMovementTerrainContact.surface.mu = 75f;
+            AvatarMovementTerrainContact.surface.bounce = 0.0f;
+            AvatarMovementTerrainContact.surface.soft_cfm = 0.0f;
+            AvatarMovementTerrainContact.surface.soft_erp = 0.05f;
+
+            // Avatar or prim the the water, this may not be used, possibly water is same as air?
+            WaterContact.surface.mode |= (d.ContactFlags.SoftERP | d.ContactFlags.SoftCFM);
+            WaterContact.surface.mu = 0.0f; // No friction
+            WaterContact.surface.bounce = 0.0f; // No bounce
+            WaterContact.surface.soft_cfm = 0.010f;
+            WaterContact.surface.soft_erp = 0.010f;
+
+
+            // Prim static or moving on a prim, depends on material type
+            m_materialContacts = new d.Contact[7,2];
+                                                //  V  1 = Sliding; 0 = static or fell onto
+            m_materialContacts[(int)Material.Stone, 0] = new d.Contact();
+            m_materialContacts[(int)Material.Stone, 0].surface.mode = d.ContactFlags.SoftCFM | d.ContactFlags.SoftERP | d.ContactFlags.Bounce;
+            m_materialContacts[(int)Material.Stone, 0].surface.mu = 60f;           // friction, 1 = slippery, 255 = no slip
+            m_materialContacts[(int)Material.Stone, 0].surface.bounce = 0.0f;       
+            m_materialContacts[(int)Material.Stone, 0].surface.soft_cfm = 0.0f;
+            m_materialContacts[(int)Material.Stone, 0].surface.soft_erp = 0.50f;    // erp also changes friction, more erp=less friction
+
+            m_materialContacts[(int)Material.Stone, 1] = new d.Contact();
+            m_materialContacts[(int)Material.Stone, 1].surface.mode = d.ContactFlags.SoftCFM | d.ContactFlags.SoftERP | d.ContactFlags.Bounce;
+            m_materialContacts[(int)Material.Stone, 1].surface.mu = 40f;
+            m_materialContacts[(int)Material.Stone, 1].surface.bounce = 0.0f;
+            m_materialContacts[(int)Material.Stone, 1].surface.soft_cfm = 0.0f;
+            m_materialContacts[(int)Material.Stone, 1].surface.soft_erp = 0.50f;
+
+            m_materialContacts[(int)Material.Metal, 0] = new d.Contact();
+            m_materialContacts[(int)Material.Metal, 0].surface.mode = d.ContactFlags.SoftCFM | d.ContactFlags.SoftERP | d.ContactFlags.Bounce;
+            m_materialContacts[(int)Material.Metal, 0].surface.mu = 15f;
+            m_materialContacts[(int)Material.Metal, 0].surface.bounce = 0.2f;
+            m_materialContacts[(int)Material.Metal, 0].surface.soft_cfm = 0.0f;
+            m_materialContacts[(int)Material.Metal, 0].surface.soft_erp = 0.50f;
+
+            m_materialContacts[(int)Material.Metal, 1] = new d.Contact();
+            m_materialContacts[(int)Material.Metal, 1].surface.mode = d.ContactFlags.SoftCFM | d.ContactFlags.SoftERP | d.ContactFlags.Bounce;
+            m_materialContacts[(int)Material.Metal, 1].surface.mu = 10f;
+            m_materialContacts[(int)Material.Metal, 1].surface.bounce = 0.2f;
+            m_materialContacts[(int)Material.Metal, 1].surface.soft_cfm = 0.0f;
+            m_materialContacts[(int)Material.Metal, 1].surface.soft_erp = 0.50f;
+
+            m_materialContacts[(int)Material.Glass, 0] = new d.Contact();
+            m_materialContacts[(int)Material.Glass, 0].surface.mode  = d.ContactFlags.SoftCFM | d.ContactFlags.SoftERP | d.ContactFlags.Bounce;
+            m_materialContacts[(int)Material.Glass, 0].surface.mu = 7.5f;
+            m_materialContacts[(int)Material.Glass, 0].surface.bounce = 0.0f;
+            m_materialContacts[(int)Material.Glass, 0].surface.soft_cfm = 0.0f;
+            m_materialContacts[(int)Material.Glass, 0].surface.soft_erp = 0.50f;
+
+            m_materialContacts[(int)Material.Glass, 1] = new d.Contact();
+            m_materialContacts[(int)Material.Glass, 1].surface.mode  = d.ContactFlags.SoftCFM | d.ContactFlags.SoftERP | d.ContactFlags.Bounce;
+            m_materialContacts[(int)Material.Glass, 1].surface.mu = 5f;
+            m_materialContacts[(int)Material.Glass, 1].surface.bounce = 0.0f;
+            m_materialContacts[(int)Material.Glass, 1].surface.soft_cfm = 0.0f;
+            m_materialContacts[(int)Material.Glass, 1].surface.soft_erp = 0.50f;
+
+            m_materialContacts[(int)Material.Wood, 0] = new d.Contact();
+            m_materialContacts[(int)Material.Wood, 0].surface.mode  = d.ContactFlags.SoftCFM | d.ContactFlags.SoftERP | d.ContactFlags.Bounce;
+            m_materialContacts[(int)Material.Wood, 0].surface.mu = 45f;
+            m_materialContacts[(int)Material.Wood, 0].surface.bounce = 0.1f;
+            m_materialContacts[(int)Material.Wood, 0].surface.soft_cfm = 0.0f;
+            m_materialContacts[(int)Material.Wood, 0].surface.soft_erp = 0.50f;
+
+            m_materialContacts[(int)Material.Wood, 1] = new d.Contact();
+            m_materialContacts[(int)Material.Wood, 1].surface.mode = d.ContactFlags.SoftCFM | d.ContactFlags.SoftERP | d.ContactFlags.Bounce;
+            m_materialContacts[(int)Material.Wood, 1].surface.mu = 30f;
+            m_materialContacts[(int)Material.Wood, 1].surface.bounce = 0.1f;
+            m_materialContacts[(int)Material.Wood, 1].surface.soft_cfm = 0.0f;
+            m_materialContacts[(int)Material.Wood, 1].surface.soft_erp = 0.50f;
+
+            m_materialContacts[(int)Material.Flesh, 0] = new d.Contact();
+            m_materialContacts[(int)Material.Flesh, 0].surface.mode = d.ContactFlags.SoftCFM | d.ContactFlags.SoftERP | d.ContactFlags.Bounce;
+            m_materialContacts[(int)Material.Flesh, 0].surface.mu = 150f;
+            m_materialContacts[(int)Material.Flesh, 0].surface.bounce = 0.0f;
+            m_materialContacts[(int)Material.Flesh, 0].surface.soft_cfm = 0.0f;
+            m_materialContacts[(int)Material.Flesh, 0].surface.soft_erp = 0.50f;
+
+            m_materialContacts[(int)Material.Flesh, 1] = new d.Contact();
+            m_materialContacts[(int)Material.Flesh, 1].surface.mode = d.ContactFlags.SoftCFM | d.ContactFlags.SoftERP | d.ContactFlags.Bounce;
+            m_materialContacts[(int)Material.Flesh, 1].surface.mu = 100f;
+            m_materialContacts[(int)Material.Flesh, 1].surface.bounce = 0.0f;
+            m_materialContacts[(int)Material.Flesh, 1].surface.soft_cfm = 0.0f;
+            m_materialContacts[(int)Material.Flesh, 1].surface.soft_erp = 0.50f;
+
+            m_materialContacts[(int)Material.Plastic, 0] = new d.Contact();
+            m_materialContacts[(int)Material.Plastic, 0].surface.mode = d.ContactFlags.SoftCFM | d.ContactFlags.SoftERP | d.ContactFlags.Bounce;
+            m_materialContacts[(int)Material.Plastic, 0].surface.mu = 30f;
+            m_materialContacts[(int)Material.Plastic, 0].surface.bounce = 0.2f;
+            m_materialContacts[(int)Material.Plastic, 0].surface.soft_cfm = 0.0f;
+            m_materialContacts[(int)Material.Plastic, 0].surface.soft_erp = 0.50f;
+
+            m_materialContacts[(int)Material.Plastic, 1] = new d.Contact();
+            m_materialContacts[(int)Material.Plastic, 1].surface.mode = d.ContactFlags.SoftCFM | d.ContactFlags.SoftERP | d.ContactFlags.Bounce;
+            m_materialContacts[(int)Material.Plastic, 1].surface.mu = 20f;
+            m_materialContacts[(int)Material.Plastic, 1].surface.bounce = 0.2f;
+            m_materialContacts[(int)Material.Plastic, 1].surface.soft_cfm = 0.0f;
+            m_materialContacts[(int)Material.Plastic, 1].surface.soft_erp = 0.50f;
+
+            m_materialContacts[(int)Material.Rubber, 0] = new d.Contact();
+            m_materialContacts[(int)Material.Rubber, 0].surface.mode = d.ContactFlags.SoftCFM | d.ContactFlags.SoftERP | d.ContactFlags.Bounce;
+            m_materialContacts[(int)Material.Rubber, 0].surface.mu = 150f;
+            m_materialContacts[(int)Material.Rubber, 0].surface.bounce = 0.7f;
+            m_materialContacts[(int)Material.Rubber, 0].surface.soft_cfm = 0.0f;
+            m_materialContacts[(int)Material.Rubber, 0].surface.soft_erp = 0.50f;
+
+            m_materialContacts[(int)Material.Rubber, 1] = new d.Contact();
+            m_materialContacts[(int)Material.Rubber, 1].surface.mode = d.ContactFlags.SoftCFM | d.ContactFlags.SoftERP | d.ContactFlags.Bounce;
+            m_materialContacts[(int)Material.Rubber, 1].surface.mu = 100f;
+            m_materialContacts[(int)Material.Rubber, 1].surface.bounce = 0.7f;
+            m_materialContacts[(int)Material.Rubber, 1].surface.soft_cfm = 0.0f;
+            m_materialContacts[(int)Material.Rubber, 1].surface.soft_erp = 0.50f;
+
+            d.HashSpaceSetLevels(space, worldHashspaceLow, worldHashspaceHigh);
+
+            // Set the gravity,, don't disable things automatically (we set it explicitly on some things)
+
+            d.WorldSetGravity(world, gravityx, gravityy, gravityz);
+            d.WorldSetContactSurfaceLayer(world, contactsurfacelayer);
+
+
+            d.WorldSetLinearDampingThreshold(world, 256f);
+            d.WorldSetLinearDamping(world, 256f);
+//            d.WorldSetLinearDampingThreshold(world, 0.01f);
+//            d.WorldSetLinearDamping(world, 0.1f);
+            d.WorldSetAngularDampingThreshold(world, 256f);
+            d.WorldSetAngularDamping(world, 256f);
+            d.WorldSetMaxAngularSpeed(world, 256f);
+
+            // Set how many steps we go without running collision testing
+            // This is in addition to the step size.
+            // Essentially Steps * m_physicsiterations
+            d.WorldSetQuickStepNumIterations(world, m_physicsiterations);
+            //d.WorldSetContactMaxCorrectingVel(world, 1000.0f);
+
+            
+
+            for (int i = 0; i < staticPrimspace.GetLength(0); i++)
+            {
+                for (int j = 0; j < staticPrimspace.GetLength(1); j++)
+                {
+                    staticPrimspace[i, j] = IntPtr.Zero;
+                }
+            }
+        }
+
+        internal void waitForSpaceUnlock(IntPtr space)
+        {
+            //if (space != IntPtr.Zero)
+                //while (d.SpaceLockQuery(space)) { } // Wait and do nothing
+        }
+
+        /// <summary>
+        /// Debug space message for printing the space that a prim/avatar is in.
+        /// </summary>
+        /// <param name="pos"></param>
+        /// <returns>Returns which split up space the given position is in.</returns>
+        public string whichspaceamIin(Vector3 pos)
+        {
+            return calculateSpaceForGeom(pos).ToString();
+        }
+
+        #region Collision Detection
+
+        /// <summary>
+        /// This is our near callback.  A geometry is near a body
+        /// </summary>
+        /// <param name="space">The space that contains the geoms.  Remember, spaces are also geoms</param>
+        /// <param name="g1">a geometry or space</param>
+        /// <param name="g2">another geometry or space</param>
+        private void near(IntPtr space, IntPtr g1, IntPtr g2)
+        {
+            //  no lock here!  It's invoked from within Simulate(), which is thread-locked
+
+            // Test if we're colliding a geom with a space.
+            // If so we have to drill down into the space recursively
+//Console.WriteLine("near -----------");  //##
+            if (d.GeomIsSpace(g1) || d.GeomIsSpace(g2))
+            {
+                if (g1 == IntPtr.Zero || g2 == IntPtr.Zero)
+                    return;
+                
+                // Separating static prim geometry spaces.
+                // We'll be calling near recursivly if one
+                // of them is a space to find all of the
+                // contact points in the space
+                try
+                {
+                    d.SpaceCollide2(g1, g2, IntPtr.Zero, nearCallback);
+                }
+                catch (AccessViolationException)
+                {
+                    m_log.Warn("[PHYSICS]: Unable to collide test a space");
+                    return;
+                }
+                //Colliding a space or a geom with a space or a geom. so drill down
+
+                //Collide all geoms in each space..
+                //if (d.GeomIsSpace(g1)) d.SpaceCollide(g1, IntPtr.Zero, nearCallback);
+                //if (d.GeomIsSpace(g2)) d.SpaceCollide(g2, IntPtr.Zero, nearCallback);
+                return;
+            }
+
+            if (g1 == IntPtr.Zero || g2 == IntPtr.Zero)
+                return;
+
+            IntPtr b1 = d.GeomGetBody(g1);
+            IntPtr b2 = d.GeomGetBody(g2);
+
+            // d.GeomClassID id = d.GeomGetClass(g1);
+
+            String name1 = null;
+            String name2 = null;
+
+            if (!geom_name_map.TryGetValue(g1, out name1))
+            {
+                name1 = "null";
+            }
+            if (!geom_name_map.TryGetValue(g2, out name2))
+            {
+                name2 = "null";
+            }
+
+            //if (id == d.GeomClassId.TriMeshClass)
+            //{
+                //               m_log.InfoFormat("near: A collision was detected between {1} and {2}", 0, name1, name2);
+                //m_log.Debug("near: A collision was detected between {1} and {2}", 0, name1, name2);
+            //}
+
+            // Figure out how many contact points we have
+            int count = 0;
+            try
+            {
+                // Colliding Geom To Geom
+                // This portion of the function 'was' blatantly ripped off from BoxStack.cs
+
+                if (g1 == g2)
+                    return; // Can't collide with yourself
+
+                if (b1 != IntPtr.Zero && b2 != IntPtr.Zero && d.AreConnectedExcluding(b1, b2, d.JointType.Contact))
+                    return;
+
+                lock (contacts)
+                {
+                    count = d.Collide(g1, g2, contacts.Length, contacts, d.ContactGeom.SizeOf);
+                    if (count > contacts.Length)
+                        m_log.Error("[PHYSICS]: Got " + count + " contacts when we asked for a maximum of " + contacts.Length);
+                }
+            }
+            catch (SEHException)
+            {
+                m_log.Error("[PHYSICS]: The Operating system shut down ODE because of corrupt memory.  This could be a result of really irregular terrain.  If this repeats continuously, restart using Basic Physics and terrain fill your terrain.  Restarting the sim.");
+                ode.drelease(world);
+                base.TriggerPhysicsBasedRestart();
+            }
+            catch (Exception e)
+            {
+                m_log.WarnFormat("[PHYSICS]: Unable to collide test an object: {0}", e.Message);
+                return;
+            }
+
+            PhysicsActor p1;
+            PhysicsActor p2;
+
+            if (!actor_name_map.TryGetValue(g1, out p1))
+            {
+                p1 = PANull;
+            }
+
+            if (!actor_name_map.TryGetValue(g2, out p2))
+            {
+                p2 = PANull;
+            }
+
+            ContactPoint maxDepthContact = new ContactPoint();
+            if (p1.CollisionScore + count >= float.MaxValue)
+                p1.CollisionScore = 0;
+            p1.CollisionScore += count;
+
+            if (p2.CollisionScore + count >= float.MaxValue)
+                p2.CollisionScore = 0;
+            p2.CollisionScore += count;
+            for (int i = 0; i < count; i++)
+            {
+                d.ContactGeom curContact = contacts[i];
+
+                if (curContact.depth > maxDepthContact.PenetrationDepth)
+                {
+                    maxDepthContact = new ContactPoint(
+                        new Vector3(curContact.pos.X, curContact.pos.Y, curContact.pos.Z),
+                        new Vector3(curContact.normal.X, curContact.normal.Y, curContact.normal.Z),
+                        curContact.depth
+                    );
+                }
+
+                //m_log.Warn("[CCOUNT]: " + count);
+                IntPtr joint;
+                // If we're colliding with terrain, use 'TerrainContact' instead of AvatarStaticprimContact.
+                // allows us to have different settings
+                
+                // We only need to test p2 for 'jump crouch purposes'
+                if (p2 is OdeCharacter && p1.PhysicsActorType == (int)ActorTypes.Prim)
+                {
+                    // Testing if the collision is at the feet of the avatar
+
+                    //m_log.DebugFormat("[PHYSICS]: {0} - {1} - {2} - {3}", curContact.pos.Z, p2.Position.Z, (p2.Position.Z - curContact.pos.Z), (p2.Size.Z * 0.6f));
+//#@                    if ((p2.Position.Z - curContact.pos.Z) > (p2.Size.Z * 0.6f))
+//#@                        p2.IsColliding = true;
+                    if ((p2.Position.Z - curContact.pos.Z) > (p2.Size.Z * 0.6f)){       //##
+                        p2.IsColliding = true;       //##
+                    }else{
+
+                    }  //##   
+                 }
+                else
+                {
+                    p2.IsColliding = true;
+                }
+                
+                //if ((framecount % m_returncollisions) == 0)
+
+                switch (p1.PhysicsActorType)
+                {
+                    case (int)ActorTypes.Agent:
+                        p2.CollidingObj = true;
+                        break;
+                    case (int)ActorTypes.Prim:
+                        if (p2.Velocity.LengthSquared() > 0.0f)
+                            p2.CollidingObj = true;
+                        break;
+                    case (int)ActorTypes.Unknown:
+                        p2.CollidingGround = true;
+                        break;
+                    default:
+                        p2.CollidingGround = true;
+                        break;
+                }
+
+                // we don't want prim or avatar to explode
+
+                #region InterPenetration Handling - Unintended physics explosions
+# region disabled code1
+
+                if (curContact.depth >= 0.08f)
+                {
+                    //This is disabled at the moment only because it needs more tweaking
+                    //It will eventually be uncommented
+                    /*
+                    if (AvatarStaticprimContact.depth >= 1.00f)
+                    {
+                        //m_log.Debug("[PHYSICS]: " + AvatarStaticprimContact.depth.ToString());
+                    }
+
+                    //If you interpenetrate a prim with an agent
+                    if ((p2.PhysicsActorType == (int) ActorTypes.Agent &&
+                         p1.PhysicsActorType == (int) ActorTypes.Prim) ||
+                        (p1.PhysicsActorType == (int) ActorTypes.Agent &&
+                         p2.PhysicsActorType == (int) ActorTypes.Prim))
+                    {
+                        
+                        //AvatarStaticprimContact.depth = AvatarStaticprimContact.depth * 4.15f;
+                        /*
+                        if (p2.PhysicsActorType == (int) ActorTypes.Agent)
+                        {
+                            p2.CollidingObj = true;
+                            AvatarStaticprimContact.depth = 0.003f;
+                            p2.Velocity = p2.Velocity + new PhysicsVector(0, 0, 2.5f);
+                            OdeCharacter character = (OdeCharacter) p2;
+                            character.SetPidStatus(true);
+                            AvatarStaticprimContact.pos = new d.Vector3(AvatarStaticprimContact.pos.X + (p1.Size.X / 2), AvatarStaticprimContact.pos.Y + (p1.Size.Y / 2), AvatarStaticprimContact.pos.Z + (p1.Size.Z / 2));
+
+                        }
+                        else
+                        {
+
+                            //AvatarStaticprimContact.depth = 0.0000000f;
+                        }
+                        if (p1.PhysicsActorType == (int) ActorTypes.Agent)
+                        {
+
+                            p1.CollidingObj = true;
+                            AvatarStaticprimContact.depth = 0.003f;
+                            p1.Velocity = p1.Velocity + new PhysicsVector(0, 0, 2.5f);
+                            AvatarStaticprimContact.pos = new d.Vector3(AvatarStaticprimContact.pos.X + (p2.Size.X / 2), AvatarStaticprimContact.pos.Y + (p2.Size.Y / 2), AvatarStaticprimContact.pos.Z + (p2.Size.Z / 2));
+                            OdeCharacter character = (OdeCharacter)p1;
+                            character.SetPidStatus(true);
+                        }
+                        else
+                        {
+
+                            //AvatarStaticprimContact.depth = 0.0000000f;
+                        }
+                          
+                        
+                     
+                    }
+*/
+                    // If you interpenetrate a prim with another prim
+                /*
+                    if (p1.PhysicsActorType == (int) ActorTypes.Prim && p2.PhysicsActorType == (int) ActorTypes.Prim)
+                    {
+                        #region disabledcode2
+                        //OdePrim op1 = (OdePrim)p1;
+                        //OdePrim op2 = (OdePrim)p2;
+                        //op1.m_collisionscore++;
+                        //op2.m_collisionscore++;
+
+                        //if (op1.m_collisionscore > 8000 || op2.m_collisionscore > 8000)
+                        //{
+                            //op1.m_taintdisable = true;
+                            //AddPhysicsActorTaint(p1);
+                            //op2.m_taintdisable = true;
+                            //AddPhysicsActorTaint(p2);
+                        //}
+
+                        //if (AvatarStaticprimContact.depth >= 0.25f)
+                        //{
+                            // Don't collide, one or both prim will expld.
+
+                            //op1.m_interpenetrationcount++;
+                            //op2.m_interpenetrationcount++;
+                            //interpenetrations_before_disable = 200;
+                            //if (op1.m_interpenetrationcount >= interpenetrations_before_disable)
+                            //{
+                                //op1.m_taintdisable = true;
+                                //AddPhysicsActorTaint(p1);
+                            //}
+                            //if (op2.m_interpenetrationcount >= interpenetrations_before_disable)
+                            //{
+                               // op2.m_taintdisable = true;
+                                //AddPhysicsActorTaint(p2);
+                            //}
+
+                            //AvatarStaticprimContact.depth = AvatarStaticprimContact.depth / 8f;
+                            //AvatarStaticprimContact.normal = new d.Vector3(0, 0, 1);
+                        //}
+                        //if (op1.m_disabled || op2.m_disabled)
+                        //{
+                            //Manually disabled objects stay disabled
+                            //AvatarStaticprimContact.depth = 0f;
+                        //}
+                        #endregion
+                    }
+                    */
+#endregion
+                    if (curContact.depth >= 1.00f)
+                    {
+                        //m_log.Info("[P]: " + AvatarStaticprimContact.depth.ToString());
+                        if ((p2.PhysicsActorType == (int) ActorTypes.Agent &&
+                             p1.PhysicsActorType == (int) ActorTypes.Unknown) ||
+                            (p1.PhysicsActorType == (int) ActorTypes.Agent &&
+                             p2.PhysicsActorType == (int) ActorTypes.Unknown))
+                        {
+                            if (p2.PhysicsActorType == (int) ActorTypes.Agent)
+                            {
+                                if (p2 is OdeCharacter)
+                                {
+                                    OdeCharacter character = (OdeCharacter) p2;
+
+                                    //p2.CollidingObj = true;
+                                    curContact.depth = 0.00000003f;
+                                    p2.Velocity = p2.Velocity + new Vector3(0f, 0f, 0.5f);
+                                    curContact.pos =
+                                        new d.Vector3(curContact.pos.X + (p1.Size.X/2),
+                                                      curContact.pos.Y + (p1.Size.Y/2),
+                                                      curContact.pos.Z + (p1.Size.Z/2));
+                                    character.SetPidStatus(true);
+                                }
+                            }
+                            
+
+                            if (p1.PhysicsActorType == (int) ActorTypes.Agent)
+                            {
+                                if (p1 is OdeCharacter)
+                                {
+                                    OdeCharacter character = (OdeCharacter) p1;
+
+                                    //p2.CollidingObj = true;
+                                    curContact.depth = 0.00000003f;
+                                    p1.Velocity = p1.Velocity + new Vector3(0f, 0f, 0.5f);
+                                    curContact.pos =
+                                        new d.Vector3(curContact.pos.X + (p1.Size.X/2),
+                                                      curContact.pos.Y + (p1.Size.Y/2),
+                                                      curContact.pos.Z + (p1.Size.Z/2));
+                                    character.SetPidStatus(true);
+                                }
+                            }
+                        }
+                    }
+                }
+
+                #endregion
+
+                // Logic for collision handling
+                // Note, that if *all* contacts are skipped (VolumeDetect)
+                // The prim still detects (and forwards) collision events but 
+                // appears to be phantom for the world
+                Boolean skipThisContact = false;
+
+                if ((p1 is OdePrim) && (((OdePrim)p1).m_isVolumeDetect))
+                    skipThisContact = true;   // No collision on volume detect prims
+
+                if (!skipThisContact && (p2 is OdePrim) && (((OdePrim)p2).m_isVolumeDetect))
+                    skipThisContact = true;   // No collision on volume detect prims
+
+                if (!skipThisContact && curContact.depth < 0f)
+                    skipThisContact = true;
+
+                if (!skipThisContact && checkDupe(curContact, p2.PhysicsActorType))
+                    skipThisContact = true;
+
+                const int maxContactsbeforedeath = 4000;
+                joint = IntPtr.Zero;
+
+                if (!skipThisContact)
+                {
+                    //   Add contact joints with materials params----------------------------------
+                    // p1 is what is being hit, p2 is the physical object doing the hitting
+                    int material = (int) Material.Wood;
+                    int movintYN = 0;  // 1 = Sliding; 0 = static or fell onto
+                    if (Math.Abs(p2.Velocity.X) > 0.01f || Math.Abs(p2.Velocity.Y) > 0.01f) movintYN = 1;
+
+                    // If we're colliding against terrain
+                    if (name1 == "Terrain" || name2 == "Terrain")
+                    {
+                        // If we're moving
+                        if ((p2.PhysicsActorType == (int) ActorTypes.Agent) && (movintYN == 1))
+                        {
+                            //$ Av walk/run on terrain (not falling) Use the Avatar movement terrain contact
+                            AvatarMovementTerrainContact.geom = curContact;
+                            _perloopContact.Add(curContact);
+                            if (m_global_contactcount < maxContactsbeforedeath)
+                            {
+                                joint = d.JointCreateContact(world, contactgroup, ref AvatarMovementTerrainContact);
+                                m_global_contactcount++;
+                            }
+                        }
+                        else
+                        {
+                            if (p2.PhysicsActorType == (int)ActorTypes.Agent)
+                            {
+                                //$ Av standing on terrain, Use the non moving Avata terrain contact
+                                TerrainContact.geom = curContact;
+                                _perloopContact.Add(curContact);
+                                if (m_global_contactcount < maxContactsbeforedeath)
+                                {
+                                    joint = d.JointCreateContact(world, contactgroup, ref TerrainContact);
+                                    m_global_contactcount++;
+                                }
+                            }
+                            else
+                            {
+                                if (p2.PhysicsActorType == (int)ActorTypes.Prim && p1.PhysicsActorType == (int)ActorTypes.Prim)
+                                {
+                                    //& THIS NEVER HAPPENS? prim prim contact In terrain contact?
+                                    // int pj294950 = 0;
+                                    // prim terrain contact
+
+                                    if (p2 is OdePrim)
+                                        material = ((OdePrim)p2).m_material;
+                                    //m_log.DebugFormat("Material: {0}", material);
+                                    m_materialContacts[material, movintYN].geom = curContact;
+                                    _perloopContact.Add(curContact);
+
+                                    if (m_global_contactcount < maxContactsbeforedeath)
+                                    {
+                                        joint = d.JointCreateContact(world, contactgroup, ref m_materialContacts[material, movintYN]);
+                                        m_global_contactcount++;
+
+                                    }
+                                    
+                                }
+                                else
+                                {
+                                   //$ prim on terrain contact
+                                    if (p2 is OdePrim)
+                                        material = ((OdePrim)p2).m_material;
+                                    //m_log.DebugFormat("Material: {0}", material);
+                                    m_materialContacts[material, movintYN].geom = curContact;
+                                    _perloopContact.Add(curContact);
+
+                                    ContactCopy = m_materialContacts[material, movintYN];
+                                    if(movintYN == 1)
+                                    {
+                                        // prevent excessive slide on terrain
+                                        ContactCopy.surface.mu = m_materialContacts[material, movintYN].surface.mu * 30.0f;
+                                    }
+
+                                    if (m_global_contactcount < maxContactsbeforedeath)
+                                    {
+                                        joint = d.JointCreateContact(world, contactgroup, ref ContactCopy);
+                                        m_global_contactcount++;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    else if (name1 == "Water" || name2 == "Water")
+                    {
+                        //$ This never happens! Perhaps water is treated like air?
+                        /*
+                        if ((p2.PhysicsActorType == (int) ActorTypes.Prim))
+                        {
+                        }
+                        else
+                        {
+                        }
+                        */
+                        //WaterContact.surface.soft_cfm = 0.0000f;
+                        //WaterContact.surface.soft_erp = 0.00000f;
+                        if (curContact.depth > 0.1f)
+                        {
+                            curContact.depth *= 52;
+                            //AvatarStaticprimContact.normal = new d.Vector3(0, 0, 1);
+                            //AvatarStaticprimContact.pos = new d.Vector3(0, 0, contact.pos.Z - 5f);
+                        }
+                        WaterContact.geom = curContact;
+                        _perloopContact.Add(curContact);
+                        if (m_global_contactcount < maxContactsbeforedeath)
+                        {
+                            joint = d.JointCreateContact(world, contactgroup, ref WaterContact);
+                            m_global_contactcount++;
+                        }
+                        //m_log.Info("[PHYSICS]: Prim Water Contact" + AvatarStaticprimContact.depth);
+                    }
+                    else
+                    {
+
+                        // no terrain and no water, we're colliding with prim or avatar
+                        // check if we're moving
+                        if ((p2.PhysicsActorType == (int)ActorTypes.Agent))
+                        {
+                            //$ Avatar on Prim or other Avatar
+                            if (movintYN == 1)
+                            {
+                                // Use the AV Movement / prim contact
+                                AvatarMovementprimContact.geom = curContact;
+                                _perloopContact.Add(curContact);
+                                if (m_global_contactcount < maxContactsbeforedeath)
+                                {
+                                    joint = d.JointCreateContact(world, contactgroup, ref AvatarMovementprimContact);
+                                    m_global_contactcount++;
+                                }
+                            }
+                            else
+                            {
+                                // Use the Av non movement / prim contact
+                                AvatarStaticprimContact.geom = curContact;
+                                _perloopContact.Add(curContact);
+                                ContactCopy = AvatarStaticprimContact;   // local copy so we can change locally
+
+                                if (m_global_contactcount < maxContactsbeforedeath)
+                                {
+                                    if (curContact.depth > 0.2)
+                                    {   // embedded, eject slowly
+                                        ContactCopy.surface.soft_erp = 0.1f;
+                                        ContactCopy.surface.soft_cfm = 0.1f;
+                                    }
+                                    else 
+                                    {   // keep on the surface
+                                        ContactCopy.surface.soft_erp = 0.3f;
+                                        ContactCopy.surface.soft_cfm = 0.0f;
+                                    }
+                                    joint = d.JointCreateContact(world, contactgroup, ref ContactCopy);
+                                    m_global_contactcount++;
+                                }
+                            }
+                        }
+                        else if (p2.PhysicsActorType == (int)ActorTypes.Prim)
+                        {
+                            //$ Prim on Prim
+                            //p1.PhysicsActorType
+
+                            if (p2 is OdePrim) material = ((OdePrim)p2).m_material;
+                            //m_log.DebugFormat("Material: {0}", material);
+                            
+                            m_materialContacts[material, movintYN].geom = curContact;
+                            _perloopContact.Add(curContact);
+
+                           if (m_global_contactcount < maxContactsbeforedeath)
+                            {
+                                joint = d.JointCreateContact(world, contactgroup, ref m_materialContacts[material, movintYN]);
+                                m_global_contactcount++;
+                            }
+                        }
+                    }
+
+                    if (m_global_contactcount < maxContactsbeforedeath && joint != IntPtr.Zero) // stack collide!
+                    {
+                        d.JointAttach(joint, b1, b2);
+                        m_global_contactcount++;
+                    }
+
+                }
+                collision_accounting_events(p1, p2, maxDepthContact);
+                if (count > geomContactPointsStartthrottle)
+                {
+                    // If there are more then 3 contact points, it's likely
+                    // that we've got a pile of objects, so ...
+                    // We don't want to send out hundreds of terse updates over and over again
+                    // so lets throttle them and send them again after it's somewhat sorted out.
+                    p2.ThrottleUpdates = true;
+                }
+                //m_log.Debug(count.ToString());
+                //m_log.Debug("near: A collision was detected between {1} and {2}", 0, name1, name2);
+            } // end for i.. loop
+        } // end near
+
+        private bool checkDupe(d.ContactGeom contactGeom, int atype)
+        {
+            bool result = false;
+            //return result;
+            if (!m_filterCollisions)
+                return false;
+
+            ActorTypes at = (ActorTypes)atype;
+            lock (_perloopContact)
+            {
+                foreach (d.ContactGeom contact in _perloopContact)
+                {
+                    //if ((contact.g1 == contactGeom.g1 && contact.g2 == contactGeom.g2))
+                    //{
+                        // || (contact.g2 == contactGeom.g1 && contact.g1 == contactGeom.g2)
+                    if (at == ActorTypes.Agent)
+                    {
+                            if (((Math.Abs(contactGeom.normal.X - contact.normal.X) < 1.026f) && (Math.Abs(contactGeom.normal.Y - contact.normal.Y) < 0.303f) && (Math.Abs(contactGeom.normal.Z - contact.normal.Z) < 0.065f)) && contactGeom.g1 != LandGeom && contactGeom.g2 != LandGeom)
+                            {
+                                
+                                if (Math.Abs(contact.depth - contactGeom.depth) < 0.052f)
+                                {
+                                    //contactGeom.depth *= .00005f;
+                                   //m_log.DebugFormat("[Collsion]: Depth {0}", Math.Abs(contact.depth - contactGeom.depth));
+                                    // m_log.DebugFormat("[Collision]: <{0},{1},{2}>", Math.Abs(contactGeom.normal.X - contact.normal.X), Math.Abs(contactGeom.normal.Y - contact.normal.Y), Math.Abs(contactGeom.normal.Z - contact.normal.Z));
+                                    result = true;
+                                    break;
+                                }
+                                else
+                                {
+                                    //m_log.DebugFormat("[Collsion]: Depth {0}", Math.Abs(contact.depth - contactGeom.depth));
+                                }
+                            }
+                            else
+                            {
+                                //m_log.DebugFormat("[Collision]: <{0},{1},{2}>", Math.Abs(contactGeom.normal.X - contact.normal.X), Math.Abs(contactGeom.normal.Y - contact.normal.Y), Math.Abs(contactGeom.normal.Z - contact.normal.Z));
+                                //int i = 0;
+                            }
+                    } 
+                    else if (at == ActorTypes.Prim)
+                    {
+                            //d.AABB aabb1 = new d.AABB();
+                            //d.AABB aabb2 = new d.AABB();
+
+                            //d.GeomGetAABB(contactGeom.g2, out aabb2);
+                            //d.GeomGetAABB(contactGeom.g1, out aabb1);
+                            //aabb1.
+                            if (((Math.Abs(contactGeom.normal.X - contact.normal.X) < 1.026f) && (Math.Abs(contactGeom.normal.Y - contact.normal.Y) < 0.303f) && (Math.Abs(contactGeom.normal.Z - contact.normal.Z) < 0.065f)) && contactGeom.g1 != LandGeom && contactGeom.g2 != LandGeom)
+                            {
+                                if (contactGeom.normal.X == contact.normal.X && contactGeom.normal.Y == contact.normal.Y && contactGeom.normal.Z == contact.normal.Z)
+                                {
+                                    if (Math.Abs(contact.depth - contactGeom.depth) < 0.272f)
+                                    {
+                                        result = true;
+                                        break;
+                                    }
+                                }
+                                //m_log.DebugFormat("[Collsion]: Depth {0}", Math.Abs(contact.depth - contactGeom.depth));
+                                //m_log.DebugFormat("[Collision]: <{0},{1},{2}>", Math.Abs(contactGeom.normal.X - contact.normal.X), Math.Abs(contactGeom.normal.Y - contact.normal.Y), Math.Abs(contactGeom.normal.Z - contact.normal.Z));
+                            }
+                            
+                    }
+                    
+                    //}
+
+                }
+            }
+            return result;
+        }
+
+        private void collision_accounting_events(PhysicsActor p1, PhysicsActor p2, ContactPoint contact)
+        {
+            // obj1LocalID = 0;
+            //returncollisions = false;
+            obj2LocalID = 0;
+            //ctype = 0;
+            //cStartStop = 0;
+            if (!p2.SubscribedEvents() && !p1.SubscribedEvents())
+                return;
+
+            switch ((ActorTypes)p2.PhysicsActorType)
+            {
+                case ActorTypes.Agent:
+                    cc2 = (OdeCharacter)p2;
+
+                    // obj1LocalID = cc2.m_localID;
+                    switch ((ActorTypes)p1.PhysicsActorType)
+                    {
+                        case ActorTypes.Agent:
+                            cc1 = (OdeCharacter)p1;
+                            obj2LocalID = cc1.m_localID;
+                            cc1.AddCollisionEvent(cc2.m_localID, contact);
+                            //ctype = (int)CollisionCategories.Character;
+
+                            //if (cc1.CollidingObj)
+                            //cStartStop = (int)StatusIndicators.Generic;
+                            //else
+                            //cStartStop = (int)StatusIndicators.Start;
+
+                            //returncollisions = true;
+                            break;
+                        case ActorTypes.Prim:
+                            if (p1 is OdePrim)
+                            {
+                                cp1 = (OdePrim) p1;
+                                obj2LocalID = cp1.m_localID;
+                                cp1.AddCollisionEvent(cc2.m_localID, contact);
+                            }
+                            //ctype = (int)CollisionCategories.Geom;
+
+                            //if (cp1.CollidingObj)
+                            //cStartStop = (int)StatusIndicators.Generic;
+                            //else
+                            //cStartStop = (int)StatusIndicators.Start;
+
+                            //returncollisions = true;
+                            break;
+
+                        case ActorTypes.Ground:
+                        case ActorTypes.Unknown:
+                            obj2LocalID = 0;
+                            //ctype = (int)CollisionCategories.Land;
+                            //returncollisions = true;
+                            break;
+                    }
+
+                    cc2.AddCollisionEvent(obj2LocalID, contact);
+                    break;
+                case ActorTypes.Prim:
+
+                    if (p2 is OdePrim)
+                    {
+                        cp2 = (OdePrim) p2;
+
+                        // obj1LocalID = cp2.m_localID;
+                        switch ((ActorTypes) p1.PhysicsActorType)
+                        {
+                            case ActorTypes.Agent:
+                                if (p1 is OdeCharacter)
+                                {
+                                    cc1 = (OdeCharacter) p1;
+                                    obj2LocalID = cc1.m_localID;
+                                    cc1.AddCollisionEvent(cp2.m_localID, contact);
+                                    //ctype = (int)CollisionCategories.Character;
+
+                                    //if (cc1.CollidingObj)
+                                    //cStartStop = (int)StatusIndicators.Generic;
+                                    //else
+                                    //cStartStop = (int)StatusIndicators.Start;
+                                    //returncollisions = true;
+                                }
+                                break;
+                            case ActorTypes.Prim:
+
+                                if (p1 is OdePrim)
+                                {
+                                    cp1 = (OdePrim) p1;
+                                    obj2LocalID = cp1.m_localID;
+                                    cp1.AddCollisionEvent(cp2.m_localID, contact);
+                                    //ctype = (int)CollisionCategories.Geom;
+
+                                    //if (cp1.CollidingObj)
+                                    //cStartStop = (int)StatusIndicators.Generic;
+                                    //else
+                                    //cStartStop = (int)StatusIndicators.Start;
+
+                                    //returncollisions = true;
+                                }
+                                break;
+
+                            case ActorTypes.Ground:
+                            case ActorTypes.Unknown:
+                                obj2LocalID = 0;
+                                //ctype = (int)CollisionCategories.Land;
+
+                                //returncollisions = true;
+                                break;
+                        }
+
+                        cp2.AddCollisionEvent(obj2LocalID, contact);
+                    }
+                    break;
+            }
+            //if (returncollisions)
+            //{
+
+                //lock (m_storedCollisions)
+                //{
+                    //cDictKey = obj1LocalID.ToString() + obj2LocalID.ToString() + cStartStop.ToString() + ctype.ToString();
+                    //if (m_storedCollisions.ContainsKey(cDictKey))
+                    //{
+                        //sCollisionData objd = m_storedCollisions[cDictKey];
+                        //objd.NumberOfCollisions += 1;
+                        //objd.lastframe = framecount;
+                        //m_storedCollisions[cDictKey] = objd;
+                    //}
+                    //else
+                    //{
+                        //sCollisionData objd = new sCollisionData();
+                        //objd.ColliderLocalId = obj1LocalID;
+                        //objd.CollidedWithLocalId = obj2LocalID;
+                        //objd.CollisionType = ctype;
+                        //objd.NumberOfCollisions = 1;
+                        //objd.lastframe = framecount;
+                        //objd.StatusIndicator = cStartStop;
+                        //m_storedCollisions.Add(cDictKey, objd);
+                    //}
+                //}
+           // }
+        }
+
+        public int TriArrayCallback(IntPtr trimesh, IntPtr refObject, int[] triangleIndex, int triCount)
+        {
+            /*            String name1 = null;
+                        String name2 = null;
+
+                        if (!geom_name_map.TryGetValue(trimesh, out name1))
+                        {
+                            name1 = "null";
+                        }
+                        if (!geom_name_map.TryGetValue(refObject, out name2))
+                        {
+                            name2 = "null";
+                        }
+
+                        m_log.InfoFormat("TriArrayCallback: A collision was detected between {1} and {2}", 0, name1, name2);
+            */
+            return 1;
+        }
+
+        public int TriCallback(IntPtr trimesh, IntPtr refObject, int triangleIndex)
+        {
+            String name1 = null;
+            String name2 = null;
+
+            if (!geom_name_map.TryGetValue(trimesh, out name1))
+            {
+                name1 = "null";
+            }
+
+            if (!geom_name_map.TryGetValue(refObject, out name2))
+            {
+                name2 = "null";
+            }
+
+            //            m_log.InfoFormat("TriCallback: A collision was detected between {1} and {2}. Index was {3}", 0, name1, name2, triangleIndex);
+
+            d.Vector3 v0 = new d.Vector3();
+            d.Vector3 v1 = new d.Vector3();
+            d.Vector3 v2 = new d.Vector3();
+
+            d.GeomTriMeshGetTriangle(trimesh, 0, ref v0, ref v1, ref v2);
+            //            m_log.DebugFormat("Triangle {0} is <{1},{2},{3}>, <{4},{5},{6}>, <{7},{8},{9}>", triangleIndex, v0.X, v0.Y, v0.Z, v1.X, v1.Y, v1.Z, v2.X, v2.Y, v2.Z);
+
+            return 1;
+        }
+
+        /// <summary>
+        /// This is our collision testing routine in ODE
+        /// </summary>
+        /// <param name="timeStep"></param>
+        private void collision_optimized(float timeStep)
+        {
+            _perloopContact.Clear();
+
+            lock (_characters)
+            {
+                foreach (OdeCharacter chr in _characters)
+                {
+                    // Reset the collision values to false
+                    // since we don't know if we're colliding yet
+                    
+                    // For some reason this can happen. Don't ask...
+                    //
+                    if (chr == null)
+                        continue;
+                    
+                    if (chr.Shell == IntPtr.Zero || chr.Body == IntPtr.Zero)
+                        continue;
+                    
+                    chr.IsColliding = false;
+                    chr.CollidingGround = false;
+                    chr.CollidingObj = false;
+                    
+                    // test the avatar's geometry for collision with the space
+                    // This will return near and the space that they are the closest to
+                    // And we'll run this again against the avatar and the space segment
+                    // This will return with a bunch of possible objects in the space segment
+                    // and we'll run it again on all of them.
+                    try
+                    {
+                        d.SpaceCollide2(space, chr.Shell, IntPtr.Zero, nearCallback);
+                    }
+                    catch (AccessViolationException)
+                    {
+                        m_log.Warn("[PHYSICS]: Unable to space collide");
+                    }
+                    //float terrainheight = GetTerrainHeightAtXY(chr.Position.X, chr.Position.Y);
+                    //if (chr.Position.Z + (chr.Velocity.Z * timeStep) < terrainheight + 10)
+                    //{
+                    //chr.Position.Z = terrainheight + 10.0f;
+                    //forcedZ = true;
+                    //}
+                }
+            }
+
+            lock (_activeprims)
+            {
+                List<OdePrim> removeprims = null;
+                foreach (OdePrim chr in _activeprims)
+                {
+                    if (chr.Body != IntPtr.Zero && d.BodyIsEnabled(chr.Body) && (!chr.m_disabled) && !chr.m_outofBounds)
+                    {
+                        try
+                        {
+                            lock (chr)
+                            {
+                                if (space != IntPtr.Zero && chr.prim_geom != IntPtr.Zero && chr.m_taintremove == false)
+                                {
+                                    d.SpaceCollide2(space, chr.prim_geom, IntPtr.Zero, nearCallback);
+                                }
+                                else
+                                {
+                                    if (removeprims == null)
+                                    {
+                                        removeprims = new List<OdePrim>();
+                                    }
+                                    removeprims.Add(chr);
+                                    /// Commented this because it triggers on every bullet
+                                    //m_log.Debug("[PHYSICS]: unable to collide test active prim against space.  The space was zero, the geom was zero or it was in the process of being removed.  Removed it from the active prim list.  This needs to be fixed!");
+                                }
+                            }
+                        }
+                        catch (AccessViolationException)
+                        {
+                            m_log.Warn("[PHYSICS]: Unable to space collide");
+                        }
+                    }
+                }
+                if (removeprims != null)
+                {
+                    foreach (OdePrim chr in removeprims)
+                    {
+                        _activeprims.Remove(chr);
+                    }
+                }
+            }
+
+            _perloopContact.Clear();
+        }
+
+        #endregion
+
+        public override void Combine(PhysicsScene pScene, Vector3 offset, Vector3 extents)
+        {
+            m_worldOffset = offset;
+            WorldExtents = new Vector2(extents.X, extents.Y);
+            m_parentScene = pScene;
+            
+        }
+        
+        // Recovered for use by fly height. Kitto Flora
+        public float GetTerrainHeightAtXY(float x, float y)
+        {
+
+            int offsetX = ((int)(x / (int)Constants.RegionSize)) * (int)Constants.RegionSize;
+            int offsetY = ((int)(y / (int)Constants.RegionSize)) * (int)Constants.RegionSize;
+
+            IntPtr heightFieldGeom = IntPtr.Zero;
+
+            if (RegionTerrain.TryGetValue(new Vector3(offsetX,offsetY,0), out heightFieldGeom))
+            {
+                if (heightFieldGeom != IntPtr.Zero)
+                {
+                    if (TerrainHeightFieldHeights.ContainsKey(heightFieldGeom))
+                    {
+                        
+                        int index;
+
+
+                        if ((int)x > WorldExtents.X || (int)y > WorldExtents.Y ||
+                            (int)x < 0.001f || (int)y < 0.001f)
+                            return 0;
+
+                        x = x - offsetX;
+                        y = y - offsetY;
+
+                        index = (int)((int)x * ((int)Constants.RegionSize + 2) + (int)y);
+
+                        if (index < TerrainHeightFieldHeights[heightFieldGeom].Length)
+                        {
+                            //m_log.DebugFormat("x{0} y{1} = {2}", x, y, (float)TerrainHeightFieldHeights[heightFieldGeom][index]);
+                            return (float)TerrainHeightFieldHeights[heightFieldGeom][index];
+                        }
+                            
+                        else
+                            return 0f;
+                    }
+                    else
+                    {
+                        return 0f;
+                    }
+
+                }
+                else
+                {
+                    return 0f;
+                }
+
+            }
+            else
+            {
+                return 0f;
+            }
+
+
+        } 
+// End recovered. Kitto Flora
+
+        public void addCollisionEventReporting(PhysicsActor obj)
+        {
+            lock (_collisionEventPrim)
+            {
+                if (!_collisionEventPrim.Contains(obj))
+                    _collisionEventPrim.Add(obj);
+            }
+        }
+
+        public void remCollisionEventReporting(PhysicsActor obj)
+        {
+            lock (_collisionEventPrim)
+            {
+                if (!_collisionEventPrim.Contains(obj))
+                    _collisionEventPrim.Remove(obj);
+            }
+        }
+
+        #region Add/Remove Entities
+
+        public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying)
+        {
+            Vector3 pos;
+            pos.X = position.X;
+            pos.Y = position.Y;
+            pos.Z = position.Z;
+            OdeCharacter newAv = new OdeCharacter(avName, this, pos, ode, size, avPIDD, avPIDP, avCapRadius, avStandupTensor, avDensity, avHeightFudgeFactor, avMovementDivisorWalk, avMovementDivisorRun);
+            newAv.Flying = isFlying;
+            newAv.MinimumGroundFlightOffset = minimumGroundFlightOffset;
+            
+            return newAv;
+        }
+
+        public void AddCharacter(OdeCharacter chr)
+        {
+            lock (_characters)
+            {
+                if (!_characters.Contains(chr))
+                {
+                    _characters.Add(chr);
+                    if (chr.bad)
+                        m_log.DebugFormat("[PHYSICS] Added BAD actor {0} to characters list", chr.m_uuid);
+                }
+            }
+        }
+
+        public void RemoveCharacter(OdeCharacter chr)
+        {
+            lock (_characters)
+            {
+                if (_characters.Contains(chr))
+                {
+                    _characters.Remove(chr);
+                }
+            }
+        }
+        public void BadCharacter(OdeCharacter chr)
+        {
+            lock (_badCharacter)
+            {
+                if (!_badCharacter.Contains(chr))
+                    _badCharacter.Add(chr);
+            }
+        }
+
+        public override void RemoveAvatar(PhysicsActor actor)
+        {
+            //m_log.Debug("[PHYSICS]:ODELOCK");
+            ((OdeCharacter) actor).Destroy();
+            
+        }
+
+        private PhysicsActor AddPrim(String name, Vector3 position, Vector3 size, Quaternion rotation,
+                             IMesh mesh, PrimitiveBaseShape pbs, bool isphysical, bool isphantom, byte shapetype, uint localid)
+        {
+
+            Vector3 pos = position;
+            Vector3 siz = size;
+            Quaternion rot = rotation;
+
+            OdePrim newPrim;
+            lock (OdeLock)
+            {
+                newPrim = new OdePrim(name, this, pos, siz, rot, mesh, pbs, isphysical, isphantom, shapetype, ode, localid);
+
+                lock (_prims)
+                    _prims.Add(newPrim);
+            }
+
+            return newPrim;
+        }
+
+
+        public void addActivePrim(OdePrim activatePrim)
+        {
+            // adds active prim..   (ones that should be iterated over in collisions_optimized
+            lock (_activeprims)
+            {
+                if (!_activeprims.Contains(activatePrim))
+                    _activeprims.Add(activatePrim);
+                //else
+                  //  m_log.Warn("[PHYSICS]: Double Entry in _activeprims detected, potential crash immenent");
+            }
+        }
+
+        public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
+                                                  Vector3 size, Quaternion rotation, bool isPhysical, uint localid)
+        {
+            PhysicsActor result;
+            IMesh mesh = null;
+
+            if (needsMeshing(pbs))
+                mesh = mesher.CreateMesh(primName, pbs, size, (int)LevelOfDetail.High, true);
+
+            result = AddPrim(primName, position, size, rotation, mesh, pbs, isPhysical,false,0, localid);
+
+            return result;
+        }
+
+        public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
+                                                  Vector3 size, Quaternion rotation, bool isPhysical, bool isPhantom, uint localid)
+        {
+            PhysicsActor result;
+            IMesh mesh = null;
+
+            if (needsMeshing(pbs))
+                mesh = mesher.CreateMesh(primName, pbs, size, (int)LevelOfDetail.High, true);
+
+            result = AddPrim(primName, position, size, rotation, mesh, pbs, isPhysical, isPhantom,0, localid);
+
+            return result;
+        }
+
+        public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
+                                                  Vector3 size, Quaternion rotation, bool isPhysical, bool isPhantom, byte shapetype, uint localid)
+        {
+            PhysicsActor result;
+            IMesh mesh = null;
+
+            if (needsMeshing(pbs))
+                mesh = mesher.CreateMesh(primName, pbs, size, (int)LevelOfDetail.High, true);
+
+            result = AddPrim(primName, position, size, rotation, mesh, pbs, isPhysical, isPhantom, shapetype, localid);
+
+            return result;
+        }
+
+        public override float TimeDilation
+        {
+            get { return m_timeDilation; }
+        }
+
+        public override bool SupportsNINJAJoints
+        {
+            get { return m_NINJA_physics_joints_enabled; }
+        }
+
+        // internal utility function: must be called within a lock (OdeLock)
+        private void InternalAddActiveJoint(PhysicsJoint joint)
+        {
+            activeJoints.Add(joint);
+            SOPName_to_activeJoint.Add(joint.ObjectNameInScene, joint);
+        }
+
+        // internal utility function: must be called within a lock (OdeLock)
+        private void InternalAddPendingJoint(OdePhysicsJoint joint)
+        {
+            pendingJoints.Add(joint);
+            SOPName_to_pendingJoint.Add(joint.ObjectNameInScene, joint);
+        }
+
+        // internal utility function: must be called within a lock (OdeLock)
+        private void InternalRemovePendingJoint(PhysicsJoint joint)
+        {
+            pendingJoints.Remove(joint);
+            SOPName_to_pendingJoint.Remove(joint.ObjectNameInScene);
+        }
+
+        // internal utility function: must be called within a lock (OdeLock)
+        private void InternalRemoveActiveJoint(PhysicsJoint joint)
+        {
+            activeJoints.Remove(joint);
+            SOPName_to_activeJoint.Remove(joint.ObjectNameInScene);
+        }
+
+        public override void DumpJointInfo()
+        {
+            string hdr = "[NINJA] JOINTINFO: ";
+            foreach (PhysicsJoint j in pendingJoints)
+            {
+                m_log.Debug(hdr + " pending joint, Name: " + j.ObjectNameInScene + " raw parms:" + j.RawParams);
+            }
+            m_log.Debug(hdr + pendingJoints.Count + " total pending joints");
+            foreach (string jointName in SOPName_to_pendingJoint.Keys)
+            {
+                m_log.Debug(hdr + " pending joints dict contains Name: " + jointName);
+            }
+            m_log.Debug(hdr + SOPName_to_pendingJoint.Keys.Count + " total pending joints dict entries");
+            foreach (PhysicsJoint j in activeJoints)
+            {
+                m_log.Debug(hdr + " active joint, Name: " + j.ObjectNameInScene + " raw parms:" + j.RawParams);
+            }
+            m_log.Debug(hdr + activeJoints.Count + " total active joints");
+            foreach (string jointName in SOPName_to_activeJoint.Keys)
+            {
+                m_log.Debug(hdr + " active joints dict contains Name: " + jointName);
+            }
+            m_log.Debug(hdr + SOPName_to_activeJoint.Keys.Count + " total active joints dict entries");
+
+            m_log.Debug(hdr + " Per-body joint connectivity information follows.");
+            m_log.Debug(hdr + joints_connecting_actor.Keys.Count + " bodies are connected by joints.");
+            foreach (string actorName in joints_connecting_actor.Keys)
+            {
+                m_log.Debug(hdr + " Actor " + actorName + " has the following joints connecting it");
+                foreach (PhysicsJoint j in joints_connecting_actor[actorName])
+                {
+                    m_log.Debug(hdr + " * joint Name: " + j.ObjectNameInScene + " raw parms:" + j.RawParams);
+                }
+                m_log.Debug(hdr + joints_connecting_actor[actorName].Count + " connecting joints total for this actor");
+            }
+        }
+
+        public override void RequestJointDeletion(string ObjectNameInScene)
+        {
+            lock (externalJointRequestsLock)
+            {
+                if (!requestedJointsToBeDeleted.Contains(ObjectNameInScene)) // forbid same deletion request from entering twice to prevent spurious deletions processed asynchronously
+                {
+                    requestedJointsToBeDeleted.Add(ObjectNameInScene);
+                }
+            }
+        }
+
+        private void DeleteRequestedJoints()
+        {
+            List<string> myRequestedJointsToBeDeleted;
+            lock (externalJointRequestsLock)
+            {
+                // make a local copy of the shared list for processing (threading issues)
+                myRequestedJointsToBeDeleted = new List<string>(requestedJointsToBeDeleted);
+            }
+
+            foreach (string jointName in myRequestedJointsToBeDeleted)
+            {
+                lock (OdeLock)
+                {
+                    //m_log.Debug("[NINJA] trying to deleting requested joint " + jointName);
+                    if (SOPName_to_activeJoint.ContainsKey(jointName) || SOPName_to_pendingJoint.ContainsKey(jointName))
+                    {
+                        OdePhysicsJoint joint = null;
+                        if (SOPName_to_activeJoint.ContainsKey(jointName))
+                        {
+                            joint = SOPName_to_activeJoint[jointName] as OdePhysicsJoint;
+                            InternalRemoveActiveJoint(joint);
+                        }
+                        else if (SOPName_to_pendingJoint.ContainsKey(jointName))
+                        {
+                            joint = SOPName_to_pendingJoint[jointName] as OdePhysicsJoint;
+                            InternalRemovePendingJoint(joint);
+                        }
+
+                        if (joint != null)
+                        {
+                            //m_log.Debug("joint.BodyNames.Count is " + joint.BodyNames.Count + " and contents " + joint.BodyNames);
+                            for (int iBodyName = 0; iBodyName < 2; iBodyName++)
+                            {
+                                string bodyName = joint.BodyNames[iBodyName];
+                                if (bodyName != "NULL")
+                                {
+                                    joints_connecting_actor[bodyName].Remove(joint);
+                                    if (joints_connecting_actor[bodyName].Count == 0)
+                                    {
+                                        joints_connecting_actor.Remove(bodyName);
+                                    }
+                                }
+                            }
+
+                            DoJointDeactivated(joint);
+                            if (joint.jointID != IntPtr.Zero)
+                            {
+                                d.JointDestroy(joint.jointID);
+                                joint.jointID = IntPtr.Zero;
+                                //DoJointErrorMessage(joint, "successfully destroyed joint " + jointName);
+                            }
+                            else
+                            {
+                                //m_log.Warn("[NINJA] Ignoring re-request to destroy joint " + jointName);
+                            }
+                        }
+                        else
+                        {
+                            // DoJointErrorMessage(joint, "coult not find joint to destroy based on name " + jointName);
+                        }
+                    }
+                    else
+                    {
+                        // DoJointErrorMessage(joint, "WARNING - joint removal failed, joint " + jointName);
+                    }
+                }
+            }
+
+            // remove processed joints from the shared list
+            lock (externalJointRequestsLock)
+            {
+                foreach (string jointName in myRequestedJointsToBeDeleted)
+                {
+                    requestedJointsToBeDeleted.Remove(jointName);
+                }
+            }
+        }
+
+        // for pending joints we don't know if their associated bodies exist yet or not.
+        // the joint is actually created during processing of the taints
+        private void CreateRequestedJoints()
+        {
+            List<PhysicsJoint> myRequestedJointsToBeCreated;
+            lock (externalJointRequestsLock)
+            {
+                // make a local copy of the shared list for processing (threading issues)
+                myRequestedJointsToBeCreated = new List<PhysicsJoint>(requestedJointsToBeCreated);
+            }
+
+            foreach (PhysicsJoint joint in myRequestedJointsToBeCreated)
+            {
+                lock (OdeLock)
+                {
+                    if (SOPName_to_pendingJoint.ContainsKey(joint.ObjectNameInScene) && SOPName_to_pendingJoint[joint.ObjectNameInScene] != null)
+                    {
+                        DoJointErrorMessage(joint, "WARNING: ignoring request to re-add already pending joint Name:" + joint.ObjectNameInScene + " type:" + joint.Type + " parms: " + joint.RawParams + " pos: " + joint.Position + " rot:" + joint.Rotation);
+                        continue;
+                    }
+                    if (SOPName_to_activeJoint.ContainsKey(joint.ObjectNameInScene) && SOPName_to_activeJoint[joint.ObjectNameInScene] != null)
+                    {
+                        DoJointErrorMessage(joint, "WARNING: ignoring request to re-add already active joint Name:" + joint.ObjectNameInScene + " type:" + joint.Type + " parms: " + joint.RawParams + " pos: " + joint.Position + " rot:" + joint.Rotation);
+                        continue;
+                    }
+
+                    InternalAddPendingJoint(joint as OdePhysicsJoint);
+
+                    if (joint.BodyNames.Count >= 2)
+                    {
+                        for (int iBodyName = 0; iBodyName < 2; iBodyName++)
+                        {
+                            string bodyName = joint.BodyNames[iBodyName];
+                            if (bodyName != "NULL")
+                            {
+                                if (!joints_connecting_actor.ContainsKey(bodyName))
+                                {
+                                    joints_connecting_actor.Add(bodyName, new List<PhysicsJoint>());
+                                }
+                                joints_connecting_actor[bodyName].Add(joint);
+                            }
+                        }
+                    }
+                }
+            }
+
+            // remove processed joints from shared list
+            lock (externalJointRequestsLock)
+            {
+                foreach (PhysicsJoint joint in myRequestedJointsToBeCreated)
+                {
+                    requestedJointsToBeCreated.Remove(joint);
+                }
+            }
+
+        }
+
+        // public function to add an request for joint creation
+        // this joint will just be added to a waiting list that is NOT processed during the main
+        // Simulate() loop (to avoid deadlocks). After Simulate() is finished, we handle unprocessed joint requests.
+
+        public override PhysicsJoint RequestJointCreation(string objectNameInScene, PhysicsJointType jointType, Vector3 position,
+                                            Quaternion rotation, string parms, List<string> bodyNames, string trackedBodyName, Quaternion localRotation)
+
+        {
+
+            OdePhysicsJoint joint = new OdePhysicsJoint();
+            joint.ObjectNameInScene = objectNameInScene;
+            joint.Type = jointType;
+            joint.Position = position;
+            joint.Rotation = rotation;
+            joint.RawParams = parms;
+            joint.BodyNames = new List<string>(bodyNames);
+            joint.TrackedBodyName = trackedBodyName; 
+            joint.LocalRotation = localRotation;
+            joint.jointID = IntPtr.Zero;
+            joint.ErrorMessageCount = 0;
+
+            lock (externalJointRequestsLock)
+            {
+                if (!requestedJointsToBeCreated.Contains(joint)) // forbid same creation request from entering twice 
+                {
+                    requestedJointsToBeCreated.Add(joint);
+                }
+            }
+            return joint;
+        }
+
+        private void RemoveAllJointsConnectedToActor(PhysicsActor actor)
+        {
+            //m_log.Debug("RemoveAllJointsConnectedToActor: start");
+            if (actor.SOPName != null && joints_connecting_actor.ContainsKey(actor.SOPName) && joints_connecting_actor[actor.SOPName] != null)
+            {
+
+                List<PhysicsJoint> jointsToRemove = new List<PhysicsJoint>();
+                //TODO: merge these 2 loops (originally it was needed to avoid altering a list being iterated over, but it is no longer needed due to the joint request queue mechanism)
+                foreach (PhysicsJoint j in joints_connecting_actor[actor.SOPName])
+                {
+                    jointsToRemove.Add(j);
+                }
+                foreach (PhysicsJoint j in jointsToRemove)
+                {
+                    //m_log.Debug("RemoveAllJointsConnectedToActor: about to request deletion of " + j.ObjectNameInScene);
+                    RequestJointDeletion(j.ObjectNameInScene);
+                    //m_log.Debug("RemoveAllJointsConnectedToActor: done request deletion of " + j.ObjectNameInScene);
+                    j.TrackedBodyName = null; // *IMMEDIATELY* prevent any further movement of this joint (else a deleted actor might cause spurious tracking motion of the joint for a few frames, leading to the joint proxy object disappearing)
+                }
+            }
+        }
+
+        public override void RemoveAllJointsConnectedToActorThreadLocked(PhysicsActor actor)
+        {
+            //m_log.Debug("RemoveAllJointsConnectedToActorThreadLocked: start");
+            lock (OdeLock)
+            {
+                //m_log.Debug("RemoveAllJointsConnectedToActorThreadLocked: got lock");
+                RemoveAllJointsConnectedToActor(actor);
+            }
+        }
+
+        // normally called from within OnJointMoved, which is called from within a lock (OdeLock)
+        public override Vector3 GetJointAnchor(PhysicsJoint joint)
+        {
+            Debug.Assert(joint.IsInPhysicsEngine);
+            d.Vector3 pos = new d.Vector3();
+
+            if (!(joint is OdePhysicsJoint))
+            {
+                DoJointErrorMessage(joint, "warning: non-ODE joint requesting anchor: " + joint.ObjectNameInScene);
+            }
+            else
+            {
+                OdePhysicsJoint odeJoint = (OdePhysicsJoint)joint;
+                switch (odeJoint.Type)
+                {
+                    case PhysicsJointType.Ball:
+                        d.JointGetBallAnchor(odeJoint.jointID, out pos);
+                        break;
+                    case PhysicsJointType.Hinge:
+                        d.JointGetHingeAnchor(odeJoint.jointID, out pos);
+                        break;
+                }
+            }
+            return new Vector3(pos.X, pos.Y, pos.Z);
+        }
+
+        // normally called from within OnJointMoved, which is called from within a lock (OdeLock)
+        // WARNING: ODE sometimes returns <0,0,0> as the joint axis! Therefore this function
+        // appears to be unreliable. Fortunately we can compute the joint axis ourselves by
+        // keeping track of the joint's original orientation relative to one of the involved bodies.
+        public override Vector3 GetJointAxis(PhysicsJoint joint)
+        {
+            Debug.Assert(joint.IsInPhysicsEngine);
+            d.Vector3 axis = new d.Vector3();
+
+            if (!(joint is OdePhysicsJoint))
+            {
+                DoJointErrorMessage(joint, "warning: non-ODE joint requesting anchor: " + joint.ObjectNameInScene);
+            }
+            else
+            {
+                OdePhysicsJoint odeJoint = (OdePhysicsJoint)joint;
+                switch (odeJoint.Type)
+                {
+                    case PhysicsJointType.Ball:
+                        DoJointErrorMessage(joint, "warning - axis requested for ball joint: " + joint.ObjectNameInScene);
+                        break;
+                    case PhysicsJointType.Hinge:
+                        d.JointGetHingeAxis(odeJoint.jointID, out axis);
+                        break;
+                }
+            }
+            return new Vector3(axis.X, axis.Y, axis.Z);
+        }
+
+
+        public void remActivePrim(OdePrim deactivatePrim)
+        {
+            lock (_activeprims)
+            {
+                _activeprims.Remove(deactivatePrim);
+            }
+        }
+
+        public override void RemovePrim(PhysicsActor prim)
+        {
+            if (prim is OdePrim)
+            {
+                lock (OdeLock)
+                {
+                    OdePrim p = (OdePrim) prim;
+
+                    p.setPrimForRemoval();
+                    AddPhysicsActorTaint(prim);
+                    //RemovePrimThreadLocked(p);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This is called from within simulate but outside the locked portion
+        /// We need to do our own locking here
+        /// Essentially, we need to remove the prim from our space segment, whatever segment it's in.
+        ///
+        /// If there are no more prim in the segment, we need to empty (spacedestroy)the segment and reclaim memory
+        /// that the space was using.
+        /// </summary>
+        /// <param name="prim"></param>
+        public void RemovePrimThreadLocked(OdePrim prim)
+        {
+//Console.WriteLine("RemovePrimThreadLocked " +  prim.m_primName);            
+            lock (prim)
+            {
+                remCollisionEventReporting(prim);
+                lock (ode)
+                {
+                    if (prim.prim_geom != IntPtr.Zero)
+                    {
+                        prim.ResetTaints();
+
+                        try
+                        {
+                            if (prim._triMeshData != IntPtr.Zero)
+                            {
+                                d.GeomTriMeshDataDestroy(prim._triMeshData);
+                                prim._triMeshData = IntPtr.Zero;
+                            }
+                        }
+                        catch { };
+
+                        if (prim.IsPhysical)
+                        {
+                            prim.disableBody();
+                            if (prim.childPrim)
+                            {
+                                prim.childPrim = false;
+                                prim.Body = IntPtr.Zero;
+                                prim.m_disabled = true;
+                                prim.IsPhysical = false;
+                            }
+
+                        }
+                        // we don't want to remove the main space
+
+                        // If the geometry is in the targetspace, remove it from the target space
+                        //m_log.Warn(prim.m_targetSpace);
+
+                        //if (prim.m_targetSpace != IntPtr.Zero)
+                        //{
+                        //if (d.SpaceQuery(prim.m_targetSpace, prim.prim_geom))
+                        //{
+
+                        //if (d.GeomIsSpace(prim.m_targetSpace))
+                        //{
+                        //waitForSpaceUnlock(prim.m_targetSpace);
+                        //d.SpaceRemove(prim.m_targetSpace, prim.prim_geom);
+                        prim.m_targetSpace = IntPtr.Zero;
+                        //}
+                        //else
+                        //{
+                        // m_log.Info("[Physics]: Invalid Scene passed to 'removeprim from scene':" +
+                        //((OdePrim)prim).m_targetSpace.ToString());
+                        //}
+
+                        //}
+                        //}
+                        //m_log.Warn(prim.prim_geom);
+                        try
+                        {
+                            if (prim.prim_geom != IntPtr.Zero)
+                            {
+
+//string tPA;
+//geom_name_map.TryGetValue(prim.prim_geom, out tPA);
+//Console.WriteLine("**** Remove {0}", tPA);
+                                if(geom_name_map.ContainsKey(prim.prim_geom)) geom_name_map.Remove(prim.prim_geom);
+                                if(actor_name_map.ContainsKey(prim.prim_geom)) actor_name_map.Remove(prim.prim_geom);
+                                d.GeomDestroy(prim.prim_geom);
+                                prim.prim_geom = IntPtr.Zero;
+                            }
+                            else
+                            {
+                                m_log.Warn("[PHYSICS]: Unable to remove prim from physics scene");
+                            }
+                        }
+                        catch (AccessViolationException)
+                        {
+                            m_log.Info("[PHYSICS]: Couldn't remove prim from physics scene, it was already be removed.");
+                        }
+                        lock (_prims)
+                        _prims.Remove(prim);
+
+                        //If there are no more geometries in the sub-space, we don't need it in the main space anymore
+                        //if (d.SpaceGetNumGeoms(prim.m_targetSpace) == 0)
+                        //{
+                        //if (prim.m_targetSpace != null)
+                        //{
+                        //if (d.GeomIsSpace(prim.m_targetSpace))
+                        //{
+                        //waitForSpaceUnlock(prim.m_targetSpace);
+                        //d.SpaceRemove(space, prim.m_targetSpace);
+                        // free up memory used by the space.
+                        //d.SpaceDestroy(prim.m_targetSpace);
+                        //int[] xyspace = calculateSpaceArrayItemFromPos(prim.Position);
+                        //resetSpaceArrayItemToZero(xyspace[0], xyspace[1]);
+                        //}
+                        //else
+                        //{
+                        //m_log.Info("[Physics]: Invalid Scene passed to 'removeprim from scene':" +
+                        //((OdePrim) prim).m_targetSpace.ToString());
+                        //}
+                        //}
+                        //}
+
+                        if (SupportsNINJAJoints)
+                        {
+                            RemoveAllJointsConnectedToActorThreadLocked(prim);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Space Separation Calculation
+
+        /// <summary>
+        /// Takes a space pointer and zeros out the array we're using to hold the spaces
+        /// </summary>
+        /// <param name="pSpace"></param>
+        public void resetSpaceArrayItemToZero(IntPtr pSpace)
+        {
+            for (int x = 0; x < staticPrimspace.GetLength(0); x++)
+            {
+                for (int y = 0; y < staticPrimspace.GetLength(1); y++)
+                {
+                    if (staticPrimspace[x, y] == pSpace)
+                        staticPrimspace[x, y] = IntPtr.Zero;
+                }
+            }
+        }
+
+        public void resetSpaceArrayItemToZero(int arrayitemX, int arrayitemY)
+        {
+            staticPrimspace[arrayitemX, arrayitemY] = IntPtr.Zero;
+        }
+
+        /// <summary>
+        /// Called when a static prim moves.  Allocates a space for the prim based on its position
+        /// </summary>
+        /// <param name="geom">the pointer to the geom that moved</param>
+        /// <param name="pos">the position that the geom moved to</param>
+        /// <param name="currentspace">a pointer to the space it was in before it was moved.</param>
+        /// <returns>a pointer to the new space it's in</returns>
+        public IntPtr recalculateSpaceForGeom(IntPtr geom, Vector3 pos, IntPtr currentspace)
+        {
+            // Called from setting the Position and Size of an ODEPrim so
+            // it's already in locked space.
+
+            // we don't want to remove the main space
+            // we don't need to test physical here because this function should
+            // never be called if the prim is physical(active)
+
+            // All physical prim end up in the root space
+            //Thread.Sleep(20);
+            if (currentspace != space)
+            {
+                //m_log.Info("[SPACE]: C:" + currentspace.ToString() + " g:" + geom.ToString());
+                //if (currentspace == IntPtr.Zero)
+               //{
+                    //int adfadf = 0;
+                //}
+                if (d.SpaceQuery(currentspace, geom) && currentspace != IntPtr.Zero)
+                {
+                    if (d.GeomIsSpace(currentspace))
+                    {
+                        waitForSpaceUnlock(currentspace);
+                        d.SpaceRemove(currentspace, geom);
+                    }
+                    else
+                    {
+                        m_log.Info("[Physics]: Invalid Scene passed to 'recalculatespace':" + currentspace +
+                                   " Geom:" + geom);
+                    }
+                }
+                else
+                {
+                    IntPtr sGeomIsIn = d.GeomGetSpace(geom);
+                    if (sGeomIsIn != IntPtr.Zero)
+                    {
+                        if (d.GeomIsSpace(currentspace))
+                        {
+                            waitForSpaceUnlock(sGeomIsIn);
+                            d.SpaceRemove(sGeomIsIn, geom);
+                        }
+                        else
+                        {
+                            m_log.Info("[Physics]: Invalid Scene passed to 'recalculatespace':" +
+                                       sGeomIsIn + " Geom:" + geom);
+                        }
+                    }
+                }
+
+                //If there are no more geometries in the sub-space, we don't need it in the main space anymore
+                if (d.SpaceGetNumGeoms(currentspace) == 0)
+                {
+                    if (currentspace != IntPtr.Zero)
+                    {
+                        if (d.GeomIsSpace(currentspace))
+                        {
+                            waitForSpaceUnlock(currentspace);
+                            waitForSpaceUnlock(space);
+                            d.SpaceRemove(space, currentspace);
+                            // free up memory used by the space.
+
+                            //d.SpaceDestroy(currentspace);
+                            resetSpaceArrayItemToZero(currentspace);
+                        }
+                        else
+                        {
+                            m_log.Info("[Physics]: Invalid Scene passed to 'recalculatespace':" +
+                                       currentspace + " Geom:" + geom);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                // this is a physical object that got disabled. ;.;
+                if (currentspace != IntPtr.Zero && geom != IntPtr.Zero)
+                {
+                    if (d.SpaceQuery(currentspace, geom))
+                    {
+                        if (d.GeomIsSpace(currentspace))
+                        {
+                            waitForSpaceUnlock(currentspace);
+                            d.SpaceRemove(currentspace, geom);
+                        }
+                        else
+                        {
+                            m_log.Info("[Physics]: Invalid Scene passed to 'recalculatespace':" +
+                                       currentspace + " Geom:" + geom);
+                        }
+                    }
+                    else
+                    {
+                        IntPtr sGeomIsIn = d.GeomGetSpace(geom);
+                        if (sGeomIsIn != IntPtr.Zero)
+                        {
+                            if (d.GeomIsSpace(sGeomIsIn))
+                            {
+                                waitForSpaceUnlock(sGeomIsIn);
+                                d.SpaceRemove(sGeomIsIn, geom);
+                            }
+                            else
+                            {
+                                m_log.Info("[Physics]: Invalid Scene passed to 'recalculatespace':" +
+                                           sGeomIsIn + " Geom:" + geom);
+                            }
+                        }
+                    }
+                }
+            }
+
+            // The routines in the Position and Size sections do the 'inserting' into the space,
+            // so all we have to do is make sure that the space that we're putting the prim into
+            // is in the 'main' space.
+            int[] iprimspaceArrItem = calculateSpaceArrayItemFromPos(pos);
+            IntPtr newspace = calculateSpaceForGeom(pos);
+
+            if (newspace == IntPtr.Zero)
+            {
+                newspace = createprimspace(iprimspaceArrItem[0], iprimspaceArrItem[1]);
+                d.HashSpaceSetLevels(newspace, smallHashspaceLow, smallHashspaceHigh);
+            }
+
+            return newspace;
+        }
+
+        /// <summary>
+        /// Creates a new space at X Y
+        /// </summary>
+        /// <param name="iprimspaceArrItemX"></param>
+        /// <param name="iprimspaceArrItemY"></param>
+        /// <returns>A pointer to the created space</returns>
+        public IntPtr createprimspace(int iprimspaceArrItemX, int iprimspaceArrItemY)
+        {
+            // creating a new space for prim and inserting it into main space.
+            staticPrimspace[iprimspaceArrItemX, iprimspaceArrItemY] = d.HashSpaceCreate(IntPtr.Zero);
+            d.GeomSetCategoryBits(staticPrimspace[iprimspaceArrItemX, iprimspaceArrItemY], (int)CollisionCategories.Space);
+            waitForSpaceUnlock(space);
+            d.SpaceSetSublevel(space, 1);
+            d.SpaceAdd(space, staticPrimspace[iprimspaceArrItemX, iprimspaceArrItemY]);
+            return staticPrimspace[iprimspaceArrItemX, iprimspaceArrItemY];
+        }
+
+        /// <summary>
+        /// Calculates the space the prim should be in by its position
+        /// </summary>
+        /// <param name="pos"></param>
+        /// <returns>a pointer to the space. This could be a new space or reused space.</returns>
+        public IntPtr calculateSpaceForGeom(Vector3 pos)
+        {
+            int[] xyspace = calculateSpaceArrayItemFromPos(pos);
+            //m_log.Info("[Physics]: Attempting to use arrayItem: " + xyspace[0].ToString() + "," + xyspace[1].ToString());
+            return staticPrimspace[xyspace[0], xyspace[1]];
+        }
+
+        /// <summary>
+        /// Holds the space allocation logic
+        /// </summary>
+        /// <param name="pos"></param>
+        /// <returns>an array item based on the position</returns>
+        public int[] calculateSpaceArrayItemFromPos(Vector3 pos)
+        {
+            int[] returnint = new int[2];
+
+            returnint[0] = (int) (pos.X/metersInSpace);
+
+            if (returnint[0] > ((int) (259f/metersInSpace)))
+                returnint[0] = ((int) (259f/metersInSpace));
+            if (returnint[0] < 0)
+                returnint[0] = 0;
+
+            returnint[1] = (int) (pos.Y/metersInSpace);
+            if (returnint[1] > ((int) (259f/metersInSpace)))
+                returnint[1] = ((int) (259f/metersInSpace));
+            if (returnint[1] < 0)
+                returnint[1] = 0;
+
+            return returnint;
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Routine to figure out if we need to mesh this prim with our mesher
+        /// </summary>
+        /// <param name="pbs"></param>
+        /// <returns></returns>
+        public bool needsMeshing(PrimitiveBaseShape pbs)
+        {
+            // most of this is redundant now as the mesher will return null if it cant mesh a prim
+            // but we still need to check for sculptie meshing being enabled so this is the most
+            // convenient place to do it for now...
+
+        //    //if (pbs.PathCurve == (byte)Primitive.PathCurve.Circle && pbs.ProfileCurve == (byte)Primitive.ProfileCurve.Circle && pbs.PathScaleY <= 0.75f)
+        //    //m_log.Debug("needsMeshing: " + " pathCurve: " + pbs.PathCurve.ToString() + " profileCurve: " + pbs.ProfileCurve.ToString() + " pathScaleY: " + Primitive.UnpackPathScale(pbs.PathScaleY).ToString());
+            int iPropertiesNotSupportedDefault = 0;
+
+            if (pbs.SculptEntry && !meshSculptedPrim)
+            {
+#if SPAM
+                m_log.Warn("NonMesh");
+#endif
+                return false;
+            }
+
+            // if it's a standard box or sphere with no cuts, hollows, twist or top shear, return false since ODE can use an internal representation for the prim
+            if (!forceSimplePrimMeshing && !pbs.SculptEntry)
+            {
+                if ((pbs.ProfileShape == ProfileShape.Square && pbs.PathCurve == (byte)Extrusion.Straight)
+                    || (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte)Extrusion.Curve1
+                    && pbs.Scale.X == pbs.Scale.Y && pbs.Scale.Y == pbs.Scale.Z))
+                {
+
+                    if (pbs.ProfileBegin == 0 && pbs.ProfileEnd == 0
+                        && pbs.ProfileHollow == 0
+                        && pbs.PathTwist == 0 && pbs.PathTwistBegin == 0
+                        && pbs.PathBegin == 0 && pbs.PathEnd == 0
+                        && pbs.PathTaperX == 0 && pbs.PathTaperY == 0
+                        && pbs.PathScaleX == 100 && pbs.PathScaleY == 100
+                        && pbs.PathShearX == 0 && pbs.PathShearY == 0)
+                    {
+#if SPAM
+                    m_log.Warn("NonMesh");
+#endif
+                        return false;
+                    }
+                }
+            }
+
+            if (forceSimplePrimMeshing)
+                return true;
+
+            if (pbs.ProfileHollow != 0)
+                iPropertiesNotSupportedDefault++;
+
+            if ((pbs.PathTwistBegin != 0) || (pbs.PathTwist != 0))
+                iPropertiesNotSupportedDefault++; 
+
+            if ((pbs.ProfileBegin != 0) || pbs.ProfileEnd != 0)
+                iPropertiesNotSupportedDefault++;
+
+            if ((pbs.PathScaleX != 100) || (pbs.PathScaleY != 100))
+                iPropertiesNotSupportedDefault++;
+
+            if ((pbs.PathShearX != 0) || (pbs.PathShearY != 0))
+                iPropertiesNotSupportedDefault++;
+
+            if (pbs.ProfileShape == ProfileShape.Circle && pbs.PathCurve == (byte)Extrusion.Straight)
+                iPropertiesNotSupportedDefault++;
+
+            if (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte)Extrusion.Curve1 && (pbs.Scale.X != pbs.Scale.Y || pbs.Scale.Y != pbs.Scale.Z || pbs.Scale.Z != pbs.Scale.X))
+                iPropertiesNotSupportedDefault++;
+
+            if (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte) Extrusion.Curve1)
+                iPropertiesNotSupportedDefault++;
+
+            // test for torus
+            if ((pbs.ProfileCurve & 0x07) == (byte)ProfileShape.Square)
+            {
+                if (pbs.PathCurve == (byte)Extrusion.Curve1)
+                {
+                    iPropertiesNotSupportedDefault++;
+                }
+            }
+            else if ((pbs.ProfileCurve & 0x07) == (byte)ProfileShape.Circle)
+            {
+                if (pbs.PathCurve == (byte)Extrusion.Straight)
+                {
+                    iPropertiesNotSupportedDefault++;
+                }
+
+                // ProfileCurve seems to combine hole shape and profile curve so we need to only compare against the lower 3 bits
+                else if (pbs.PathCurve == (byte)Extrusion.Curve1)
+                {
+                    iPropertiesNotSupportedDefault++;
+                }
+            }
+            else if ((pbs.ProfileCurve & 0x07) == (byte)ProfileShape.HalfCircle)
+            {
+                if (pbs.PathCurve == (byte)Extrusion.Curve1 || pbs.PathCurve == (byte)Extrusion.Curve2)
+                {
+                    iPropertiesNotSupportedDefault++;
+                }
+            }
+            else if ((pbs.ProfileCurve & 0x07) == (byte)ProfileShape.EquilateralTriangle)
+            {
+                if (pbs.PathCurve == (byte)Extrusion.Straight)
+                {
+                    iPropertiesNotSupportedDefault++;
+                }
+                else if (pbs.PathCurve == (byte)Extrusion.Curve1)
+                {
+                    iPropertiesNotSupportedDefault++;
+                }
+            }
+
+            if (pbs.SculptEntry && meshSculptedPrim)
+                iPropertiesNotSupportedDefault++;
+
+            if (iPropertiesNotSupportedDefault == 0)
+            {
+#if SPAM
+                m_log.Warn("NonMesh");
+#endif
+                return false;
+            }
+#if SPAM
+            m_log.Debug("Mesh");
+#endif
+            return true; 
+        }
+
+        /// <summary>
+        /// Called after our prim properties are set Scale, position etc.
+        /// We use this event queue like method to keep changes to the physical scene occuring in the threadlocked mutex
+        /// This assures us that we have no race conditions
+        /// </summary>
+        /// <param name="prim"></param>
+        public override void AddPhysicsActorTaint(PhysicsActor prim)
+        {
+            
+            if (prim is OdePrim)
+            {
+                OdePrim taintedprim = ((OdePrim) prim);
+                lock (_taintedPrimLock)
+                {
+                    if (!(_taintedPrimH.Contains(taintedprim))) 
+                                {
+//Console.WriteLine("AddPhysicsActorTaint to " +  taintedprim.m_primName);                              
+                        _taintedPrimH.Add(taintedprim);                                 // HashSet for searching
+                        _taintedPrimL.Add(taintedprim);                                 // List for ordered readout
+                                        }
+                                }
+                return;
+            }
+            else if (prim is OdeCharacter)
+            {
+                OdeCharacter taintedchar = ((OdeCharacter)prim);
+                lock (_taintedActors)
+                {
+                    if (!(_taintedActors.Contains(taintedchar)))
+                    {
+                        _taintedActors.Add(taintedchar);
+                        if (taintedchar.bad)
+                            m_log.DebugFormat("[PHYSICS]: Added BAD actor {0} to tainted actors", taintedchar.m_uuid);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// This is our main simulate loop
+        /// It's thread locked by a Mutex in the scene.
+        /// It holds Collisions, it instructs ODE to step through the physical reactions
+        /// It moves the objects around in memory
+        /// It calls the methods that report back to the object owners.. (scenepresence, SceneObjectGroup)
+        /// </summary>
+        /// <param name="timeStep"></param>
+        /// <returns></returns>
+        public override float Simulate(float timeStep)
+        {
+            if (framecount >= int.MaxValue)
+                framecount = 0;
+            //if (m_worldOffset != Vector3.Zero)
+            //    return 0;
+
+            framecount++;
+            
+            DateTime now = DateTime.UtcNow;
+                        TimeSpan SinceLastFrame = now - m_lastframe;
+                        m_lastframe = now;
+                        float realtime = (float)SinceLastFrame.TotalSeconds;
+// Console.WriteLine("ts={0}    rt={1}",        timeStep,       realtime);      
+                        timeStep = realtime;
+                        
+  //          float fps = 1.0f / realtime;
+            float fps = 0.0f;           // number of ODE steps in this Simulate step
+            //m_log.Info(timeStep.ToString());
+            step_time += timeStep;
+            
+            // If We're loaded down by something else,
+            // or debugging with the Visual Studio project on pause
+            // skip a few frames to catch up gracefully.
+            // without shooting the physicsactors all over the place
+
+            if (step_time >= m_SkipFramesAtms)
+            {
+                // Instead of trying to catch up, it'll do 5 physics frames only
+                step_time = ODE_STEPSIZE;
+                m_physicsiterations = 5;
+            }
+            else
+            {
+                m_physicsiterations = 10;
+            }
+
+            if (SupportsNINJAJoints)
+            {
+                DeleteRequestedJoints(); // this must be outside of the lock (OdeLock) to avoid deadlocks
+                CreateRequestedJoints(); // this must be outside of the lock (OdeLock) to avoid deadlocks
+            }
+
+            lock (OdeLock)
+            {
+                // Process 10 frames if the sim is running normal..
+                // process 5 frames if the sim is running slow
+                //try
+                //{
+                    //d.WorldSetQuickStepNumIterations(world, m_physicsiterations);
+                //}
+                //catch (StackOverflowException)
+                //{
+                   // m_log.Error("[PHYSICS]: The operating system wasn't able to allocate enough memory for the simulation.  Restarting the sim.");
+                   // ode.drelease(world);
+                    //base.TriggerPhysicsBasedRestart();
+                //}
+
+                int i = 0;
+
+                // Figure out the Frames Per Second we're going at.
+                //(step_time == 0.004f, there's 250 of those per second.   Times the step time/step size
+
+ //               fps = (step_time / ODE_STEPSIZE) * 1000;
+                // HACK: Using a time dilation of 1.0 to debug rubberbanding issues
+                //m_timeDilation = Math.Min((step_time / ODE_STEPSIZE) / (0.09375f / ODE_STEPSIZE), 1.0f);
+
+ //               step_time = 0.09375f;
+
+                while (step_time > 0.0f)
+                {
+                    //lock (ode)
+                    //{
+                        //if (!ode.lockquery())
+                        //{
+                           // ode.dlock(world);
+                            try
+                            { 
+                                // Insert, remove Characters
+                                bool processedtaints = false;
+
+                                lock (_taintedActors)
+                                {
+                                    if (_taintedActors.Count > 0)
+                                    {
+                                        foreach (OdeCharacter character in _taintedActors)
+                                        {
+
+                                            character.ProcessTaints(ODE_STEPSIZE);
+
+                                            processedtaints = true;
+                                            //character.m_collisionscore = 0;
+                                        }
+
+                                        if (processedtaints)
+                                            _taintedActors.Clear();
+                                    }
+                                } // end lock _taintedActors
+
+                                // Modify other objects in the scene.
+                                processedtaints = false;
+
+                                lock (_taintedPrimLock)
+                                {
+                                    foreach (OdePrim prim in _taintedPrimL)
+                                    {
+                                        if (prim.m_taintremove)
+                                        {
+                                            //Console.WriteLine("Simulate calls RemovePrimThreadLocked");                                          
+                                            RemovePrimThreadLocked(prim);
+                                        }
+                                        else
+                                        {
+                                            //Console.WriteLine("Simulate calls ProcessTaints");                                        
+                                            prim.ProcessTaints(ODE_STEPSIZE);
+                                        }
+                                        processedtaints = true;
+                                        prim.m_collisionscore = 0;
+
+                                        // This loop can block up the Heartbeat for a very long time on large regions.
+                                        // We need to let the Watchdog know that the Heartbeat is not dead
+                                        // NOTE: This is currently commented out, but if things like OAR loading are 
+                                        // timing the heartbeat out we will need to uncomment it
+                                        //Watchdog.UpdateThread();
+                                    }
+
+                                    if (SupportsNINJAJoints)
+                                    {
+                                        // Create pending joints, if possible
+
+                                        // joints can only be processed after ALL bodies are processed (and exist in ODE), since creating
+                                        // a joint requires specifying the body id of both involved bodies
+                                        if (pendingJoints.Count > 0)
+                                        {
+                                            List<PhysicsJoint> successfullyProcessedPendingJoints = new List<PhysicsJoint>();
+                                            //DoJointErrorMessage(joints_connecting_actor, "taint: " + pendingJoints.Count + " pending joints");
+                                            foreach (PhysicsJoint joint in pendingJoints)
+                                            {
+                                                //DoJointErrorMessage(joint, "taint: time to create joint with parms: " + joint.RawParams);
+                                                string[] jointParams = joint.RawParams.Split(" ".ToCharArray(), 
+                                                                                                System.StringSplitOptions.RemoveEmptyEntries);
+                                                List<IntPtr> jointBodies = new List<IntPtr>();
+                                                bool allJointBodiesAreReady = true;
+                                                foreach (string jointParam in jointParams)
+                                                {
+                                                    if (jointParam == "NULL")
+                                                    {
+                                                        //DoJointErrorMessage(joint, "attaching NULL joint to world");
+                                                        jointBodies.Add(IntPtr.Zero);
+                                                    }
+                                                    else
+                                                    {
+                                                        //DoJointErrorMessage(joint, "looking for prim name: " + jointParam);
+                                                        bool foundPrim = false;
+                                                        lock (_prims)
+                                                        {
+                                                            foreach (OdePrim prim in _prims) // FIXME: inefficient
+                                                            {
+                                                                if (prim.SOPName == jointParam)
+                                                                {
+                                                                    //DoJointErrorMessage(joint, "found for prim name: " + jointParam);
+                                                                    if (prim.IsPhysical && prim.Body != IntPtr.Zero)
+                                                                    {
+                                                                        jointBodies.Add(prim.Body);
+                                                                        foundPrim = true;
+                                                                        break;
+                                                                    }
+                                                                    else
+                                                                    {
+                                                                        DoJointErrorMessage(joint, "prim name " + jointParam +
+                                                                            " exists but is not (yet) physical; deferring joint creation. " +
+                                                                            "IsPhysical property is " + prim.IsPhysical +
+                                                                            " and body is " + prim.Body);
+                                                                        foundPrim = false;
+                                                                        break;
+                                                                    }
+                                                                }
+                                                            }
+                                                        }
+                                                        if (foundPrim)
+                                                        {
+                                                            // all is fine
+                                                        }
+                                                        else
+                                                        {
+                                                            allJointBodiesAreReady = false;
+                                                            break;
+                                                        }
+                                                    }
+                                                }
+                                                if (allJointBodiesAreReady)
+                                                {
+                                                    //DoJointErrorMessage(joint, "allJointBodiesAreReady for " + joint.ObjectNameInScene + " with parms " + joint.RawParams);
+                                                    if (jointBodies[0] == jointBodies[1])
+                                                    {
+                                                        DoJointErrorMessage(joint, "ERROR: joint cannot be created; the joint bodies are the same, body1==body2. Raw body is " + jointBodies[0] + ". raw parms: " + joint.RawParams);
+                                                    }
+                                                    else
+                                                    {
+                                                        switch (joint.Type)
+                                                        {
+                                                            case PhysicsJointType.Ball:
+                                                                {
+                                                                    IntPtr odeJoint;
+                                                                    //DoJointErrorMessage(joint, "ODE creating ball joint ");
+                                                                    odeJoint = d.JointCreateBall(world, IntPtr.Zero);
+                                                                    //DoJointErrorMessage(joint, "ODE attaching ball joint: " + odeJoint + " with b1:" + jointBodies[0] + " b2:" + jointBodies[1]);
+                                                                    d.JointAttach(odeJoint, jointBodies[0], jointBodies[1]);
+                                                                    //DoJointErrorMessage(joint, "ODE setting ball anchor: " + odeJoint + " to vec:" + joint.Position);
+                                                                    d.JointSetBallAnchor(odeJoint,
+                                                                                        joint.Position.X,
+                                                                                        joint.Position.Y,
+                                                                                        joint.Position.Z);
+                                                                    //DoJointErrorMessage(joint, "ODE joint setting OK");
+                                                                    //DoJointErrorMessage(joint, "The ball joint's bodies are here: b0: ");
+                                                                    //DoJointErrorMessage(joint, "" + (jointBodies[0] != IntPtr.Zero ? "" + d.BodyGetPosition(jointBodies[0]) : "fixed environment"));
+                                                                    //DoJointErrorMessage(joint, "The ball joint's bodies are here: b1: ");
+                                                                    //DoJointErrorMessage(joint, "" + (jointBodies[1] != IntPtr.Zero ? "" + d.BodyGetPosition(jointBodies[1]) : "fixed environment"));
+
+                                                                    if (joint is OdePhysicsJoint)
+                                                                    {
+                                                                        ((OdePhysicsJoint)joint).jointID = odeJoint;
+                                                                    }
+                                                                    else
+                                                                    {
+                                                                        DoJointErrorMessage(joint, "WARNING: non-ode joint in ODE!");
+                                                                    }
+                                                                }
+                                                                break;
+                                                            case PhysicsJointType.Hinge:
+                                                                {
+                                                                    IntPtr odeJoint;
+                                                                    //DoJointErrorMessage(joint, "ODE creating hinge joint ");
+                                                                    odeJoint = d.JointCreateHinge(world, IntPtr.Zero);
+                                                                    //DoJointErrorMessage(joint, "ODE attaching hinge joint: " + odeJoint + " with b1:" + jointBodies[0] + " b2:" + jointBodies[1]);
+                                                                    d.JointAttach(odeJoint, jointBodies[0], jointBodies[1]);
+                                                                    //DoJointErrorMessage(joint, "ODE setting hinge anchor: " + odeJoint + " to vec:" + joint.Position);
+                                                                    d.JointSetHingeAnchor(odeJoint,
+                                                                                          joint.Position.X,
+                                                                                          joint.Position.Y,
+                                                                                          joint.Position.Z);
+                                                                    // We use the orientation of the x-axis of the joint's coordinate frame
+                                                                    // as the axis for the hinge. 
+
+                                                                    // Therefore, we must get the joint's coordinate frame based on the
+                                                                    // joint.Rotation field, which originates from the orientation of the 
+                                                                    // joint's proxy object in the scene.
+
+                                                                    // The joint's coordinate frame is defined as the transformation matrix
+                                                                    // that converts a vector from joint-local coordinates into world coordinates.
+                                                                    // World coordinates are defined as the XYZ coordinate system of the sim,
+                                                                    // as shown in the top status-bar of the viewer.
+
+                                                                    // Once we have the joint's coordinate frame, we extract its X axis (AtAxis)
+                                                                    // and use that as the hinge axis.
+
+                                                                    //joint.Rotation.Normalize();
+                                                                    Matrix4 proxyFrame = Matrix4.CreateFromQuaternion(joint.Rotation);
+
+                                                                    // Now extract the X axis of the joint's coordinate frame.
+
+                                                                    // Do not try to use proxyFrame.AtAxis or you will become mired in the
+                                                                    // tar pit of transposed, inverted, and generally messed-up orientations.
+                                                                    // (In other words, Matrix4.AtAxis() is borked.)
+                                                                    // Vector3 jointAxis = proxyFrame.AtAxis; <--- this path leadeth to madness
+
+                                                                    // Instead, compute the X axis of the coordinate frame by transforming
+                                                                    // the (1,0,0) vector. At least that works.
+
+                                                                    //m_log.Debug("PHY: making axis: complete matrix is " + proxyFrame);
+                                                                    Vector3 jointAxis = Vector3.Transform(Vector3.UnitX, proxyFrame);
+                                                                    //m_log.Debug("PHY: making axis: hinge joint axis is " + jointAxis); 
+                                                                    //DoJointErrorMessage(joint, "ODE setting hinge axis: " + odeJoint + " to vec:" + jointAxis);
+                                                                    d.JointSetHingeAxis(odeJoint,
+                                                                                        jointAxis.X,
+                                                                                        jointAxis.Y,
+                                                                                        jointAxis.Z);
+                                                                    //d.JointSetHingeParam(odeJoint, (int)dParam.CFM, 0.1f);
+                                                                    if (joint is OdePhysicsJoint)
+                                                                    {
+                                                                        ((OdePhysicsJoint)joint).jointID = odeJoint;
+                                                                    }
+                                                                    else
+                                                                    {
+                                                                        DoJointErrorMessage(joint, "WARNING: non-ode joint in ODE!");
+                                                                    }
+                                                                }
+                                                                break;
+                                                        }
+                                                        successfullyProcessedPendingJoints.Add(joint);
+                                                    }
+                                                }
+                                                else
+                                                {
+                                                    DoJointErrorMessage(joint, "joint could not yet be created; still pending");
+                                                }
+                                            }
+                                            foreach (PhysicsJoint successfullyProcessedJoint in successfullyProcessedPendingJoints)
+                                            {
+                                                //DoJointErrorMessage(successfullyProcessedJoint, "finalizing succesfully procsssed joint " + successfullyProcessedJoint.ObjectNameInScene + " parms " + successfullyProcessedJoint.RawParams);
+                                                //DoJointErrorMessage(successfullyProcessedJoint, "removing from pending");
+                                                InternalRemovePendingJoint(successfullyProcessedJoint);
+                                                //DoJointErrorMessage(successfullyProcessedJoint, "adding to active");
+                                                InternalAddActiveJoint(successfullyProcessedJoint);
+                                                //DoJointErrorMessage(successfullyProcessedJoint, "done");
+                                            }
+                                        }
+                                    } // end SupportsNINJAJoints 
+
+                                    if (processedtaints)
+//Console.WriteLine("Simulate calls Clear of _taintedPrim list");                                      
+                                        _taintedPrimH.Clear();                          // ??? if this only ???
+                                        _taintedPrimL.Clear();
+                                } // end lock _taintedPrimLock
+
+                                // Move characters
+                                lock (_characters)
+                                {
+                                    List<OdeCharacter> defects = new List<OdeCharacter>();
+                                    foreach (OdeCharacter actor in _characters)
+                                    {
+                                        if (actor != null)
+                                            actor.Move(ODE_STEPSIZE, defects);
+                                    }
+                                    if (0 != defects.Count)
+                                    {
+                                        foreach (OdeCharacter defect in defects)
+                                        {
+                                            RemoveCharacter(defect);
+                                        }
+                                    }
+                                } // end lock _characters
+
+                                // Move other active objects
+                                lock (_activeprims)
+                                {
+                                    foreach (OdePrim prim in _activeprims)
+                                    {
+                                        prim.m_collisionscore = 0;
+                                        prim.Move(ODE_STEPSIZE);
+                                    }
+                                } // end lock _activeprims
+
+                                //if ((framecount % m_randomizeWater) == 0)
+                                   // randomizeWater(waterlevel);
+
+                                //int RayCastTimeMS = m_rayCastManager.ProcessQueuedRequests();
+                                m_rayCastManager.ProcessQueuedRequests();
+
+                                collision_optimized(ODE_STEPSIZE);
+
+                                lock (_collisionEventPrim)
+                                {
+                                    foreach (PhysicsActor obj in _collisionEventPrim)
+                                    {
+                                        if (obj == null)
+                                            continue;
+
+                                        switch ((ActorTypes)obj.PhysicsActorType)
+                                        {
+                                            case ActorTypes.Agent:
+                                                OdeCharacter cobj = (OdeCharacter)obj;
+                                                cobj.AddCollisionFrameTime(100);
+                                                cobj.SendCollisions();
+                                                break;
+                                            case ActorTypes.Prim:
+                                                OdePrim pobj = (OdePrim)obj;
+                                                pobj.SendCollisions();
+                                                break;
+                                        }
+                                    }
+                                } // end lock _collisionEventPrim
+
+                                //if (m_global_contactcount > 5)
+                                //{
+                                //    m_log.DebugFormat("[PHYSICS]: Contacts:{0}", m_global_contactcount);
+                                //}
+
+                                m_global_contactcount = 0;
+                                
+                                d.WorldQuickStep(world, ODE_STEPSIZE);
+                                d.JointGroupEmpty(contactgroup);
+                                fps++;
+                                //ode.dunlock(world);
+                            } // end try
+                            catch (Exception e)
+                            {
+                                m_log.ErrorFormat("[PHYSICS]: {0}, {1}, {2}", e.Message, e.TargetSite, e);
+                                ode.dunlock(world);
+                            }
+
+                            step_time -= ODE_STEPSIZE;
+                            i++;
+                        //}
+                        //else
+                        //{
+                            //fps = 0;
+                        //}
+                    //}
+                }  // end while (step_time > 0.0f)
+
+                lock (_characters)
+                {
+                    foreach (OdeCharacter actor in _characters)
+                    {
+                        if (actor != null)
+                        {
+                            if (actor.bad)
+                                m_log.WarnFormat("[PHYSICS]: BAD Actor {0} in _characters list was not removed?", actor.m_uuid);
+                            actor.UpdatePositionAndVelocity();
+                        }
+                    }
+                }
+
+                lock (_badCharacter)
+                {
+                    if (_badCharacter.Count > 0)
+                    {
+                        foreach (OdeCharacter chr in _badCharacter)
+                        {
+                            RemoveCharacter(chr);
+                        }
+                        _badCharacter.Clear();
+                    }
+                }
+
+                lock (_activeprims)
+                {
+                    //if (timeStep < 0.2f)
+                    {
+                        foreach (OdePrim actor in _activeprims)
+                        {
+                            if (actor.IsPhysical && (d.BodyIsEnabled(actor.Body) || !actor._zeroFlag))
+                            {
+                                actor.UpdatePositionAndVelocity();
+
+                                if (SupportsNINJAJoints)
+                                {
+                                    // If an actor moved, move its joint proxy objects as well.
+                                    // There seems to be an event PhysicsActor.OnPositionUpdate that could be used
+                                    // for this purpose but it is never called! So we just do the joint
+                                    // movement code here.
+
+                                    if (actor.SOPName != null &&
+                                        joints_connecting_actor.ContainsKey(actor.SOPName) &&
+                                        joints_connecting_actor[actor.SOPName] != null &&
+                                        joints_connecting_actor[actor.SOPName].Count > 0)
+                                    {
+                                        foreach (PhysicsJoint affectedJoint in joints_connecting_actor[actor.SOPName])
+                                        {
+                                            if (affectedJoint.IsInPhysicsEngine)
+                                            {
+                                                DoJointMoved(affectedJoint);
+                                            }
+                                            else
+                                            {
+                                                DoJointErrorMessage(affectedJoint, "a body connected to a joint was moved, but the joint doesn't exist yet! this will lead to joint error. joint was: " + affectedJoint.ObjectNameInScene + " parms:" + affectedJoint.RawParams);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } // end lock _activeprims
+
+                //DumpJointInfo();
+
+                // Finished with all sim stepping. If requested, dump world state to file for debugging.
+                // TODO: This call to the export function is already inside lock (OdeLock) - but is an extra lock needed?
+                // TODO: This overwrites all dump files in-place. Should this be a growing logfile, or separate snapshots?
+                if (physics_logging && (physics_logging_interval>0) && (framecount % physics_logging_interval == 0))
+                {
+                    string fname = "state-" + world.ToString() + ".DIF"; // give each physics world a separate filename
+                    string prefix = "world" + world.ToString(); // prefix for variable names in exported .DIF file
+
+                    if (physics_logging_append_existing_logfile)
+                    {
+                        string header = "-------------- START OF PHYSICS FRAME " + framecount.ToString() + " --------------";
+                        TextWriter fwriter = File.AppendText(fname);
+                        fwriter.WriteLine(header);
+                        fwriter.Close();
+                    }
+                    d.WorldExportDIF(world, fname, physics_logging_append_existing_logfile, prefix);
+                }
+            } // end lock OdeLock
+            
+            return fps * 1000.0f;               //NB This is a FRAME COUNT, not a time! AND is divide by 1000 in SimStatusReporter!
+        } // end Simulate
+
+        public override void GetResults()
+        {
+        }
+
+        public override bool IsThreaded
+        {
+            // for now we won't be multithreaded
+            get { return (false); }
+        }
+
+        #region ODE Specific Terrain Fixes
+        public float[] ResizeTerrain512NearestNeighbour(float[] heightMap)
+        {
+            float[] returnarr = new float[262144];
+            float[,] resultarr = new float[(int)WorldExtents.X, (int)WorldExtents.Y];
+
+            // Filling out the array into its multi-dimensional components
+            for (int y = 0; y < WorldExtents.Y; y++)
+            {
+                for (int x = 0; x < WorldExtents.X; x++)
+                {
+                    resultarr[y, x] = heightMap[y * (int)WorldExtents.Y + x];
+                }
+            }
+
+            // Resize using Nearest Neighbour
+
+            // This particular way is quick but it only works on a multiple of the original
+
+            // The idea behind this method can be described with the following diagrams
+            // second pass and third pass happen in the same loop really..  just separated
+            // them to show what this does.
+
+            // First Pass
+            // ResultArr:
+            // 1,1,1,1,1,1
+            // 1,1,1,1,1,1
+            // 1,1,1,1,1,1
+            // 1,1,1,1,1,1
+            // 1,1,1,1,1,1
+            // 1,1,1,1,1,1
+
+            // Second Pass
+            // ResultArr2:
+            // 1,,1,,1,,1,,1,,1,
+            // ,,,,,,,,,,
+            // 1,,1,,1,,1,,1,,1,
+            // ,,,,,,,,,,
+            // 1,,1,,1,,1,,1,,1,
+            // ,,,,,,,,,,
+            // 1,,1,,1,,1,,1,,1,
+            // ,,,,,,,,,,
+            // 1,,1,,1,,1,,1,,1,
+            // ,,,,,,,,,,
+            // 1,,1,,1,,1,,1,,1,
+
+            // Third pass fills in the blanks
+            // ResultArr2:
+            // 1,1,1,1,1,1,1,1,1,1,1,1
+            // 1,1,1,1,1,1,1,1,1,1,1,1
+            // 1,1,1,1,1,1,1,1,1,1,1,1
+            // 1,1,1,1,1,1,1,1,1,1,1,1
+            // 1,1,1,1,1,1,1,1,1,1,1,1
+            // 1,1,1,1,1,1,1,1,1,1,1,1
+            // 1,1,1,1,1,1,1,1,1,1,1,1
+            // 1,1,1,1,1,1,1,1,1,1,1,1
+            // 1,1,1,1,1,1,1,1,1,1,1,1
+            // 1,1,1,1,1,1,1,1,1,1,1,1
+            // 1,1,1,1,1,1,1,1,1,1,1,1
+
+            // X,Y = .
+            // X+1,y = ^
+            // X,Y+1 = *
+            // X+1,Y+1 = #
+
+            // Filling in like this;
+            // .*
+            // ^#
+            // 1st .
+            // 2nd *
+            // 3rd ^
+            // 4th #
+            // on single loop.
+
+            float[,] resultarr2 = new float[512, 512];
+            for (int y = 0; y < WorldExtents.Y; y++)
+            {
+                for (int x = 0; x < WorldExtents.X; x++)
+                {
+                    resultarr2[y * 2, x * 2] = resultarr[y, x];
+
+                    if (y < WorldExtents.Y)
+                    {
+                        resultarr2[(y * 2) + 1, x * 2] = resultarr[y, x];
+                    }
+                    if (x < WorldExtents.X)
+                    {
+                        resultarr2[y * 2, (x * 2) + 1] = resultarr[y, x];
+                    }
+                    if (x < WorldExtents.X && y < WorldExtents.Y)
+                    {
+                        resultarr2[(y * 2) + 1, (x * 2) + 1] = resultarr[y, x];
+                    }
+                }
+            }
+
+            //Flatten out the array
+            int i = 0;
+            for (int y = 0; y < 512; y++)
+            {
+                for (int x = 0; x < 512; x++)
+                {
+                    if (resultarr2[y, x] <= 0)
+                        returnarr[i] = 0.0000001f;
+                    else
+                        returnarr[i] = resultarr2[y, x];
+
+                    i++;
+                }
+            }
+
+            return returnarr;
+        }
+
+        public float[] ResizeTerrain512Interpolation(float[] heightMap)
+        {
+            float[] returnarr = new float[262144];
+            float[,] resultarr = new float[512,512];
+
+            // Filling out the array into its multi-dimensional components
+            for (int y = 0; y < 256; y++)
+            {
+                for (int x = 0; x < 256; x++)
+                {
+                    resultarr[y, x] = heightMap[y * 256 + x];
+                }
+            }
+
+            // Resize using interpolation
+
+            // This particular way is quick but it only works on a multiple of the original
+
+            // The idea behind this method can be described with the following diagrams
+            // second pass and third pass happen in the same loop really..  just separated
+            // them to show what this does.
+
+            // First Pass
+            // ResultArr:
+            // 1,1,1,1,1,1
+            // 1,1,1,1,1,1
+            // 1,1,1,1,1,1
+            // 1,1,1,1,1,1
+            // 1,1,1,1,1,1
+            // 1,1,1,1,1,1
+
+            // Second Pass
+            // ResultArr2:
+            // 1,,1,,1,,1,,1,,1,
+            // ,,,,,,,,,,
+            // 1,,1,,1,,1,,1,,1,
+            // ,,,,,,,,,,
+            // 1,,1,,1,,1,,1,,1,
+            // ,,,,,,,,,,
+            // 1,,1,,1,,1,,1,,1,
+            // ,,,,,,,,,,
+            // 1,,1,,1,,1,,1,,1,
+            // ,,,,,,,,,,
+            // 1,,1,,1,,1,,1,,1,
+
+            // Third pass fills in the blanks
+            // ResultArr2:
+            // 1,1,1,1,1,1,1,1,1,1,1,1
+            // 1,1,1,1,1,1,1,1,1,1,1,1
+            // 1,1,1,1,1,1,1,1,1,1,1,1
+            // 1,1,1,1,1,1,1,1,1,1,1,1
+            // 1,1,1,1,1,1,1,1,1,1,1,1
+            // 1,1,1,1,1,1,1,1,1,1,1,1
+            // 1,1,1,1,1,1,1,1,1,1,1,1
+            // 1,1,1,1,1,1,1,1,1,1,1,1
+            // 1,1,1,1,1,1,1,1,1,1,1,1
+            // 1,1,1,1,1,1,1,1,1,1,1,1
+            // 1,1,1,1,1,1,1,1,1,1,1,1
+
+            // X,Y = .
+            // X+1,y = ^
+            // X,Y+1 = *
+            // X+1,Y+1 = #
+
+            // Filling in like this;
+            // .*
+            // ^#
+            // 1st .
+            // 2nd *
+            // 3rd ^
+            // 4th #
+            // on single loop.
+
+            float[,] resultarr2 = new float[512,512];
+            for (int y = 0; y < (int)Constants.RegionSize; y++)
+            {
+                for (int x = 0; x < (int)Constants.RegionSize; x++)
+                {
+                    resultarr2[y*2, x*2] = resultarr[y, x];
+
+                    if (y < (int)Constants.RegionSize)
+                    {
+                        if (y + 1 < (int)Constants.RegionSize)
+                        {
+                            if (x + 1 < (int)Constants.RegionSize)
+                            {
+                                resultarr2[(y*2) + 1, x*2] = ((resultarr[y, x] + resultarr[y + 1, x] +
+                                                               resultarr[y, x + 1] + resultarr[y + 1, x + 1])/4);
+                            }
+                            else
+                            {
+                                resultarr2[(y*2) + 1, x*2] = ((resultarr[y, x] + resultarr[y + 1, x])/2);
+                            }
+                        }
+                        else
+                        {
+                            resultarr2[(y*2) + 1, x*2] = resultarr[y, x];
+                        }
+                    }
+                    if (x < (int)Constants.RegionSize)
+                    {
+                        if (x + 1 < (int)Constants.RegionSize)
+                        {
+                            if (y + 1 < (int)Constants.RegionSize)
+                            {
+                                resultarr2[y*2, (x*2) + 1] = ((resultarr[y, x] + resultarr[y + 1, x] +
+                                                               resultarr[y, x + 1] + resultarr[y + 1, x + 1])/4);
+                            }
+                            else
+                            {
+                                resultarr2[y*2, (x*2) + 1] = ((resultarr[y, x] + resultarr[y, x + 1])/2);
+                            }
+                        }
+                        else
+                        {
+                            resultarr2[y*2, (x*2) + 1] = resultarr[y, x];
+                        }
+                    }
+                    if (x < (int)Constants.RegionSize && y < (int)Constants.RegionSize)
+                    {
+                        if ((x + 1 < (int)Constants.RegionSize) && (y + 1 < (int)Constants.RegionSize))
+                        {
+                            resultarr2[(y*2) + 1, (x*2) + 1] = ((resultarr[y, x] + resultarr[y + 1, x] +
+                                                                 resultarr[y, x + 1] + resultarr[y + 1, x + 1])/4);
+                        }
+                        else
+                        {
+                            resultarr2[(y*2) + 1, (x*2) + 1] = resultarr[y, x];
+                        }
+                    }
+                }
+            }
+            //Flatten out the array
+            int i = 0;
+            for (int y = 0; y < 512; y++)
+            {
+                for (int x = 0; x < 512; x++)
+                {
+                    if (Single.IsNaN(resultarr2[y, x]) || Single.IsInfinity(resultarr2[y, x]))
+                    {
+                        m_log.Warn("[PHYSICS]: Non finite heightfield element detected.  Setting it to 0");
+                        resultarr2[y, x] = 0;
+                    }
+                    returnarr[i] = resultarr2[y, x];
+                    i++;
+                }
+            }
+
+            return returnarr;
+        }
+
+        #endregion
+
+        public override void SetTerrain(float[] heightMap)
+        {
+            if (m_worldOffset != Vector3.Zero && m_parentScene != null)
+            {
+                if (m_parentScene is OdeScene)
+                {
+                    ((OdeScene)m_parentScene).SetTerrain(heightMap, m_worldOffset);
+                }
+            }
+            else
+            {
+                SetTerrain(heightMap, m_worldOffset);
+            }
+        }
+
+        public void SetTerrain(float[] heightMap, Vector3 pOffset)
+        {
+           
+            int regionsize = (int) Constants.RegionSize;                // visible region size eg. 256(M)
+            
+            int heightmapWidth = regionsize + 2;                                // ODE map size 257 x 257 (Meters) (1 extra 
+            int heightmapHeight = regionsize + 2;
+            
+            int heightmapWidthSamples = (int)regionsize + 2;            // Sample file size, 258 x 258 samples
+            int heightmapHeightSamples = (int)regionsize + 2;
+            
+            // Array of height samples for ODE 
+            float[] _heightmap;
+            _heightmap = new float[(heightmapWidthSamples * heightmapHeightSamples)];   // loaded samples 258 x 258
+
+                        // Other ODE parameters
+            const float scale = 1.0f;
+            const float offset = 0.0f;
+            const float thickness = 2.0f; // Was 0.2f, Larger appears to prevent Av fall-through
+            const int wrap = 0;
+
+            float hfmin = 2000f;
+            float hfmax = -2000f;
+            float minele = 0.0f;        // Dont allow -ve heights
+            
+            int x = 0;
+            int y = 0;
+            int xx = 0;
+            int yy = 0;
+            
+            // load the height samples array from the heightMap    
+            for ( x = 0; x < heightmapWidthSamples; x++)                                // 0 to 257
+            {
+                for ( y = 0; y < heightmapHeightSamples; y++)                   // 0 to 257
+                {
+                        xx = x - 1;
+                        if (xx < 0) xx = 0;                                                     
+                        if (xx > (regionsize - 1)) xx = regionsize - 1;                                  
+                    
+                        yy = y - 1;
+                        if (yy < 0) yy = 0;                                                     
+                        if (yy > (regionsize - 1)) yy = regionsize - 1;
+                                        // Input xx = 0  0  1  2  ..... 254  255  255      256 total in
+                                // Output x = 0  1  2  3  ..... 255  256  257      258 total out
+                    float val= heightMap[(yy * regionsize) + xx];  // input from heightMap,  <0-255 * 256> <0-255>
+                    if (val < minele) val = minele;
+                    _heightmap[x * (regionsize + 2) + y] = val; // samples output to _heightmap,  <0-257 * 258> <0-257>
+                    hfmin = (val < hfmin) ? val : hfmin;
+                    hfmax = (val > hfmax) ? val : hfmax;
+                }
+            }
+                
+            lock (OdeLock)
+            {
+                IntPtr GroundGeom = IntPtr.Zero;
+                if (RegionTerrain.TryGetValue(pOffset, out GroundGeom))
+                {
+                    RegionTerrain.Remove(pOffset);
+                    if (GroundGeom != IntPtr.Zero)
+                    {
+                        if (TerrainHeightFieldHeights.ContainsKey(GroundGeom))
+                        {
+                            TerrainHeightFieldHeights.Remove(GroundGeom);
+                        }
+                        d.SpaceRemove(space, GroundGeom);
+                        d.GeomDestroy(GroundGeom);
+                    }
+                }
+                IntPtr HeightmapData = d.GeomHeightfieldDataCreate();
+                d.GeomHeightfieldDataBuildSingle(HeightmapData, _heightmap, 0, 
+                        heightmapWidth, heightmapHeight, (int)heightmapWidthSamples, 
+                    (int)heightmapHeightSamples, scale, offset, thickness, wrap);
+                d.GeomHeightfieldDataSetBounds(HeightmapData, hfmin - 1, hfmax + 1);
+                GroundGeom = d.CreateHeightfield(space, HeightmapData, 1);
+                if (GroundGeom != IntPtr.Zero)
+                {
+                    d.GeomSetCategoryBits(GroundGeom, (int)(CollisionCategories.Land));
+                    d.GeomSetCollideBits(GroundGeom, (int)(CollisionCategories.Space));
+                }
+                geom_name_map[GroundGeom] = "Terrain";
+
+                d.Matrix3 R = new d.Matrix3();
+
+                Quaternion q1 = Quaternion.CreateFromAxisAngle(new Vector3(1, 0, 0), 1.5707f);
+                Quaternion q2 = Quaternion.CreateFromAxisAngle(new Vector3(0, 1, 0), 1.5707f);
+                //Axiom.Math.Quaternion q3 = Axiom.Math.Quaternion.FromAngleAxis(3.14f, new Axiom.Math.Vector3(0, 0, 1));
+
+                q1 = q1 * q2;
+                //q1 = q1 * q3;
+                Vector3 v3;
+                float angle;
+                q1.GetAxisAngle(out v3, out angle);
+
+                d.RFromAxisAndAngle(out R, v3.X, v3.Y, v3.Z, angle);
+                d.GeomSetRotation(GroundGeom, ref R);
+                d.GeomSetPosition(GroundGeom, (pOffset.X + (regionsize * 0.5f)) - 0.5f, (pOffset.Y + (regionsize * 0.5f)) - 0.5f, 0);
+                IntPtr testGround = IntPtr.Zero;
+                if (RegionTerrain.TryGetValue(pOffset, out testGround))
+                {
+                    RegionTerrain.Remove(pOffset);
+                }
+                RegionTerrain.Add(pOffset, GroundGeom, GroundGeom);
+                TerrainHeightFieldHeights.Add(GroundGeom,_heightmap);
+            }
+        }
+
+        public override void DeleteTerrain()
+        {
+        }
+
+        public float GetWaterLevel()
+        {
+            return waterlevel;
+        }
+
+        public override bool SupportsCombining()
+        {
+            return true;
+        }
+
+        public override void UnCombine(PhysicsScene pScene)
+        {
+            IntPtr localGround = IntPtr.Zero;
+//            float[] localHeightfield;
+            bool proceed = false;
+            List<IntPtr> geomDestroyList = new List<IntPtr>();
+
+            lock (OdeLock)
+            {
+                if (RegionTerrain.TryGetValue(Vector3.Zero, out localGround))
+                {
+                    foreach (IntPtr geom in TerrainHeightFieldHeights.Keys)
+                    {
+                        if (geom == localGround)
+                        {
+//                            localHeightfield = TerrainHeightFieldHeights[geom];
+                            proceed = true;
+                        }
+                        else
+                        {
+                            geomDestroyList.Add(geom);
+                        }
+                    }
+
+                    if (proceed)
+                    {
+                        m_worldOffset = Vector3.Zero;
+                        WorldExtents = new Vector2((int)Constants.RegionSize, (int)Constants.RegionSize);
+                        m_parentScene = null;
+
+                        foreach (IntPtr g in geomDestroyList)
+                        {
+                            // removingHeightField needs to be done or the garbage collector will
+                            // collect the terrain data before we tell ODE to destroy it causing 
+                            // memory corruption
+                            if (TerrainHeightFieldHeights.ContainsKey(g))
+                            {
+//                                float[] removingHeightField = TerrainHeightFieldHeights[g];
+                                TerrainHeightFieldHeights.Remove(g);
+
+                                if (RegionTerrain.ContainsKey(g))
+                                {
+                                    RegionTerrain.Remove(g);
+                                }
+
+                                d.GeomDestroy(g);
+                                //removingHeightField = new float[0];
+                            }
+                        }
+
+                    }
+                    else
+                    {
+                        m_log.Warn("[PHYSICS]: Couldn't proceed with UnCombine.  Region has inconsistant data.");
+
+                    }
+                }
+            }
+        }
+
+        public override void SetWaterLevel(float baseheight)
+        {
+            waterlevel = baseheight;
+            randomizeWater(waterlevel);
+        }
+
+        public void randomizeWater(float baseheight)
+        {
+            const uint heightmapWidth = m_regionWidth + 2;
+            const uint heightmapHeight = m_regionHeight + 2;
+            const uint heightmapWidthSamples = m_regionWidth + 2;
+            const uint heightmapHeightSamples = m_regionHeight + 2;
+            const float scale = 1.0f;
+            const float offset = 0.0f;
+            const float thickness = 2.9f;
+            const int wrap = 0;
+
+            for (int i = 0; i < (258 * 258); i++)
+            {
+                _watermap[i] = (baseheight-0.1f) + ((float)fluidRandomizer.Next(1,9) / 10f);
+               // m_log.Info((baseheight - 0.1f) + ((float)fluidRandomizer.Next(1, 9) / 10f));
+            }
+
+            lock (OdeLock)
+            {
+                if (WaterGeom != IntPtr.Zero)
+                {
+                    d.SpaceRemove(space, WaterGeom);
+                }
+                IntPtr HeightmapData = d.GeomHeightfieldDataCreate();
+                d.GeomHeightfieldDataBuildSingle(HeightmapData, _watermap, 0, heightmapWidth, heightmapHeight,
+                                                 (int)heightmapWidthSamples, (int)heightmapHeightSamples, scale,
+                                                 offset, thickness, wrap);
+                d.GeomHeightfieldDataSetBounds(HeightmapData, m_regionWidth, m_regionHeight);
+                WaterGeom = d.CreateHeightfield(space, HeightmapData, 1);
+                if (WaterGeom != IntPtr.Zero)
+                {
+                    d.GeomSetCategoryBits(WaterGeom, (int)(CollisionCategories.Water));
+                    d.GeomSetCollideBits(WaterGeom, (int)(CollisionCategories.Space));
+
+                }
+                geom_name_map[WaterGeom] = "Water";
+
+                d.Matrix3 R = new d.Matrix3();
+
+                Quaternion q1 = Quaternion.CreateFromAxisAngle(new Vector3(1, 0, 0), 1.5707f);
+                Quaternion q2 = Quaternion.CreateFromAxisAngle(new Vector3(0, 1, 0), 1.5707f);
+                //Axiom.Math.Quaternion q3 = Axiom.Math.Quaternion.FromAngleAxis(3.14f, new Axiom.Math.Vector3(0, 0, 1));
+
+                q1 = q1 * q2;
+                //q1 = q1 * q3;
+                Vector3 v3;
+                float angle;
+                q1.GetAxisAngle(out v3, out angle);
+
+                d.RFromAxisAndAngle(out R, v3.X, v3.Y, v3.Z, angle);
+                d.GeomSetRotation(WaterGeom, ref R);
+                d.GeomSetPosition(WaterGeom, 128, 128, 0);
+                
+            }
+
+        }
+
+        public override void Dispose()
+        {
+            m_rayCastManager.Dispose();
+            m_rayCastManager = null;
+
+            lock (OdeLock)
+            {
+                lock (_prims)
+                {
+                    foreach (OdePrim prm in _prims)
+                    {
+                        RemovePrim(prm);
+                    }
+                }
+
+                //foreach (OdeCharacter act in _characters)
+                //{
+                    //RemoveAvatar(act);
+                //}
+                d.WorldDestroy(world);
+                //d.CloseODE();
+            }
+        }
+        public override Dictionary<uint, float> GetTopColliders()
+        {
+            Dictionary<uint, float> returncolliders = new Dictionary<uint, float>();
+            int cnt = 0;
+            lock (_prims)
+            {
+                foreach (OdePrim prm in _prims)
+                {
+                    if (prm.CollisionScore > 0)
+                    {
+                        returncolliders.Add(prm.m_localID, prm.CollisionScore);
+                        cnt++;
+                        prm.CollisionScore = 0f;
+                        if (cnt > 25)
+                        {
+                            break;
+                        }
+                    }
+                }
+            }
+            return returncolliders;
+        }
+
+        public override bool SupportsRayCast()
+        {
+            return true;
+        }
+
+        public override void RaycastWorld(Vector3 position, Vector3 direction, float length, RaycastCallback retMethod)
+        {
+            if (retMethod != null)
+            {
+                m_rayCastManager.QueueRequest(position, direction, length, retMethod);
+            }
+        }
+
+#if USE_DRAWSTUFF
+        // Keyboard callback
+        public void command(int cmd)
+        {
+            IntPtr geom;
+            d.Mass mass;
+            d.Vector3 sides = new d.Vector3(d.RandReal() * 0.5f + 0.1f, d.RandReal() * 0.5f + 0.1f, d.RandReal() * 0.5f + 0.1f);
+
+            
+
+            Char ch = Char.ToLower((Char)cmd);
+            switch ((Char)ch)
+            {
+                case 'w':
+                    try
+                    {
+                        Vector3 rotate = (new Vector3(1, 0, 0) * Quaternion.CreateFromEulers(hpr.Z * Utils.DEG_TO_RAD, hpr.Y * Utils.DEG_TO_RAD, hpr.X * Utils.DEG_TO_RAD));
+
+                        xyz.X += rotate.X; xyz.Y += rotate.Y; xyz.Z += rotate.Z;
+                        ds.SetViewpoint(ref xyz, ref hpr);
+                    }
+                    catch (ArgumentException)
+                    { hpr.X = 0; }
+                    break;
+
+                case 'a':
+                    hpr.X++;
+                    ds.SetViewpoint(ref xyz, ref hpr);
+                    break;
+
+                case 's':
+                    try
+                    {
+                        Vector3 rotate2 = (new Vector3(-1, 0, 0) * Quaternion.CreateFromEulers(hpr.Z * Utils.DEG_TO_RAD, hpr.Y * Utils.DEG_TO_RAD, hpr.X * Utils.DEG_TO_RAD));
+
+                        xyz.X += rotate2.X; xyz.Y += rotate2.Y; xyz.Z += rotate2.Z;
+                        ds.SetViewpoint(ref xyz, ref hpr);
+                    }
+                    catch (ArgumentException)
+                    { hpr.X = 0; }
+                    break;
+                case 'd':
+                    hpr.X--;
+                    ds.SetViewpoint(ref xyz, ref hpr);
+                    break;
+                case 'r':
+                    xyz.Z++;
+                    ds.SetViewpoint(ref xyz, ref hpr);
+                    break;
+                case 'f':
+                    xyz.Z--;
+                    ds.SetViewpoint(ref xyz, ref hpr);
+                    break;
+                case 'e':
+                    xyz.Y++;
+                    ds.SetViewpoint(ref xyz, ref hpr);
+                    break;
+                case 'q':
+                    xyz.Y--;
+                    ds.SetViewpoint(ref xyz, ref hpr);
+                    break;
+            }
+        }
+
+        public void step(int pause)
+        {
+            
+            ds.SetColor(1.0f, 1.0f, 0.0f);
+            ds.SetTexture(ds.Texture.Wood);
+            lock (_prims)
+            {
+                foreach (OdePrim prm in _prims)
+                {
+                    //IntPtr body = d.GeomGetBody(prm.prim_geom);
+                    if (prm.prim_geom != IntPtr.Zero)
+                    {
+                        d.Vector3 pos;
+                        d.GeomCopyPosition(prm.prim_geom, out pos);
+                        //d.BodyCopyPosition(body, out pos);
+
+                        d.Matrix3 R;
+                        d.GeomCopyRotation(prm.prim_geom, out R);
+                        //d.BodyCopyRotation(body, out R);
+
+
+                        d.Vector3 sides = new d.Vector3();
+                        sides.X = prm.Size.X;
+                        sides.Y = prm.Size.Y;
+                        sides.Z = prm.Size.Z;
+
+                        ds.DrawBox(ref pos, ref R, ref sides);
+                    }
+                }
+            }
+            ds.SetColor(1.0f, 0.0f, 0.0f);
+            lock (_characters)
+            {
+                foreach (OdeCharacter chr in _characters)
+                {
+                    if (chr.Shell != IntPtr.Zero)
+                    {
+                        IntPtr body = d.GeomGetBody(chr.Shell);
+
+                        d.Vector3 pos;
+                        d.GeomCopyPosition(chr.Shell, out pos);
+                        //d.BodyCopyPosition(body, out pos);
+
+                        d.Matrix3 R;
+                        d.GeomCopyRotation(chr.Shell, out R);
+                        //d.BodyCopyRotation(body, out R);
+
+                        ds.DrawCapsule(ref pos, ref R, chr.Size.Z, 0.35f);
+                        d.Vector3 sides = new d.Vector3();
+                        sides.X = 0.5f;
+                        sides.Y = 0.5f;
+                        sides.Z = 0.5f;
+
+                        ds.DrawBox(ref pos, ref R, ref sides);
+                    }
+                }
+            }
+        }
+
+        public void start(int unused)
+        {
+            ds.SetViewpoint(ref xyz, ref hpr);
+        }
+#endif
+    }
+}
diff --git a/OpenSim/Region/Physics/ChOdePlugin/OdeUtils.cs b/OpenSim/Region/Physics/ChOdePlugin/OdeUtils.cs
new file mode 100644
index 0000000..e7e7bb3
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/OdeUtils.cs
@@ -0,0 +1,353 @@
+/* Ubit 2012
+  * 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.
+*/
+
+// no endian conversion. So can't be use to pass information around diferent cpus with diferent endian
+
+using System;
+using System.IO;
+using OpenMetaverse;
+
+namespace OpenSim.Region.Physics.OdePlugin
+{
+   
+    unsafe public class wstreamer
+    {
+        byte[] buf;
+        int index;
+        byte* src;
+
+        public wstreamer()
+        {
+            buf = new byte[1024];
+            index = 0;
+        }
+        public wstreamer(int size)
+        {
+            buf = new byte[size];
+            index = 0;
+        }
+
+        public byte[] close()
+        {
+            byte[] data = new byte[index];
+            Buffer.BlockCopy(buf, 0, data, 0, index); 
+            return data;
+        }
+
+        public void Seek(int pos)
+        {
+            index = pos;
+        }
+
+        public void Seekrel(int pos)
+        {
+            index += pos;
+        }
+
+        public void Wbyte(byte value)
+        {
+            buf[index++] = value;
+        }
+        public void Wshort(short value)
+        {
+            src = (byte*)&value;
+            buf[index++] = *src++;
+            buf[index++] = *src;
+        }
+        public void Wushort(ushort value)
+        {
+            src = (byte*)&value;
+            buf[index++] = *src++;
+            buf[index++] = *src;
+        }
+        public void Wint(int value)
+        {
+            src = (byte*)&value;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src;
+        }
+        public void Wuint(uint value)
+        {
+            src = (byte*)&value;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src;
+        }
+        public void Wlong(long value)
+        {
+            src = (byte*)&value;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src;
+        }
+        public void Wulong(ulong value)
+        {
+            src = (byte*)&value;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src;
+        }
+
+        public void Wfloat(float value)
+        {
+            src = (byte*)&value;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src;
+        }
+
+        public void Wdouble(double value)
+        {
+            src = (byte*)&value;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src;
+        }
+
+        public void Wvector3(Vector3 value)
+        {
+            src = (byte*)&value.X;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src;
+            src = (byte*)&value.Y; // it may have padding ??
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src;
+            src = (byte*)&value.Z;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src;
+        }
+        public void Wquat(Quaternion value)
+        {
+            src = (byte*)&value.X;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src;
+            src = (byte*)&value.Y; // it may have padding ??
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src;
+            src = (byte*)&value.Z;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src;
+            src = (byte*)&value.W;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src++;
+            buf[index++] = *src;
+        }
+    }
+
+    unsafe public class rstreamer
+    {
+        private byte[] rbuf;
+        private int ptr;
+        private byte* dst;
+
+        public rstreamer(byte[] data)
+        {
+            rbuf = data;
+            ptr = 0;
+        }
+
+        public void close()
+        {
+        }
+
+        public void Seek(int pos)
+        {
+            ptr = pos;
+        }
+
+        public void Seekrel(int pos)
+        {
+            ptr += pos;
+        }
+
+        public byte Rbyte()
+        {
+            return (byte)rbuf[ptr++];
+        }
+
+        public short Rshort()
+        {
+            short v;
+            dst = (byte*)&v;
+            *dst++ = rbuf[ptr++];
+            *dst = rbuf[ptr++];
+            return v;
+        }
+        public ushort Rushort()
+        {
+            ushort v;
+            dst = (byte*)&v;
+            *dst++ = rbuf[ptr++];
+            *dst = rbuf[ptr++];
+            return v;
+        }
+        public int Rint()
+        {
+            int v;
+            dst = (byte*)&v;
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst = rbuf[ptr++];
+            return v;
+        }
+        public uint Ruint()
+        {
+            uint v;
+            dst = (byte*)&v;
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst = rbuf[ptr++];
+            return v;
+        }
+        public long Rlong()
+        {
+            long v;
+            dst = (byte*)&v;
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst = rbuf[ptr++];
+            return v;
+        }
+        public ulong Rulong()
+        {
+            ulong v;
+            dst = (byte*)&v;
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst = rbuf[ptr++];
+            return v;
+        }
+        public float Rfloat()
+        {
+            float v;
+            dst = (byte*)&v;
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst = rbuf[ptr++];
+            return v;
+        }
+
+        public double Rdouble()
+        {
+            double v;
+            dst = (byte*)&v;
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst = rbuf[ptr++];
+            return v;
+        }
+
+        public Vector3 Rvector3()
+        {
+            Vector3 v;
+            dst = (byte*)&v.X;
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst = rbuf[ptr++];
+
+            dst = (byte*)&v.Y;
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst = rbuf[ptr++];
+
+            dst = (byte*)&v.Z;
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst = rbuf[ptr++];
+            return v;
+        }
+
+        public Quaternion Rquat()
+        {
+            Quaternion v;
+            dst = (byte*)&v.X;
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst = rbuf[ptr++];
+
+            dst = (byte*)&v.Y;
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst = rbuf[ptr++];
+
+            dst = (byte*)&v.Z;
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst = rbuf[ptr++];
+
+            dst = (byte*)&v.W;
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst++ = rbuf[ptr++];
+            *dst = rbuf[ptr++];
+
+            return v;
+        }
+    }
+}
diff --git a/OpenSim/Region/Physics/ChOdePlugin/Tests/ODETestClass.cs b/OpenSim/Region/Physics/ChOdePlugin/Tests/ODETestClass.cs
new file mode 100644
index 0000000..69e2d03
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/Tests/ODETestClass.cs
@@ -0,0 +1,122 @@
+/*
+ * 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 Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Physics.Manager;
+using log4net;
+using System.Reflection;
+
+namespace OpenSim.Region.Physics.OdePlugin
+{
+    [TestFixture]
+    public class ODETestClass
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private OdePlugin cbt;
+        private PhysicsScene ps;
+        private IMeshingPlugin imp;
+
+        [SetUp]
+        public void Initialize()
+        {
+            // Loading ODEPlugin
+            cbt = new OdePlugin();
+            // Loading Zero Mesher
+            imp = new ZeroMesherPlugin();
+            // Getting Physics Scene
+            ps = cbt.GetScene("test");
+            // Initializing Physics Scene.
+            ps.Initialise(imp.GetMesher(),null);
+            float[] _heightmap = new float[(int)Constants.RegionSize * (int)Constants.RegionSize];
+            for (int i = 0; i < ((int)Constants.RegionSize * (int)Constants.RegionSize); i++)
+            {
+                _heightmap[i] = 21f;
+            }
+            ps.SetTerrain(_heightmap);
+        }
+
+        [TearDown]
+        public void Terminate()
+        {
+            ps.DeleteTerrain();
+            ps.Dispose();
+
+        }
+
+        [Test]
+        public void CreateAndDropPhysicalCube()
+        {
+            PrimitiveBaseShape newcube = PrimitiveBaseShape.CreateBox();
+            Vector3 position = new Vector3(((float)Constants.RegionSize * 0.5f), ((float)Constants.RegionSize * 0.5f), 128f);
+            Vector3 size = new Vector3(0.5f, 0.5f, 0.5f);
+            Quaternion rot = Quaternion.Identity;
+            PhysicsActor prim = ps.AddPrimShape("CoolShape", newcube, position, size, rot, true);
+            OdePrim oprim = (OdePrim)prim;
+            OdeScene pscene = (OdeScene) ps;
+
+            Assert.That(oprim.m_taintadd);
+
+            prim.LocalID = 5;
+
+            for (int i = 0; i < 58; i++)
+            {
+                ps.Simulate(0.133f);
+
+                Assert.That(oprim.prim_geom != (IntPtr)0);
+
+                Assert.That(oprim.m_targetSpace != (IntPtr)0);
+
+                //Assert.That(oprim.m_targetSpace == pscene.space);
+                m_log.Info("TargetSpace: " + oprim.m_targetSpace + " - SceneMainSpace: " + pscene.space);
+
+                Assert.That(!oprim.m_taintadd);
+                m_log.Info("Prim Position (" + oprim.m_localID + "): " + prim.Position.ToString());
+
+                // Make sure we're above the ground
+                //Assert.That(prim.Position.Z > 20f);
+                //m_log.Info("PrimCollisionScore (" + oprim.m_localID + "): " + oprim.m_collisionscore);
+
+                // Make sure we've got a Body
+                Assert.That(oprim.Body != (IntPtr)0);
+                //m_log.Info(
+            }
+
+            // Make sure we're not somewhere above the ground
+            Assert.That(prim.Position.Z < 21.5f);
+
+            ps.RemovePrim(prim);
+            Assert.That(oprim.m_taintremove);
+            ps.Simulate(0.133f);
+            Assert.That(oprim.Body == (IntPtr)0);
+        }
+    }
+}
diff --git a/OpenSim/Region/Physics/ChOdePlugin/drawstuff.cs b/OpenSim/Region/Physics/ChOdePlugin/drawstuff.cs
new file mode 100644
index 0000000..87ca446
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/drawstuff.cs
@@ -0,0 +1,98 @@
+/*
+ * Copyright ODE
+ * Ode.NET - .NET bindings for ODE
+ *  Jason Perkins (starkos@industriousone.com)
+ *  Licensed under the New BSD
+ *  Part of the OpenDynamicsEngine
+Open Dynamics Engine
+Copyright (c) 2001-2007, Russell L. Smith.
+All rights reserved.
+
+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 names of ODE's copyright owner 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 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. IN NO EVENT SHALL THE COPYRIGHT
+OWNER 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
+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.Runtime.InteropServices;
+using Ode.NET;
+
+namespace Drawstuff.NET
+{
+#if dDOUBLE
+    using dReal = System.Double;
+#else
+    using dReal = System.Single;
+#endif
+
+    public static class ds
+    {
+        public const int VERSION = 2;
+
+        public enum Texture
+        {
+            None,
+            Wood
+        }
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate void CallbackFunction(int arg);
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct Functions
+        {
+            public int version;
+            public CallbackFunction start;
+            public CallbackFunction step;
+            public CallbackFunction command;
+            public CallbackFunction stop;
+            public string path_to_textures;
+        }
+
+        [DllImport("drawstuff", EntryPoint = "dsDrawBox")]
+        public static extern void DrawBox(ref d.Vector3 pos, ref d.Matrix3 R, ref d.Vector3 sides);
+
+        [DllImport("drawstuff", EntryPoint = "dsDrawCapsule")]
+        public static extern void DrawCapsule(ref d.Vector3 pos, ref d.Matrix3 R, dReal length, dReal radius);
+
+        [DllImport("drawstuff", EntryPoint = "dsDrawConvex")]
+        public static extern void DrawConvex(ref d.Vector3 pos, ref d.Matrix3 R, dReal[] planes, int planeCount, dReal[] points, int pointCount, int[] polygons);
+
+        [DllImport("drawstuff", EntryPoint = "dsSetColor")]
+        public static extern void SetColor(float red, float green, float blue);
+
+        [DllImport("drawstuff", EntryPoint = "dsSetTexture")]
+        public static extern void SetTexture(Texture texture);
+
+        [DllImport("drawstuff", EntryPoint = "dsSetViewpoint")]
+        public static extern void SetViewpoint(ref d.Vector3 xyz, ref d.Vector3 hpr);
+
+        [DllImport("drawstuff", EntryPoint = "dsSimulationLoop")]
+        public static extern void SimulationLoop(int argc, string[] argv, int window_width, int window_height, ref Functions fn);
+    }
+}
diff --git a/OpenSim/Region/Physics/Manager/IMesher.cs b/OpenSim/Region/Physics/Manager/IMesher.cs
index 2e7bb5d..5485eb7 100644
--- a/OpenSim/Region/Physics/Manager/IMesher.cs
+++ b/OpenSim/Region/Physics/Manager/IMesher.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Runtime.InteropServices;
 using OpenSim.Framework;
 using OpenMetaverse;
 
@@ -36,7 +37,11 @@ namespace OpenSim.Region.Physics.Manager
     {
         IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod);
         IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical);
-        IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool shouldCache);
+        IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool shouldCache, bool convex, bool forOde);
+        IMesh GetMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex);
+        void ReleaseMesh(IMesh mesh);
+        void ExpireReleaseMeshs();
+        void ExpireFileCache();
     }
 
     // Values for level of detail to be passed to the mesher.
@@ -54,6 +59,25 @@ namespace OpenSim.Region.Physics.Manager
     {
     }
 
+    [Serializable()]
+    [StructLayout(LayoutKind.Explicit)]
+    public struct AMeshKey
+    {
+        [FieldOffset(0)]
+        public UUID uuid;
+        [FieldOffset(0)]
+        public ulong hashA;
+        [FieldOffset(8)]
+        public ulong hashB;
+        [FieldOffset(16)]
+        public ulong hashC;
+
+        public override string ToString()
+        {
+            return uuid.ToString() + "-" + hashC.ToString("x") ;
+        }
+    }
+
     public interface IMesh
     {
         List<Vector3> getVertexList();
@@ -67,5 +91,7 @@ namespace OpenSim.Region.Physics.Manager
         void releasePinned();
         void Append(IMesh newMesh);
         void TransformLinear(float[,] matrix, float[] offset);
+        Vector3 GetCentroid();
+        Vector3 GetOBB();
     }
 }
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index bd806eb..7cd364b 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -43,7 +43,8 @@ namespace OpenSim.Region.Physics.Manager
         Unknown = 0,
         Agent = 1,
         Prim = 2,
-        Ground = 3
+        Ground = 3,
+        Water = 4
     }
 
     public enum PIDHoverType
@@ -59,15 +60,41 @@ namespace OpenSim.Region.Physics.Manager
         public Vector3 Position;
         public Vector3 SurfaceNormal;
         public float PenetrationDepth;
+        public float RelativeSpeed;
+        public bool CharacterFeet;
 
         public ContactPoint(Vector3 position, Vector3 surfaceNormal, float penetrationDepth)
         {
             Position = position;
             SurfaceNormal = surfaceNormal;
             PenetrationDepth = penetrationDepth;
+            RelativeSpeed = 0f; // for now let this one be set explicity
+            CharacterFeet = true;  // keep other plugins work as before
+        }
+
+        public ContactPoint(Vector3 position, Vector3 surfaceNormal, float penetrationDepth, bool feet)
+        {
+            Position = position;
+            SurfaceNormal = surfaceNormal;
+            PenetrationDepth = penetrationDepth;
+            RelativeSpeed = 0f; // for now let this one be set explicity
+            CharacterFeet = feet;  // keep other plugins work as before
         }
     }
 
+    public struct ContactData
+    {
+        public float mu;
+        public float bounce;
+        public bool softcolide;
+
+        public ContactData(float _mu, float _bounce, bool _softcolide)
+        {
+            mu = _mu;
+            bounce = _bounce;
+            softcolide = _softcolide;
+        }
+    }
     /// <summary>
     /// Used to pass collision information to OnCollisionUpdate listeners.
     /// </summary>
@@ -99,7 +126,7 @@ namespace OpenSim.Region.Physics.Manager
                 m_objCollisionList.Add(localID, contact);
             }
             else
-            {
+            {              
                 if (m_objCollisionList[localID].PenetrationDepth < contact.PenetrationDepth)
                     m_objCollisionList[localID] = contact;
             }
@@ -135,6 +162,8 @@ namespace OpenSim.Region.Physics.Manager
         /// </summary>
         public event CollisionUpdate OnCollisionUpdate;
 
+        public virtual void SetVehicle(object vdata) { }
+
         public event OutOfBounds OnOutOfBounds;
 #pragma warning restore 67
 
@@ -142,11 +171,32 @@ namespace OpenSim.Region.Physics.Manager
         {
             get { return new NullPhysicsActor(); }
         }
+   
+        public virtual bool Building { get; set; }
+
+        public virtual void getContactData(ref ContactData cdata)
+        {
+            cdata.mu = 0;
+            cdata.bounce = 0;
+        }
 
         public abstract bool Stopped { get; }
 
         public abstract Vector3 Size { get; set; }
 
+        public virtual void setAvatarSize(Vector3 size, float feetOffset)
+        {
+            Size = size;
+        }
+
+        public virtual bool Phantom { get; set; }
+
+        public virtual bool IsVolumeDtc
+        {
+            get { return false; }
+            set { return; }
+        }
+
         public virtual byte PhysicsShapeType { get; set; }
 
         public abstract PrimitiveBaseShape Shape { set; }
@@ -169,7 +219,7 @@ namespace OpenSim.Region.Physics.Manager
         /// XXX: Bizarrely, this cannot be "Terrain" or "Water" right now unless it really is simulating terrain or
         /// water.  This is not a problem due to the formatting of names given by prims and avatars.
         /// </remarks>
-        public string Name { get; protected set; }
+        public string Name { get; set; }
 
         /// <summary>
         /// This is being used by ODE joint code.
@@ -253,6 +303,51 @@ namespace OpenSim.Region.Physics.Manager
         public abstract Vector3 GeometricCenter { get; }
         public abstract Vector3 CenterOfMass { get; }
 
+        public virtual Vector3 OOBsize
+        {
+            get
+                {
+                Vector3 s=Size;
+                s.X *=0.5f;
+                s.Y *=0.5f;
+                s.Z *=0.5f;
+                return s;
+                } 
+        }
+
+        public virtual Vector3 OOBoffset
+        {
+            get
+            {
+                return Vector3.Zero;
+            }
+        }
+
+        public virtual float OOBRadiusSQ
+        {
+            get
+            {
+                return Size.LengthSquared() * 0.25f; // ((0.5^2)
+            }
+        }
+
+
+        public virtual float PhysicsCost
+        {
+            get
+            {
+                return 0.1f;
+            }
+        }
+
+        public virtual float StreamCost
+        {
+            get
+            {
+                return 1.0f;
+            }
+        }
+
         /// <summary>
         /// The desired velocity of this actor.
         /// </summary>
@@ -313,13 +408,22 @@ namespace OpenSim.Region.Physics.Manager
         public abstract void SubscribeEvents(int ms);
         public abstract void UnSubscribeEvents();
         public abstract bool SubscribedEvents();
+
+        public virtual void AddCollisionEvent(uint CollidedWith, ContactPoint contact) { }
+
+        // Warning in a parent part it returns itself, not null
+        public virtual PhysicsActor ParentActor { get { return this; } }
+        
+
     }
 
     public class NullPhysicsActor : PhysicsActor
     {
+        private ActorTypes m_actorType = ActorTypes.Unknown;
+
         public override bool Stopped
         {
-            get{ return false; }
+            get{ return true; }
         }
 
         public override Vector3 Position
@@ -336,6 +440,7 @@ namespace OpenSim.Region.Physics.Manager
 
         public override uint LocalID
         {
+            get { return 0; }
             set { return; }
         }
 
@@ -395,50 +500,17 @@ namespace OpenSim.Region.Physics.Manager
             set { return; }
         }
 
-        public override void VehicleFloatParam(int param, float value)
-        {
-
-        }
-
-        public override void VehicleVectorParam(int param, Vector3 value)
-        {
-
-        }
-
-        public override void VehicleRotationParam(int param, Quaternion rotation)
-        {
+        public override void VehicleFloatParam(int param, float value) {}
+        public override void VehicleVectorParam(int param, Vector3 value) { }
+        public override void VehicleRotationParam(int param, Quaternion rotation) { }
+        public override void VehicleFlags(int param, bool remove) { }
+        public override void SetVolumeDetect(int param) {}
+        public override void SetMaterial(int material) {}
+        public override Vector3 CenterOfMass { get { return Vector3.Zero; }}
 
-        }
-
-        public override void VehicleFlags(int param, bool remove)
-        {
-            
-        }
-
-        public override void SetVolumeDetect(int param)
-        {
-
-        }
+        public override Vector3 GeometricCenter { get { return Vector3.Zero; }}
 
-        public override void SetMaterial(int material)
-        {
-            
-        }
-
-        public override Vector3 CenterOfMass
-        {
-            get { return Vector3.Zero; }
-        }
-
-        public override Vector3 GeometricCenter
-        {
-            get { return Vector3.Zero; }
-        }
-
-        public override PrimitiveBaseShape Shape
-        {
-            set { return; }
-        }
+        public override PrimitiveBaseShape Shape { set { return; }}
 
         public override Vector3 Velocity
         {
@@ -458,9 +530,7 @@ namespace OpenSim.Region.Physics.Manager
             set { }
         }
 
-        public override void CrossingFailure()
-        {
-        }
+        public override void CrossingFailure() {}
 
         public override Quaternion Orientation
         {
@@ -500,8 +570,20 @@ namespace OpenSim.Region.Physics.Manager
 
         public override int PhysicsActorType
         {
-            get { return (int) ActorTypes.Unknown; }
-            set { return; }
+            get { return (int)m_actorType; }
+            set {               
+                ActorTypes type = (ActorTypes)value;
+                switch (type)
+                {
+                    case ActorTypes.Ground:
+                    case ActorTypes.Water:
+                        m_actorType = type;
+                        break;
+                    default:
+                        m_actorType = ActorTypes.Unknown;
+                        break;
+                }
+            }
         }
 
         public override bool Kinematic
@@ -510,26 +592,11 @@ namespace OpenSim.Region.Physics.Manager
             set { return; }
         }
 
-        public override void link(PhysicsActor obj)
-        {
-        }
-
-        public override void delink()
-        {
-        }
-
-        public override void LockAngularMotion(Vector3 axis)
-        {
-        }
-
-        public override void AddForce(Vector3 force, bool pushforce)
-        {
-        }
-
-        public override void AddAngularForce(Vector3 force, bool pushforce)
-        {
-            
-        }
+        public override void link(PhysicsActor obj) { }
+        public override void delink() { }
+        public override void LockAngularMotion(Vector3 axis) { }
+        public override void AddForce(Vector3 force, bool pushforce) { }
+        public override void AddAngularForce(Vector3 force, bool pushforce) { }
 
         public override Vector3 RotationalVelocity
         {
@@ -551,21 +618,10 @@ namespace OpenSim.Region.Physics.Manager
         public override float APIDStrength { set { return; } }
         public override float APIDDamping { set { return; } }
         
-        public override void SetMomentum(Vector3 momentum)
-        {
-        }
-
-        public override void SubscribeEvents(int ms)
-        {
-
-        }
-        public override void UnSubscribeEvents()
-        {
+        public override void SetMomentum(Vector3 momentum) { }
 
-        }
-        public override bool SubscribedEvents()
-        {
-            return false;
-        }
+        public override void SubscribeEvents(int ms) { }
+        public override void UnSubscribeEvents() { }
+        public override bool SubscribedEvents() { return false; }
     }
 }
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 290b72e..20a70b4 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -38,6 +38,10 @@ namespace OpenSim.Region.Physics.Manager
 
     public delegate void RaycastCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 normal);
     public delegate void RayCallback(List<ContactResult> list);
+    public delegate void ProbeBoxCallback(List<ContactResult> list);
+    public delegate void ProbeSphereCallback(List<ContactResult> list);
+    public delegate void ProbePlaneCallback(List<ContactResult> list);
+    public delegate void SitAvatarCallback(int status, uint partID, Vector3 offset, Quaternion Orientation);
 
     public delegate void JointMoved(PhysicsJoint joint);
     public delegate void JointDeactivated(PhysicsJoint joint);
@@ -86,6 +90,8 @@ namespace OpenSim.Region.Physics.Manager
         public Vector3 Normal;
     }
 
+
+
     public abstract class PhysicsScene
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -133,8 +139,10 @@ namespace OpenSim.Region.Physics.Manager
         /// <param name="size"></param>
         /// <param name="isFlying"></param>
         /// <returns></returns>
-        public abstract PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying);
-
+        public virtual PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying)
+        {
+            return null;
+        }
         /// <summary>
         /// Add an avatar
         /// </summary>
@@ -151,6 +159,12 @@ namespace OpenSim.Region.Physics.Manager
             return ret;
         }
 
+        public virtual PhysicsActor AddAvatar(uint localID, string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying)
+        {
+            PhysicsActor ret = AddAvatar(localID, avName, position, size, isFlying);
+            return ret;
+        }
+
         /// <summary>
         /// Remove an avatar.
         /// </summary>
@@ -166,6 +180,19 @@ namespace OpenSim.Region.Physics.Manager
         public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
                                                   Vector3 size, Quaternion rotation, bool isPhysical, uint localid);
 
+        public virtual PhysicsActor AddPrimShape(string primName, PhysicsActor parent, PrimitiveBaseShape pbs, Vector3 position,
+                                                  uint localid, byte[] sdata)
+        {
+            return null;
+        }
+
+        public virtual PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
+                                                  Vector3 size, Quaternion rotation, bool isPhysical, bool isPhantom, uint localid)
+        {
+            return AddPrimShape(primName, pbs, position, size, rotation, isPhysical, localid);
+        }
+
+                           
         public virtual PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
                                                   Vector3 size, Quaternion rotation, bool isPhysical, bool isPhantom, byte shapetype, uint localid)
         {
@@ -239,6 +266,9 @@ namespace OpenSim.Region.Physics.Manager
 
         public abstract void AddPhysicsActorTaint(PhysicsActor prim);
 
+
+        public virtual void PrepareSimulation() { }
+
         /// <summary>
         /// Perform a simulation of the current physics scene over the given timestep.
         /// </summary>
@@ -283,7 +313,7 @@ namespace OpenSim.Region.Physics.Manager
         }
 
         public virtual void Combine(PhysicsScene pScene, Vector3 offset, Vector3 extents) {}
-
+        public virtual void CombineTerrain(float[] heightMap, Vector3 pOffset) {}
         public virtual void UnCombine(PhysicsScene pScene) {}
 
         /// <summary>
@@ -331,5 +361,30 @@ namespace OpenSim.Region.Physics.Manager
         {
             return false;
         }
+
+        public virtual List<ContactResult> RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, int Count, RayFilterFlags flags)
+        {
+            return new List<ContactResult>();
+        }
+
+        public virtual List<ContactResult> BoxProbe(Vector3 position, Vector3 size, Quaternion orientation, int Count, RayFilterFlags flags)
+        {
+            return new List<ContactResult>();
+        }
+
+        public virtual List<ContactResult> SphereProbe(Vector3 position, float radius, int Count, RayFilterFlags flags)
+        {
+            return new List<ContactResult>();
+        }
+
+        public virtual List<ContactResult> PlaneProbe(PhysicsActor actor, Vector4 plane, int Count, RayFilterFlags flags)
+        {
+            return new List<ContactResult>();
+        }
+
+        public virtual int SitAvatar(PhysicsActor actor, Vector3 AbsolutePosition, Vector3 CameraPosition, Vector3 offset, Vector3 AvatarSize, SitAvatarCallback PhysicsSitResponse)
+        {
+            return 0;
+        }
     }
 }
diff --git a/OpenSim/Region/Physics/Manager/VehicleConstants.cs b/OpenSim/Region/Physics/Manager/VehicleConstants.cs
index f0775c1..8e24b4c 100644
--- a/OpenSim/Region/Physics/Manager/VehicleConstants.cs
+++ b/OpenSim/Region/Physics/Manager/VehicleConstants.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using OpenMetaverse;
 
 namespace OpenSim.Region.Physics.Manager
 {
@@ -117,5 +118,47 @@ namespace OpenSim.Region.Physics.Manager
         NO_DEFLECTION = 16392,
         LOCK_ROTATION = 32784
     }
-        
+
+    public struct VehicleData
+    {
+        public Vehicle m_type;
+        public VehicleFlag m_flags;
+
+        // Linear properties
+        public Vector3 m_linearMotorDirection;
+        public Vector3 m_linearFrictionTimescale;
+        public float m_linearMotorDecayTimescale;
+        public float m_linearMotorTimescale;
+        public Vector3 m_linearMotorOffset;
+
+        //Angular properties
+        public Vector3 m_angularMotorDirection;
+        public float m_angularMotorTimescale;
+        public float m_angularMotorDecayTimescale;
+        public Vector3 m_angularFrictionTimescale;
+
+        //Deflection properties
+        public float m_angularDeflectionEfficiency;
+        public float m_angularDeflectionTimescale;
+        public float m_linearDeflectionEfficiency;
+        public float m_linearDeflectionTimescale;
+
+        //Banking properties
+        public float m_bankingEfficiency;
+        public float m_bankingMix;
+        public float m_bankingTimescale;
+
+        //Hover and Buoyancy properties
+        public float m_VhoverHeight;
+        public float m_VhoverEfficiency;
+        public float m_VhoverTimescale;
+        public float m_VehicleBuoyancy;
+
+        //Attractor properties
+        public float m_verticalAttractionEfficiency;
+        public float m_verticalAttractionTimescale;
+
+        // Axis
+        public Quaternion m_referenceFrame;
+    }
 }
diff --git a/OpenSim/Region/Physics/Manager/ZeroMesher.cs b/OpenSim/Region/Physics/Manager/ZeroMesher.cs
index 270d2ec..80ecf66 100644
--- a/OpenSim/Region/Physics/Manager/ZeroMesher.cs
+++ b/OpenSim/Region/Physics/Manager/ZeroMesher.cs
@@ -67,6 +67,11 @@ namespace OpenSim.Region.Physics.Manager
             return CreateMesh(primName, primShape, size, lod, false, false);
         }
 
+        public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool shouldCache, bool convex,bool forOde)
+        {
+            return CreateMesh(primName, primShape, size, lod, false);
+        }
+
         public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical)
         {
             return CreateMesh(primName, primShape, size, lod, false, false);
@@ -79,5 +84,14 @@ namespace OpenSim.Region.Physics.Manager
 
             return null;
         }
+
+        public IMesh GetMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex)
+        {
+            return null;
+        }
+
+        public void ReleaseMesh(IMesh mesh) { }
+        public void ExpireReleaseMeshs() { }
+        public void ExpireFileCache() { }
     }
 }
diff --git a/OpenSim/Region/Physics/Meshing/Mesh.cs b/OpenSim/Region/Physics/Meshing/Mesh.cs
index bd8e306..e6b32e7 100644
--- a/OpenSim/Region/Physics/Meshing/Mesh.cs
+++ b/OpenSim/Region/Physics/Meshing/Mesh.cs
@@ -46,11 +46,36 @@ namespace OpenSim.Region.Physics.Meshing
         IntPtr m_indicesPtr = IntPtr.Zero;
         int m_indexCount = 0;
         public float[] m_normals;
+        Vector3 _centroid;
+        int _centroidDiv;
+
+        private class vertexcomp : IEqualityComparer<Vertex>
+        {
+            public bool Equals(Vertex v1, Vertex v2)
+            {
+                if (v1.X == v2.X && v1.Y == v2.Y && v1.Z == v2.Z)
+                    return true;
+                else
+                    return false;
+            }
+            public int GetHashCode(Vertex v)
+            {
+                int a = v.X.GetHashCode();
+                int b = v.Y.GetHashCode();
+                int c = v.Z.GetHashCode();
+                return (a << 16) ^ (b << 8) ^ c;
+            }
+
+        }
 
         public Mesh()
         {
-            m_vertices = new Dictionary<Vertex, int>();
+            vertexcomp vcomp = new vertexcomp();
+
+            m_vertices = new Dictionary<Vertex, int>(vcomp);
             m_triangles = new List<Triangle>();
+            _centroid = Vector3.Zero;
+            _centroidDiv = 0;
         }
 
         public Mesh Clone()
@@ -61,7 +86,8 @@ namespace OpenSim.Region.Physics.Meshing
             {
                 result.Add(new Triangle(t.v1.Clone(), t.v2.Clone(), t.v3.Clone()));
             }
-
+            result._centroid = _centroid;
+            result._centroidDiv = _centroidDiv;
             return result;
         }
 
@@ -71,15 +97,63 @@ namespace OpenSim.Region.Physics.Meshing
                 throw new NotSupportedException("Attempt to Add to a pinned Mesh");
             // If a vertex of the triangle is not yet in the vertices list,
             // add it and set its index to the current index count
+            // vertex == seems broken
+            // skip colapsed triangles
+            if ((triangle.v1.X == triangle.v2.X && triangle.v1.Y == triangle.v2.Y && triangle.v1.Z == triangle.v2.Z)
+                || (triangle.v1.X == triangle.v3.X && triangle.v1.Y == triangle.v3.Y && triangle.v1.Z == triangle.v3.Z)
+                || (triangle.v2.X == triangle.v3.X && triangle.v2.Y == triangle.v3.Y && triangle.v2.Z == triangle.v3.Z)
+                )               
+            {               
+                return;
+            }
+
+            if (m_vertices.Count == 0)
+            {
+                _centroidDiv = 0;
+                _centroid = Vector3.Zero;
+            }
+
             if (!m_vertices.ContainsKey(triangle.v1))
+            {
                 m_vertices[triangle.v1] = m_vertices.Count;
+                _centroid.X += triangle.v1.X;
+                _centroid.Y += triangle.v1.Y;
+                _centroid.Z += triangle.v1.Z;
+                _centroidDiv++;
+            }
             if (!m_vertices.ContainsKey(triangle.v2))
+            {
                 m_vertices[triangle.v2] = m_vertices.Count;
+                _centroid.X += triangle.v2.X;
+                _centroid.Y += triangle.v2.Y;
+                _centroid.Z += triangle.v2.Z;
+                _centroidDiv++;
+            }
             if (!m_vertices.ContainsKey(triangle.v3))
+            {
                 m_vertices[triangle.v3] = m_vertices.Count;
+                _centroid.X += triangle.v3.X;
+                _centroid.Y += triangle.v3.Y;
+                _centroid.Z += triangle.v3.Z;
+                _centroidDiv++;
+            }
             m_triangles.Add(triangle);
         }
 
+        public Vector3 GetCentroid()
+        {
+            if (_centroidDiv > 0)
+                return new Vector3(_centroid.X / _centroidDiv, _centroid.Y / _centroidDiv, _centroid.Z / _centroidDiv);
+            else
+                return Vector3.Zero;
+        }
+
+        // not functional
+        public Vector3 GetOBB()
+        {
+            return new Vector3(0.5f, 0.5f, 0.5f);
+        }
+
         public void CalcNormals()
         {
             int iTriangles = m_triangles.Count;
@@ -185,6 +259,7 @@ namespace OpenSim.Region.Physics.Meshing
         public void getVertexListAsPtrToFloatArray(out IntPtr vertices, out int vertexStride, out int vertexCount)
         {
             // A vertex is 3 floats
+            
             vertexStride = 3 * sizeof(float);
 
             // If there isn't an unmanaged array allocated yet, do it now
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 8145d61..d181b78 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -705,6 +705,11 @@ namespace OpenSim.Region.Physics.Meshing
             return CreateMesh(primName, primShape, size, lod, false, true);
         }
 
+        public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool shouldCache, bool convex, bool forOde)
+        {
+            return CreateMesh(primName, primShape, size, lod, false);
+        }
+
         public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical)
         {
             return CreateMesh(primName, primShape, size, lod, isPhysical, true);
@@ -757,5 +762,13 @@ namespace OpenSim.Region.Physics.Meshing
 
             return mesh;
         }
+        public IMesh GetMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex)
+        {
+            return null;
+        }
+
+        public void ReleaseMesh(IMesh imesh) { }
+        public void ExpireReleaseMeshs() { }
+        public void ExpireFileCache() { }
     }
 }
diff --git a/OpenSim/Region/Physics/Meshing/SculptMap.cs b/OpenSim/Region/Physics/Meshing/SculptMap.cs
index 740424e..b3d9cb6 100644
--- a/OpenSim/Region/Physics/Meshing/SculptMap.cs
+++ b/OpenSim/Region/Physics/Meshing/SculptMap.cs
@@ -58,28 +58,24 @@ namespace PrimMesher
             if (bmW == 0 || bmH == 0)
                 throw new Exception("SculptMap: bitmap has no data");
 
-            int numLodPixels = lod * 2 * lod * 2;  // (32 * 2)^2  = 64^2 pixels for default sculpt map image
+            int numLodPixels = lod * lod;  // (32 * 2)^2  = 64^2 pixels for default sculpt map image
 
+            bool smallMap = bmW * bmH <= numLodPixels;
             bool needsScaling = false;
 
-            bool smallMap = bmW * bmH <= lod * lod;
-
             width = bmW;
             height = bmH;
-            while (width * height > numLodPixels)
+            while (width * height > numLodPixels * 4)
             {
                 width >>= 1;
                 height >>= 1;
                 needsScaling = true;
             }
 
-
-
             try
             {
                 if (needsScaling)
-                    bm = ScaleImage(bm, width, height,
-                        System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor);
+                    bm = ScaleImage(bm, width, height);
             }
 
             catch (Exception e)
@@ -87,7 +83,7 @@ namespace PrimMesher
                 throw new Exception("Exception in ScaleImage(): e: " + e.ToString());
             }
 
-            if (width * height > lod * lod)
+            if (width * height > numLodPixels)
             {
                 width >>= 1;
                 height >>= 1;
@@ -144,15 +140,17 @@ namespace PrimMesher
             int rowNdx, colNdx;
             int smNdx = 0;
 
+
             for (rowNdx = 0; rowNdx < numRows; rowNdx++)
             {
                 List<Coord> row = new List<Coord>(numCols);
                 for (colNdx = 0; colNdx < numCols; colNdx++)
                 {
+
                     if (mirror)
-                        row.Add(new Coord(-(redBytes[smNdx] * pixScale - 0.5f), (greenBytes[smNdx] * pixScale - 0.5f), blueBytes[smNdx] * pixScale - 0.5f));
+                        row.Add(new Coord(-((float)redBytes[smNdx] * pixScale - 0.5f), ((float)greenBytes[smNdx] * pixScale - 0.5f), (float)blueBytes[smNdx] * pixScale - 0.5f));
                     else
-                        row.Add(new Coord(redBytes[smNdx] * pixScale - 0.5f, greenBytes[smNdx] * pixScale - 0.5f, blueBytes[smNdx] * pixScale - 0.5f));
+                        row.Add(new Coord((float)redBytes[smNdx] * pixScale - 0.5f, (float)greenBytes[smNdx] * pixScale - 0.5f, (float)blueBytes[smNdx] * pixScale - 0.5f));
 
                     ++smNdx;
                 }
@@ -161,23 +159,39 @@ namespace PrimMesher
             return rows;
         }
 
-        private Bitmap ScaleImage(Bitmap srcImage, int destWidth, int destHeight,
-                System.Drawing.Drawing2D.InterpolationMode interpMode)
+        private Bitmap ScaleImage(Bitmap srcImage, int destWidth, int destHeight)
         {
-            Bitmap scaledImage = new Bitmap(srcImage, destWidth, destHeight);
-            scaledImage.SetResolution(96.0f, 96.0f);
-
-            Graphics grPhoto = Graphics.FromImage(scaledImage);
-            grPhoto.InterpolationMode = interpMode;
 
-            grPhoto.DrawImage(srcImage,
-                new Rectangle(0, 0, destWidth, destHeight),
-                new Rectangle(0, 0, srcImage.Width, srcImage.Height),
-                GraphicsUnit.Pixel);
+            Bitmap scaledImage = new Bitmap(destWidth, destHeight, PixelFormat.Format24bppRgb);
+            
+            Color c;
+            float xscale = srcImage.Width / destWidth;
+            float yscale = srcImage.Height / destHeight;
+            
+            float sy = 0.5f;
+            for (int y = 0; y < destHeight; y++)
+            {
+                float sx = 0.5f;
+                for (int x = 0; x < destWidth; x++)
+                {
+                    try
+                    {
+                        c = srcImage.GetPixel((int)(sx), (int)(sy));
+                        scaledImage.SetPixel(x, y, Color.FromArgb(c.R, c.G, c.B));
+                    }
+                    catch (IndexOutOfRangeException)
+                    {
+                    }
 
-            grPhoto.Dispose();
+                    sx += xscale;
+                }
+                sy += yscale;
+            }
+            srcImage.Dispose();
             return scaledImage;
         }
+
+    }        
+    
     }
-}
 #endif
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 0d66496..d09aa62 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -352,10 +352,11 @@ namespace OpenSim.Region.Physics.OdePlugin
             if (m_assetFailed)
             {
                 d.GeomSetCategoryBits(prim_geom, 0);
-                d.GeomSetCollideBits(prim_geom, BadMeshAssetCollideBits);
+                d.GeomSetCollideBits(prim_geom, BadAssetColideBits());
             }
             else
             {
+
                 d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
                 d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
             }
@@ -425,7 +426,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 if (m_assetFailed)
                 {
                     d.GeomSetCategoryBits(prim_geom, 0);
-                    d.GeomSetCollideBits(prim_geom, BadMeshAssetCollideBits);
+                    d.GeomSetCollideBits(prim_geom, BadAssetColideBits());
                 }
                 else
                 {
@@ -858,6 +859,11 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         private static Dictionary<IMesh, IntPtr> m_MeshToTriMeshMap = new Dictionary<IMesh, IntPtr>();
 
+        public int BadAssetColideBits()
+        {
+            return (m_isphysical ? (int)CollisionCategories.Land : 0);
+        }
+
         private void setMesh(OdeScene parent_scene, IMesh mesh)
         {
 //            m_log.DebugFormat("[ODE PRIM]: Setting mesh on {0} to {1}", Name, mesh);
@@ -1139,7 +1145,7 @@ Console.WriteLine("ZProcessTaints for " + Name);
                     if (prm.m_assetFailed)
                     {
                         d.GeomSetCategoryBits(prm.prim_geom, 0);
-                        d.GeomSetCollideBits(prm.prim_geom, prm.BadMeshAssetCollideBits);
+                        d.GeomSetCollideBits(prm.prim_geom, prm.BadAssetColideBits());
                     }
                     else
                     {
@@ -1193,7 +1199,7 @@ Console.WriteLine("ZProcessTaints for " + Name);
                 if (m_assetFailed)
                 {
                     d.GeomSetCategoryBits(prim_geom, 0);
-                    d.GeomSetCollideBits(prim_geom, BadMeshAssetCollideBits);
+                    d.GeomSetCollideBits(prim_geom, BadAssetColideBits());
                 }
                 else
                 {
@@ -1395,7 +1401,7 @@ Console.WriteLine("ZProcessTaints for " + Name);
                 if (m_assetFailed)
                 {
                     d.GeomSetCategoryBits(prim_geom, 0);
-                    d.GeomSetCollideBits(prim_geom, BadMeshAssetCollideBits);
+                    d.GeomSetCollideBits(prim_geom, BadAssetColideBits());
                 }
                 else
                 {
@@ -2139,7 +2145,7 @@ Console.WriteLine(" JointCreateFixed");
             }
 
             if (m_assetFailed)
-                d.GeomSetCollideBits(prim_geom, BadMeshAssetCollideBits);
+                d.GeomSetCollideBits(prim_geom, BadAssetColideBits());
             else
 
                 d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
@@ -2950,7 +2956,7 @@ Console.WriteLine(" JointCreateFixed");
         }
         public override bool PIDActive { set { m_usePID = value; } }
         public override float PIDTau { set { m_PIDTau = value; } }
-
+        
         public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } }
         public override bool PIDHoverActive { set { m_useHoverPID = value; } }
         public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } }
@@ -3377,4 +3383,4 @@ Console.WriteLine(" JointCreateFixed");
             }
         }          
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
index e4fd7eb..2ea8bfc 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
@@ -297,7 +297,7 @@ namespace OpenSim.Region.Physics.POSPlugin
         {
             set { return; }
         }
-        
+
         public override Quaternion APIDTarget
         {
             set { return; }
diff --git a/OpenSim/Region/Physics/UbitMeshing/HelperTypes.cs b/OpenSim/Region/Physics/UbitMeshing/HelperTypes.cs
new file mode 100644
index 0000000..2938257
--- /dev/null
+++ b/OpenSim/Region/Physics/UbitMeshing/HelperTypes.cs
@@ -0,0 +1,340 @@
+/*
+ * 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.Diagnostics;
+using System.Globalization;
+using OpenMetaverse;
+using OpenSim.Region.Physics.Manager;
+using OpenSim.Region.Physics.Meshing;
+
+public class Vertex : IComparable<Vertex>
+{
+    Vector3 vector;
+
+    public float X
+    {
+        get { return vector.X; }
+        set { vector.X = value; }
+    }
+
+    public float Y
+    {
+        get { return vector.Y; }
+        set { vector.Y = value; }
+    }
+
+    public float Z
+    {
+        get { return vector.Z; }
+        set { vector.Z = value; }
+    }
+
+    public Vertex(float x, float y, float z)
+    {
+        vector.X = x;
+        vector.Y = y;
+        vector.Z = z;
+    }
+
+    public Vertex normalize()
+    {
+        float tlength = vector.Length();
+        if (tlength != 0f)
+        {
+            float mul = 1.0f / tlength;
+            return new Vertex(vector.X * mul, vector.Y * mul, vector.Z * mul);
+        }
+        else
+        {
+            return new Vertex(0f, 0f, 0f);
+        }
+    }
+
+    public Vertex cross(Vertex v)
+    {
+        return new Vertex(vector.Y * v.Z - vector.Z * v.Y, vector.Z * v.X - vector.X * v.Z, vector.X * v.Y - vector.Y * v.X);
+    }
+
+    // disable warning: mono compiler moans about overloading
+    // operators hiding base operator but should not according to C#
+    // language spec
+#pragma warning disable 0108
+    public static Vertex operator *(Vertex v, Quaternion q)
+    {
+        // From http://www.euclideanspace.com/maths/algebra/realNormedAlgebra/quaternions/transforms/
+
+        Vertex v2 = new Vertex(0f, 0f, 0f);
+
+        v2.X =   q.W * q.W * v.X +
+            2f * q.Y * q.W * v.Z -
+            2f * q.Z * q.W * v.Y +
+                 q.X * q.X * v.X +
+            2f * q.Y * q.X * v.Y +
+            2f * q.Z * q.X * v.Z -
+                 q.Z * q.Z * v.X -
+                 q.Y * q.Y * v.X;
+
+        v2.Y =
+            2f * q.X * q.Y * v.X +
+                 q.Y * q.Y * v.Y +
+            2f * q.Z * q.Y * v.Z +
+            2f * q.W * q.Z * v.X -
+                 q.Z * q.Z * v.Y +
+                 q.W * q.W * v.Y -
+            2f * q.X * q.W * v.Z -
+                 q.X * q.X * v.Y;
+
+        v2.Z =
+            2f * q.X * q.Z * v.X +
+            2f * q.Y * q.Z * v.Y +
+                 q.Z * q.Z * v.Z -
+            2f * q.W * q.Y * v.X -
+                 q.Y * q.Y * v.Z +
+            2f * q.W * q.X * v.Y -
+                 q.X * q.X * v.Z +
+                 q.W * q.W * v.Z;
+
+        return v2;
+    }
+
+    public static Vertex operator +(Vertex v1, Vertex v2)
+    {
+        return new Vertex(v1.X + v2.X, v1.Y + v2.Y, v1.Z + v2.Z);
+    }
+
+    public static Vertex operator -(Vertex v1, Vertex v2)
+    {
+        return new Vertex(v1.X - v2.X, v1.Y - v2.Y, v1.Z - v2.Z);
+    }
+
+    public static Vertex operator *(Vertex v1, Vertex v2)
+    {
+        return new Vertex(v1.X * v2.X, v1.Y * v2.Y, v1.Z * v2.Z);
+    }
+
+    public static Vertex operator +(Vertex v1, float am)
+    {
+        v1.X += am;
+        v1.Y += am;
+        v1.Z += am;
+        return v1;
+    }
+
+    public static Vertex operator -(Vertex v1, float am)
+    {
+        v1.X -= am;
+        v1.Y -= am;
+        v1.Z -= am;
+        return v1;
+    }
+
+    public static Vertex operator *(Vertex v1, float am)
+    {
+        v1.X *= am;
+        v1.Y *= am;
+        v1.Z *= am;
+        return v1;
+    }
+
+    public static Vertex operator /(Vertex v1, float am)
+    {
+        if (am == 0f)
+        {
+            return new Vertex(0f,0f,0f);
+        }
+        float mul = 1.0f / am;
+        v1.X *= mul;
+        v1.Y *= mul;
+        v1.Z *= mul;
+        return v1;
+    }
+#pragma warning restore 0108
+
+
+    public float dot(Vertex v)
+    {
+        return X * v.X + Y * v.Y + Z * v.Z;
+    }
+
+    public Vertex(Vector3 v)
+    {
+        vector = v;
+    }
+
+    public Vertex Clone()
+    {
+        return new Vertex(X, Y, Z);
+    }
+
+    public static Vertex FromAngle(double angle)
+    {
+        return new Vertex((float) Math.Cos(angle), (float) Math.Sin(angle), 0.0f);
+    }
+
+    public float Length()
+    {
+        return vector.Length();
+    }
+
+    public virtual bool Equals(Vertex v, float tolerance)
+    {
+        Vertex diff = this - v;
+        float d = diff.Length();
+        if (d < tolerance)
+            return true;
+
+        return false;
+    }
+
+
+    public int CompareTo(Vertex other)
+    {
+        if (X < other.X)
+            return -1;
+
+        if (X > other.X)
+            return 1;
+
+        if (Y < other.Y)
+            return -1;
+
+        if (Y > other.Y)
+            return 1;
+
+        if (Z < other.Z)
+            return -1;
+
+        if (Z > other.Z)
+            return 1;
+
+        return 0;
+    }
+
+    public static bool operator >(Vertex me, Vertex other)
+    {
+        return me.CompareTo(other) > 0;
+    }
+
+    public static bool operator <(Vertex me, Vertex other)
+    {
+        return me.CompareTo(other) < 0;
+    }
+
+    public String ToRaw()
+    {
+        // Why this stuff with the number formatter?
+        // Well, the raw format uses the english/US notation of numbers
+        // where the "," separates groups of 1000 while the "." marks the border between 1 and 10E-1.
+        // The german notation uses these characters exactly vice versa!
+        // The Float.ToString() routine is a localized one, giving different results depending on the country
+        // settings your machine works with. Unusable for a machine readable file format :-(
+        NumberFormatInfo nfi = new NumberFormatInfo();
+        nfi.NumberDecimalSeparator = ".";
+        nfi.NumberDecimalDigits = 3;
+
+        String s1 = X.ToString("N2", nfi) + " " + Y.ToString("N2", nfi) + " " + Z.ToString("N2", nfi);
+
+        return s1;
+    }
+}
+
+public class Triangle
+{
+    public Vertex v1;
+    public Vertex v2;
+    public Vertex v3;
+
+    public Triangle(Vertex _v1, Vertex _v2, Vertex _v3)
+    {
+        v1 = _v1;
+        v2 = _v2;
+        v3 = _v3;
+    }
+
+    public Triangle(float _v1x,float _v1y,float _v1z,
+                    float _v2x,float _v2y,float _v2z,
+                    float _v3x,float _v3y,float _v3z)
+    {
+        v1 = new Vertex(_v1x, _v1y, _v1z);
+        v2 = new Vertex(_v2x, _v2y, _v2z);
+        v3 = new Vertex(_v3x, _v3y, _v3z);
+    }
+
+    public override String ToString()
+    {
+        NumberFormatInfo nfi = new NumberFormatInfo();
+        nfi.CurrencyDecimalDigits = 2;
+        nfi.CurrencyDecimalSeparator = ".";
+
+        String s1 = "<" + v1.X.ToString(nfi) + "," + v1.Y.ToString(nfi) + "," + v1.Z.ToString(nfi) + ">";
+        String s2 = "<" + v2.X.ToString(nfi) + "," + v2.Y.ToString(nfi) + "," + v2.Z.ToString(nfi) + ">";
+        String s3 = "<" + v3.X.ToString(nfi) + "," + v3.Y.ToString(nfi) + "," + v3.Z.ToString(nfi) + ">";
+
+        return s1 + ";" + s2 + ";" + s3;
+    }
+
+    public Vector3 getNormal()
+    {
+        // Vertices
+
+        // Vectors for edges
+        Vector3 e1;
+        Vector3 e2;
+
+        e1 = new Vector3(v1.X - v2.X, v1.Y - v2.Y, v1.Z - v2.Z);
+        e2 = new Vector3(v1.X - v3.X, v1.Y - v3.Y, v1.Z - v3.Z);
+
+        // Cross product for normal
+        Vector3 n = Vector3.Cross(e1, e2);
+
+        // Length
+        float l = n.Length();
+
+        // Normalized "normal"
+        n = n/l;
+
+        return n;
+    }
+
+    public void invertNormal()
+    {
+        Vertex vt;
+        vt = v1;
+        v1 = v2;
+        v2 = vt;
+    }
+
+    // Dumps a triangle in the "raw faces" format, blender can import. This is for visualisation and
+    // debugging purposes
+    public String ToStringRaw()
+    {
+        String output = v1.ToRaw() + " " + v2.ToRaw() + " " + v3.ToRaw();
+        return output;
+    }
+}
diff --git a/OpenSim/Region/Physics/UbitMeshing/Mesh.cs b/OpenSim/Region/Physics/UbitMeshing/Mesh.cs
new file mode 100644
index 0000000..fa06926
--- /dev/null
+++ b/OpenSim/Region/Physics/UbitMeshing/Mesh.cs
@@ -0,0 +1,614 @@
+/*
+ * 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.IO;
+using System.Runtime.InteropServices;
+using OpenSim.Region.Physics.Manager;
+using PrimMesher;
+using OpenMetaverse;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
+
+namespace OpenSim.Region.Physics.Meshing
+{
+    public class MeshBuildingData
+    {
+        public Dictionary<Vertex, int> m_vertices;
+        public List<Triangle> m_triangles;
+        public float m_obbXmin;
+        public float m_obbXmax;
+        public float m_obbYmin;
+        public float m_obbYmax;
+        public float m_obbZmin;
+        public float m_obbZmax;
+        public Vector3 m_centroid;
+        public int m_centroidDiv;
+    }
+
+    [Serializable()]
+    public class Mesh : IMesh
+    {
+        float[] vertices;
+        int[] indexes;
+        Vector3 m_obb;
+        Vector3 m_obboffset;
+        [NonSerialized()]
+        MeshBuildingData m_bdata;
+        [NonSerialized()]
+        GCHandle vhandler;
+        [NonSerialized()]
+        GCHandle ihandler;
+        [NonSerialized()]
+        IntPtr m_verticesPtr = IntPtr.Zero;
+        [NonSerialized()]
+        IntPtr m_indicesPtr = IntPtr.Zero;
+        [NonSerialized()]
+        int m_vertexCount = 0;
+        [NonSerialized()]
+        int m_indexCount = 0;
+
+        public int RefCount { get; set; }
+        public AMeshKey Key { get; set; }
+
+        private class vertexcomp : IEqualityComparer<Vertex>
+        {
+            public bool Equals(Vertex v1, Vertex v2)
+            {
+                if (v1.X == v2.X && v1.Y == v2.Y && v1.Z == v2.Z)
+                    return true;
+                else
+                    return false;
+            }
+            public int GetHashCode(Vertex v)
+            {
+                int a = v.X.GetHashCode();
+                int b = v.Y.GetHashCode();
+                int c = v.Z.GetHashCode();
+                return (a << 16) ^ (b << 8) ^ c;
+            }
+        }
+
+        public Mesh()
+        {
+            vertexcomp vcomp = new vertexcomp();
+
+            m_bdata = new MeshBuildingData();
+            m_bdata.m_vertices = new Dictionary<Vertex, int>(vcomp);
+            m_bdata.m_triangles = new List<Triangle>();
+            m_bdata.m_centroid = Vector3.Zero;
+            m_bdata.m_centroidDiv = 0;
+            m_bdata.m_obbXmin = float.MaxValue;
+            m_bdata.m_obbXmax = float.MinValue;
+            m_bdata.m_obbYmin = float.MaxValue;
+            m_bdata.m_obbYmax = float.MinValue;
+            m_bdata.m_obbZmin = float.MaxValue;
+            m_bdata.m_obbZmax = float.MinValue;
+            m_obb = new Vector3(0.5f, 0.5f, 0.5f);
+            m_obboffset = Vector3.Zero;
+        }
+
+
+        public Mesh Scale(Vector3 scale)
+        {
+            if (m_verticesPtr == null || m_indicesPtr == null)
+                return null;
+
+            Mesh result = new Mesh();
+
+            float x = scale.X;
+            float y = scale.Y;
+            float z = scale.Z;
+
+            result.m_obb.X = m_obb.X * x;
+            result.m_obb.Y = m_obb.Y * y;
+            result.m_obb.Z = m_obb.Z * z;
+            result.m_obboffset.X = m_obboffset.X * x;
+            result.m_obboffset.Y = m_obboffset.Y * y;
+            result.m_obboffset.Z = m_obboffset.Z * z;
+
+            result.vertices = new float[vertices.Length];
+            int j = 0;
+            for (int i = 0; i < m_vertexCount; i++)
+            {
+                result.vertices[j] = vertices[j] * x;
+                j++;
+                result.vertices[j] = vertices[j] * y;
+                j++;
+                result.vertices[j] = vertices[j] * z;
+                j++;
+            }
+
+            result.indexes = new int[indexes.Length];
+            indexes.CopyTo(result.indexes,0);
+
+            result.pinMemory();
+
+            return result;
+        }
+
+        public Mesh Clone()
+        {
+            Mesh result = new Mesh();
+
+            if (m_bdata != null)
+            {
+                result.m_bdata = new MeshBuildingData();
+                foreach (Triangle t in m_bdata.m_triangles)
+                {
+                    result.Add(new Triangle(t.v1.Clone(), t.v2.Clone(), t.v3.Clone()));
+                }
+                result.m_bdata.m_centroid = m_bdata.m_centroid;
+                result.m_bdata.m_centroidDiv = m_bdata.m_centroidDiv;
+                result.m_bdata.m_obbXmin = m_bdata.m_obbXmin;
+                result.m_bdata.m_obbXmax = m_bdata.m_obbXmax;
+                result.m_bdata.m_obbYmin = m_bdata.m_obbYmin;
+                result.m_bdata.m_obbYmax = m_bdata.m_obbYmax;
+                result.m_bdata.m_obbZmin = m_bdata.m_obbZmin;
+                result.m_bdata.m_obbZmax = m_bdata.m_obbZmax;
+            }
+            result.m_obb = m_obb;
+            result.m_obboffset = m_obboffset;
+            return result;
+        }
+
+        public void addVertexLStats(Vertex v)
+        {
+            float x = v.X;
+            float y = v.Y;
+            float z = v.Z;
+
+            m_bdata.m_centroid.X += x;
+            m_bdata.m_centroid.Y += y;
+            m_bdata.m_centroid.Z += z;
+            m_bdata.m_centroidDiv++;
+
+            if (x > m_bdata.m_obbXmax)
+                m_bdata.m_obbXmax = x;
+            else if (x < m_bdata.m_obbXmin)
+                m_bdata.m_obbXmin = x;
+
+            if (y > m_bdata.m_obbYmax)
+                m_bdata.m_obbYmax = y;
+            else if (y < m_bdata.m_obbYmin)
+                m_bdata.m_obbYmin = y;
+
+            if (z > m_bdata.m_obbZmax)
+                m_bdata.m_obbZmax = z;
+            else if (z < m_bdata.m_obbZmin)
+                m_bdata.m_obbZmin = z;
+
+        }
+
+        private float fRound(float f)
+        {
+            int i;
+            if (f == 0f)
+                return f;
+            else if (f > 0f)
+                i = (int)(1e5f * f + 0.5f);
+            else
+                i = (int)(1e5f * f - 0.5f);
+
+            return ((float)i * 1e-5f);
+        }
+
+        public void Add(Triangle triangle)
+        {
+            if (m_indicesPtr != IntPtr.Zero || m_verticesPtr != IntPtr.Zero)
+                throw new NotSupportedException("Attempt to Add to a pinned Mesh");
+
+            // round down
+            triangle.v1.X = fRound(triangle.v1.X);
+            triangle.v1.Y = fRound(triangle.v1.Y);
+            triangle.v1.Z = fRound(triangle.v1.Z);
+            triangle.v2.X = fRound(triangle.v2.X);
+            triangle.v2.Y = fRound(triangle.v2.Y);
+            triangle.v2.Z = fRound(triangle.v2.Z);
+            triangle.v3.X = fRound(triangle.v3.X);
+            triangle.v3.Y = fRound(triangle.v3.Y);
+            triangle.v3.Z = fRound(triangle.v3.Z);
+
+            if ((triangle.v1.X == triangle.v2.X && triangle.v1.Y == triangle.v2.Y && triangle.v1.Z == triangle.v2.Z)
+                || (triangle.v1.X == triangle.v3.X && triangle.v1.Y == triangle.v3.Y && triangle.v1.Z == triangle.v3.Z)
+                || (triangle.v2.X == triangle.v3.X && triangle.v2.Y == triangle.v3.Y && triangle.v2.Z == triangle.v3.Z)
+                )               
+            {               
+                return;
+            }
+
+            if (m_bdata.m_vertices.Count == 0)
+            {
+                m_bdata.m_centroidDiv = 0;
+                m_bdata.m_centroid = Vector3.Zero;
+            }
+
+            if (!m_bdata.m_vertices.ContainsKey(triangle.v1))
+            {
+                m_bdata.m_vertices[triangle.v1] = m_bdata.m_vertices.Count;
+                addVertexLStats(triangle.v1);
+            }
+            if (!m_bdata.m_vertices.ContainsKey(triangle.v2))
+            {
+                m_bdata.m_vertices[triangle.v2] = m_bdata.m_vertices.Count;
+                addVertexLStats(triangle.v2);
+            }
+            if (!m_bdata.m_vertices.ContainsKey(triangle.v3))
+            {
+                m_bdata.m_vertices[triangle.v3] = m_bdata.m_vertices.Count;
+                addVertexLStats(triangle.v3);
+            }
+            m_bdata.m_triangles.Add(triangle);
+        }
+
+        public Vector3 GetCentroid()
+        {
+            return m_obboffset;
+
+        }
+
+        public Vector3 GetOBB()
+        {
+            return m_obb;
+            float x, y, z;
+            if (m_bdata.m_centroidDiv > 0)
+            {
+                x = (m_bdata.m_obbXmax - m_bdata.m_obbXmin) * 0.5f;
+                y = (m_bdata.m_obbYmax - m_bdata.m_obbYmin) * 0.5f;
+                z = (m_bdata.m_obbZmax - m_bdata.m_obbZmin) * 0.5f;
+            }
+            else // ??
+            {
+                x = 0.5f;
+                y = 0.5f;
+                z = 0.5f;
+            }
+            return new Vector3(x, y, z);
+        }
+
+        public List<Vector3> getVertexList()
+        {
+            List<Vector3> result = new List<Vector3>();
+            foreach (Vertex v in m_bdata.m_vertices.Keys)
+            {
+                result.Add(new Vector3(v.X, v.Y, v.Z));
+            }
+            return result;
+        }
+
+        public float[] getVertexListAsFloat()
+        {
+            if (m_bdata.m_vertices == null)
+                throw new NotSupportedException();
+            float[] result = new float[m_bdata.m_vertices.Count * 3];
+            foreach (KeyValuePair<Vertex, int> kvp in m_bdata.m_vertices)
+            {
+                Vertex v = kvp.Key;
+                int i = kvp.Value;
+                result[3 * i + 0] = v.X;
+                result[3 * i + 1] = v.Y;
+                result[3 * i + 2] = v.Z;
+            }
+            return result;
+        }
+
+        public float[] getVertexListAsFloatLocked()
+        {
+            return null;
+        }
+
+        public void getVertexListAsPtrToFloatArray(out IntPtr _vertices, out int vertexStride, out int vertexCount)
+        {
+            // A vertex is 3 floats
+            vertexStride = 3 * sizeof(float);
+
+            // If there isn't an unmanaged array allocated yet, do it now
+            if (m_verticesPtr == IntPtr.Zero && m_bdata != null)
+            {
+                vertices = getVertexListAsFloat();
+                // Each vertex is 3 elements (floats)
+                m_vertexCount = vertices.Length / 3;
+                vhandler = GCHandle.Alloc(vertices, GCHandleType.Pinned);
+                m_verticesPtr = vhandler.AddrOfPinnedObject();
+                GC.AddMemoryPressure(Buffer.ByteLength(vertices));
+            }
+            _vertices = m_verticesPtr;
+            vertexCount = m_vertexCount;
+        }
+
+        public int[] getIndexListAsInt()
+        {
+            if (m_bdata.m_triangles == null)
+                throw new NotSupportedException();
+            int[] result = new int[m_bdata.m_triangles.Count * 3];
+            for (int i = 0; i < m_bdata.m_triangles.Count; i++)
+            {
+                Triangle t = m_bdata.m_triangles[i];
+                result[3 * i + 0] = m_bdata.m_vertices[t.v1];
+                result[3 * i + 1] = m_bdata.m_vertices[t.v2];
+                result[3 * i + 2] = m_bdata.m_vertices[t.v3];
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// creates a list of index values that defines triangle faces. THIS METHOD FREES ALL NON-PINNED MESH DATA
+        /// </summary>
+        /// <returns></returns>
+        public int[] getIndexListAsIntLocked()
+        {
+            return null;
+        }
+
+        public void getIndexListAsPtrToIntArray(out IntPtr indices, out int triStride, out int indexCount)
+        {
+            // If there isn't an unmanaged array allocated yet, do it now
+            if (m_indicesPtr == IntPtr.Zero && m_bdata != null)
+            {
+                indexes = getIndexListAsInt();
+                m_indexCount = indexes.Length;
+                ihandler = GCHandle.Alloc(indexes, GCHandleType.Pinned);
+                m_indicesPtr = ihandler.AddrOfPinnedObject();
+                GC.AddMemoryPressure(Buffer.ByteLength(indexes));
+            }
+            // A triangle is 3 ints (indices)
+            triStride = 3 * sizeof(int);
+            indices = m_indicesPtr;
+            indexCount = m_indexCount;
+        }
+
+        public void releasePinned()
+        {
+            if (m_verticesPtr != IntPtr.Zero)
+            {
+                vhandler.Free();
+                vertices = null;
+                m_verticesPtr = IntPtr.Zero;
+            }
+            if (m_indicesPtr != IntPtr.Zero)
+            {
+                ihandler.Free();
+                indexes = null;
+                m_indicesPtr = IntPtr.Zero;
+            }
+        }
+
+        /// <summary>
+        /// frees up the source mesh data to minimize memory - call this method after calling get*Locked() functions
+        /// </summary>
+        public void releaseSourceMeshData()
+        {
+            if (m_bdata != null)
+            {
+                m_bdata.m_triangles = null;
+                m_bdata.m_vertices = null;
+            }
+        }
+
+        public void releaseBuildingMeshData()
+        {
+            if (m_bdata != null)
+            {
+                m_bdata.m_triangles = null;
+                m_bdata.m_vertices = null;
+                m_bdata = null;
+            }
+        }
+
+        public void Append(IMesh newMesh)
+        {
+            if (m_indicesPtr != IntPtr.Zero || m_verticesPtr != IntPtr.Zero)
+                throw new NotSupportedException("Attempt to Append to a pinned Mesh");
+        
+            if (!(newMesh is Mesh))
+                return;
+
+            foreach (Triangle t in ((Mesh)newMesh).m_bdata.m_triangles)
+                Add(t);
+        }
+
+        // Do a linear transformation of  mesh.
+        public void TransformLinear(float[,] matrix, float[] offset)
+        {
+            if (m_indicesPtr != IntPtr.Zero || m_verticesPtr != IntPtr.Zero)
+                throw new NotSupportedException("Attempt to TransformLinear a pinned Mesh");
+
+            foreach (Vertex v in m_bdata.m_vertices.Keys)
+            {
+                if (v == null)
+                    continue;
+                float x, y, z;
+                x = v.X*matrix[0, 0] + v.Y*matrix[1, 0] + v.Z*matrix[2, 0];
+                y = v.X*matrix[0, 1] + v.Y*matrix[1, 1] + v.Z*matrix[2, 1];
+                z = v.X*matrix[0, 2] + v.Y*matrix[1, 2] + v.Z*matrix[2, 2];
+                v.X = x + offset[0];
+                v.Y = y + offset[1];
+                v.Z = z + offset[2];
+            }
+        }
+
+        public void DumpRaw(String path, String name, String title)
+        {
+            if (path == null)
+                return;
+            if (m_bdata == null)
+                return;
+            String fileName = name + "_" + title + ".raw";
+            String completePath = System.IO.Path.Combine(path, fileName);
+            StreamWriter sw = new StreamWriter(completePath);
+            foreach (Triangle t in m_bdata.m_triangles)
+            {
+                String s = t.ToStringRaw();
+                sw.WriteLine(s);
+            }
+            sw.Close();
+        }
+
+        public void TrimExcess()
+        {
+            m_bdata.m_triangles.TrimExcess();
+        }
+
+        public void pinMemory()
+        {
+            m_vertexCount = vertices.Length / 3;
+            vhandler = GCHandle.Alloc(vertices, GCHandleType.Pinned);
+            m_verticesPtr = vhandler.AddrOfPinnedObject();
+            GC.AddMemoryPressure(Buffer.ByteLength(vertices));
+
+            m_indexCount = indexes.Length;
+            ihandler = GCHandle.Alloc(indexes, GCHandleType.Pinned);
+            m_indicesPtr = ihandler.AddrOfPinnedObject();
+            GC.AddMemoryPressure(Buffer.ByteLength(indexes));
+        }
+
+        public void PrepForOde()
+        {
+            // If there isn't an unmanaged array allocated yet, do it now
+            if (m_verticesPtr == IntPtr.Zero)
+                vertices = getVertexListAsFloat();
+
+            // If there isn't an unmanaged array allocated yet, do it now
+            if (m_indicesPtr == IntPtr.Zero)
+                indexes = getIndexListAsInt();
+
+            pinMemory();
+
+            float x, y, z;
+
+            if (m_bdata.m_centroidDiv > 0)
+            {
+                m_obboffset = new Vector3(m_bdata.m_centroid.X / m_bdata.m_centroidDiv, m_bdata.m_centroid.Y / m_bdata.m_centroidDiv, m_bdata.m_centroid.Z / m_bdata.m_centroidDiv);
+                x = (m_bdata.m_obbXmax - m_bdata.m_obbXmin) * 0.5f;
+                y = (m_bdata.m_obbYmax - m_bdata.m_obbYmin) * 0.5f;
+                z = (m_bdata.m_obbZmax - m_bdata.m_obbZmin) * 0.5f;
+            }
+
+            else
+            {
+                m_obboffset = Vector3.Zero;
+                x = 0.5f;
+                y = 0.5f;
+                z = 0.5f;
+            }
+            m_obb = new Vector3(x, y, z);
+
+            releaseBuildingMeshData();
+        }
+        public bool ToStream(Stream st)
+        {
+            if (m_indicesPtr == IntPtr.Zero || m_verticesPtr == IntPtr.Zero)
+                return false;
+
+            BinaryWriter bw = new BinaryWriter(st);
+            bool ok = true;
+
+            try
+            {
+
+                bw.Write(m_vertexCount);
+                bw.Write(m_indexCount);
+
+                for (int i = 0; i < 3 * m_vertexCount; i++)
+                    bw.Write(vertices[i]);
+                for (int i = 0; i < m_indexCount; i++)
+                    bw.Write(indexes[i]);
+                bw.Write(m_obb.X);
+                bw.Write(m_obb.Y);
+                bw.Write(m_obb.Z);
+                bw.Write(m_obboffset.X);
+                bw.Write(m_obboffset.Y);
+                bw.Write(m_obboffset.Z);
+            }
+            catch
+            {
+                ok = false;
+            }
+
+            if (bw != null)
+            {
+                bw.Flush();
+                bw.Close();
+            }
+
+            return ok;
+        }
+
+        public static Mesh FromStream(Stream st, AMeshKey key)
+        {
+            Mesh mesh = new Mesh();
+            mesh.releaseBuildingMeshData();
+
+            BinaryReader br = new BinaryReader(st);
+
+            bool ok = true;
+            try
+            {
+                mesh.m_vertexCount = br.ReadInt32();
+                mesh.m_indexCount = br.ReadInt32();
+
+                int n = 3 * mesh.m_vertexCount;
+                mesh.vertices = new float[n];
+                for (int i = 0; i < n; i++)
+                    mesh.vertices[i] = br.ReadSingle();
+
+                mesh.indexes = new int[mesh.m_indexCount];
+                for (int i = 0; i < mesh.m_indexCount; i++)
+                    mesh.indexes[i] = br.ReadInt32();
+
+                mesh.m_obb.X = br.ReadSingle();
+                mesh.m_obb.Y = br.ReadSingle();
+                mesh.m_obb.Z = br.ReadSingle();
+
+                mesh.m_obboffset.X = br.ReadSingle();
+                mesh.m_obboffset.Y = br.ReadSingle();
+                mesh.m_obboffset.Z = br.ReadSingle();
+            }
+            catch
+            {
+                ok = false;
+            }
+
+            br.Close();
+
+            if (ok)
+            {
+                mesh.pinMemory();
+
+                mesh.Key = key;
+                mesh.RefCount = 1;
+
+                return mesh;
+            }
+
+            mesh.vertices = null;
+            mesh.indexes = null;
+            return null;
+        }
+    }
+}
diff --git a/OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs b/OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs
new file mode 100644
index 0000000..00cbfbd
--- /dev/null
+++ b/OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs
@@ -0,0 +1,1410 @@
+/*
+ * 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.
+ */
+//#define SPAM
+
+using System;
+using System.Collections.Generic;
+using OpenSim.Framework;
+using OpenSim.Region.Physics.Manager;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO.Compression;
+using PrimMesher;
+using log4net;
+using Nini.Config;
+using System.Reflection;
+using System.IO;
+using ComponentAce.Compression.Libs.zlib;
+using OpenSim.Region.Physics.ConvexDecompositionDotNet;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
+
+namespace OpenSim.Region.Physics.Meshing
+{
+    public class MeshmerizerPlugin : IMeshingPlugin
+    {
+        public MeshmerizerPlugin()
+        {
+        }
+
+        public string GetName()
+        {
+            return "UbitMeshmerizer";
+        }
+
+        public IMesher GetMesher(IConfigSource config)
+        {
+            return new Meshmerizer(config);
+        }
+    }
+
+    public class Meshmerizer : IMesher
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        // Setting baseDir to a path will enable the dumping of raw files
+        // raw files can be imported by blender so a visual inspection of the results can be done
+
+        public object diskLock = new object();
+
+        public bool doMeshFileCache = true;
+
+        public string cachePath = "MeshCache";
+        public TimeSpan CacheExpire;
+        public bool doCacheExpire = true;
+
+//        const string baseDir = "rawFiles";
+        private const string baseDir = null; //"rawFiles";
+
+        private bool useMeshiesPhysicsMesh = false;
+
+        private float minSizeForComplexMesh = 0.2f; // prims with all dimensions smaller than this will have a bounding box mesh
+
+        private Dictionary<AMeshKey, Mesh> m_uniqueMeshes = new Dictionary<AMeshKey, Mesh>();
+        private Dictionary<AMeshKey, Mesh> m_uniqueReleasedMeshes = new Dictionary<AMeshKey, Mesh>();
+
+        public Meshmerizer(IConfigSource config)
+        {
+            IConfig start_config = config.Configs["Startup"];
+            IConfig mesh_config = config.Configs["Mesh"];
+
+
+            float fcache = 48.0f;
+//            float fcache = 0.02f;
+
+            if(mesh_config != null)
+            {
+                useMeshiesPhysicsMesh = mesh_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh);
+                if (useMeshiesPhysicsMesh)
+                {
+                    doMeshFileCache = mesh_config.GetBoolean("MeshFileCache", doMeshFileCache);
+                    cachePath = mesh_config.GetString("MeshFileCachePath", cachePath);
+                    fcache = mesh_config.GetFloat("MeshFileCacheExpireHours", fcache);
+                    doCacheExpire = mesh_config.GetBoolean("MeshFileCacheDoExpire", doCacheExpire);
+                }
+                else
+                {
+                    doMeshFileCache = false;
+                    doCacheExpire = false;
+                }
+            }
+
+            CacheExpire = TimeSpan.FromHours(fcache);
+
+        }
+
+        /// <summary>
+        /// creates a simple box mesh of the specified size. This mesh is of very low vertex count and may
+        /// be useful as a backup proxy when level of detail is not needed or when more complex meshes fail
+        /// for some reason
+        /// </summary>
+        /// <param name="minX"></param>
+        /// <param name="maxX"></param>
+        /// <param name="minY"></param>
+        /// <param name="maxY"></param>
+        /// <param name="minZ"></param>
+        /// <param name="maxZ"></param>
+        /// <returns></returns>
+        private static Mesh CreateSimpleBoxMesh(float minX, float maxX, float minY, float maxY, float minZ, float maxZ)
+        {
+            Mesh box = new Mesh();
+            List<Vertex> vertices = new List<Vertex>();
+            // bottom
+
+            vertices.Add(new Vertex(minX, maxY, minZ));
+            vertices.Add(new Vertex(maxX, maxY, minZ));
+            vertices.Add(new Vertex(maxX, minY, minZ));
+            vertices.Add(new Vertex(minX, minY, minZ));
+
+            box.Add(new Triangle(vertices[0], vertices[1], vertices[2]));
+            box.Add(new Triangle(vertices[0], vertices[2], vertices[3]));
+
+            // top
+
+            vertices.Add(new Vertex(maxX, maxY, maxZ));
+            vertices.Add(new Vertex(minX, maxY, maxZ));
+            vertices.Add(new Vertex(minX, minY, maxZ));
+            vertices.Add(new Vertex(maxX, minY, maxZ));
+
+            box.Add(new Triangle(vertices[4], vertices[5], vertices[6]));
+            box.Add(new Triangle(vertices[4], vertices[6], vertices[7]));
+
+            // sides
+
+            box.Add(new Triangle(vertices[5], vertices[0], vertices[3]));
+            box.Add(new Triangle(vertices[5], vertices[3], vertices[6]));
+
+            box.Add(new Triangle(vertices[1], vertices[0], vertices[5]));
+            box.Add(new Triangle(vertices[1], vertices[5], vertices[4]));
+
+            box.Add(new Triangle(vertices[7], vertices[1], vertices[4]));
+            box.Add(new Triangle(vertices[7], vertices[2], vertices[1]));
+
+            box.Add(new Triangle(vertices[3], vertices[2], vertices[7]));
+            box.Add(new Triangle(vertices[3], vertices[7], vertices[6]));
+
+            return box;
+        }
+
+        /// <summary>
+        /// Creates a simple bounding box mesh for a complex input mesh
+        /// </summary>
+        /// <param name="meshIn"></param>
+        /// <returns></returns>
+        private static Mesh CreateBoundingBoxMesh(Mesh meshIn)
+        {
+            float minX = float.MaxValue;
+            float maxX = float.MinValue;
+            float minY = float.MaxValue;
+            float maxY = float.MinValue;
+            float minZ = float.MaxValue;
+            float maxZ = float.MinValue;
+
+            foreach (Vector3 v in meshIn.getVertexList())
+            {
+                if (v.X < minX) minX = v.X;
+                if (v.Y < minY) minY = v.Y;
+                if (v.Z < minZ) minZ = v.Z;
+
+                if (v.X > maxX) maxX = v.X;
+                if (v.Y > maxY) maxY = v.Y;
+                if (v.Z > maxZ) maxZ = v.Z;
+            }
+
+            return CreateSimpleBoxMesh(minX, maxX, minY, maxY, minZ, maxZ);
+        }
+
+        private void ReportPrimError(string message, string primName, PrimMesh primMesh)
+        {
+            m_log.Error(message);
+            m_log.Error("\nPrim Name: " + primName);
+            m_log.Error("****** PrimMesh Parameters ******\n" + primMesh.ParamsToDisplayString());
+        }
+
+        /// <summary>
+        /// Add a submesh to an existing list of coords and faces.
+        /// </summary>
+        /// <param name="subMeshData"></param>
+        /// <param name="size">Size of entire object</param>
+        /// <param name="coords"></param>
+        /// <param name="faces"></param>
+        private void AddSubMesh(OSDMap subMeshData, List<Coord> coords, List<Face> faces)
+        {
+    //                                    Console.WriteLine("subMeshMap for {0} - {1}", primName, Util.GetFormattedXml((OSD)subMeshMap));
+    
+            // As per http://wiki.secondlife.com/wiki/Mesh/Mesh_Asset_Format, some Mesh Level
+            // of Detail Blocks (maps) contain just a NoGeometry key to signal there is no
+            // geometry for this submesh.
+            if (subMeshData.ContainsKey("NoGeometry") && ((OSDBoolean)subMeshData["NoGeometry"]))
+                return;
+
+            OpenMetaverse.Vector3 posMax;
+            OpenMetaverse.Vector3 posMin;
+            if (subMeshData.ContainsKey("PositionDomain"))
+            {
+                posMax = ((OSDMap)subMeshData["PositionDomain"])["Max"].AsVector3();
+                posMin = ((OSDMap)subMeshData["PositionDomain"])["Min"].AsVector3();
+            }
+            else
+            {
+                posMax = new Vector3(0.5f, 0.5f, 0.5f);
+                posMin = new Vector3(-0.5f, -0.5f, -0.5f);
+            }
+
+            ushort faceIndexOffset = (ushort)coords.Count;
+
+            byte[] posBytes = subMeshData["Position"].AsBinary();
+            for (int i = 0; i < posBytes.Length; i += 6)
+            {
+                ushort uX = Utils.BytesToUInt16(posBytes, i);
+                ushort uY = Utils.BytesToUInt16(posBytes, i + 2);
+                ushort uZ = Utils.BytesToUInt16(posBytes, i + 4);
+    
+                Coord c = new Coord(
+                Utils.UInt16ToFloat(uX, posMin.X, posMax.X),
+                Utils.UInt16ToFloat(uY, posMin.Y, posMax.Y),
+                Utils.UInt16ToFloat(uZ, posMin.Z, posMax.Z));
+    
+                coords.Add(c);
+            }
+    
+            byte[] triangleBytes = subMeshData["TriangleList"].AsBinary();
+            for (int i = 0; i < triangleBytes.Length; i += 6)
+            {
+                ushort v1 = (ushort)(Utils.BytesToUInt16(triangleBytes, i) + faceIndexOffset);
+                ushort v2 = (ushort)(Utils.BytesToUInt16(triangleBytes, i + 2) + faceIndexOffset);
+                ushort v3 = (ushort)(Utils.BytesToUInt16(triangleBytes, i + 4) + faceIndexOffset);
+                Face f = new Face(v1, v2, v3);
+                faces.Add(f);
+            }
+        }
+
+        /// <summary>
+        /// Create a physics mesh from data that comes with the prim.  The actual data used depends on the prim type.
+        /// </summary>
+        /// <param name="primName"></param>
+        /// <param name="primShape"></param>
+        /// <param name="size"></param>
+        /// <param name="lod"></param>
+        /// <returns></returns>
+        private Mesh CreateMeshFromPrimMesher(string primName, PrimitiveBaseShape primShape, float lod, bool convex)
+        {
+//            m_log.DebugFormat(
+//                "[MESH]: Creating physics proxy for {0}, shape {1}",
+//                primName, (OpenMetaverse.SculptType)primShape.SculptType);
+
+            List<Coord> coords;
+            List<Face> faces;
+
+            if (primShape.SculptEntry)
+            {
+                if (((OpenMetaverse.SculptType)primShape.SculptType) == SculptType.Mesh)
+                {
+                    if (!useMeshiesPhysicsMesh)
+                        return null;
+
+                    if (!GenerateCoordsAndFacesFromPrimMeshData(primName, primShape, out coords, out faces, convex))
+                        return null;
+                }
+                else
+                {
+                    if (!GenerateCoordsAndFacesFromPrimSculptData(primName, primShape, lod, out coords, out faces))
+                        return null;
+                }
+            }
+            else
+            {
+                if (!GenerateCoordsAndFacesFromPrimShapeData(primName, primShape, lod, out coords, out faces))
+                    return null;
+            }
+
+            primShape.SculptData = Utils.EmptyBytes;
+
+            int numCoords = coords.Count;
+            int numFaces = faces.Count;
+
+            Mesh mesh = new Mesh();
+            // Add the corresponding triangles to the mesh
+            for (int i = 0; i < numFaces; i++)
+            {
+                Face f = faces[i];
+                mesh.Add(new Triangle(coords[f.v1].X, coords[f.v1].Y, coords[f.v1].Z,
+                                        coords[f.v2].X, coords[f.v2].Y, coords[f.v2].Z,
+                                        coords[f.v3].X, coords[f.v3].Y, coords[f.v3].Z));
+            }
+
+            coords.Clear();
+            faces.Clear();
+
+            return mesh;
+        }
+
+        /// <summary>
+        /// Generate the co-ords and faces necessary to construct a mesh from the mesh data the accompanies a prim.
+        /// </summary>
+        /// <param name="primName"></param>
+        /// <param name="primShape"></param>
+        /// <param name="size"></param>
+        /// <param name="coords">Coords are added to this list by the method.</param>
+        /// <param name="faces">Faces are added to this list by the method.</param>
+        /// <returns>true if coords and faces were successfully generated, false if not</returns>
+        private bool GenerateCoordsAndFacesFromPrimMeshData(
+            string primName, PrimitiveBaseShape primShape, out List<Coord> coords, out List<Face> faces, bool convex)
+        {
+//            m_log.DebugFormat("[MESH]: experimental mesh proxy generation for {0}", primName);
+
+            bool usemesh = false;
+
+            coords = new List<Coord>();
+            faces = new List<Face>();
+            OSD meshOsd = null;
+
+            if (primShape.SculptData.Length <= 0)
+            {
+//                m_log.InfoFormat("[MESH]: asset data for {0} is zero length", primName);
+                return false;
+            }
+
+            long start = 0;
+            using (MemoryStream data = new MemoryStream(primShape.SculptData))
+            {
+                try
+                {
+                    OSD osd = OSDParser.DeserializeLLSDBinary(data);
+                    if (osd is OSDMap)
+                        meshOsd = (OSDMap)osd;
+                    else
+                    {
+                        m_log.Warn("[Mesh}: unable to cast mesh asset to OSDMap");
+                        return false;
+                    }
+                }
+                catch (Exception e)
+                {
+                    m_log.Error("[MESH]: Exception deserializing mesh asset header:" + e.ToString());
+                }
+
+                start = data.Position;
+            }
+
+            if (meshOsd is OSDMap)
+            {
+                OSDMap physicsParms = null;
+                OSDMap map = (OSDMap)meshOsd;
+
+                if (!convex)
+                {
+                    if (map.ContainsKey("physics_shape"))
+                        physicsParms = (OSDMap)map["physics_shape"]; // old asset format
+                    else if (map.ContainsKey("physics_mesh"))
+                        physicsParms = (OSDMap)map["physics_mesh"]; // new asset format
+
+                    if (physicsParms != null)
+                        usemesh = true;
+                }
+                
+                if(!usemesh && (map.ContainsKey("physics_convex")))
+                        physicsParms = (OSDMap)map["physics_convex"];
+              
+
+                if (physicsParms == null)
+                {
+                    m_log.Warn("[MESH]: unknown mesh type");
+                    return false;
+                }
+
+                int physOffset = physicsParms["offset"].AsInteger() + (int)start;
+                int physSize = physicsParms["size"].AsInteger();
+
+                if (physOffset < 0 || physSize == 0)
+                    return false; // no mesh data in asset
+
+                OSD decodedMeshOsd = new OSD();
+                byte[] meshBytes = new byte[physSize];
+                System.Buffer.BlockCopy(primShape.SculptData, physOffset, meshBytes, 0, physSize);
+
+                try
+                {
+                    using (MemoryStream inMs = new MemoryStream(meshBytes))
+                    {
+                        using (MemoryStream outMs = new MemoryStream())
+                        {
+                            using (ZOutputStream zOut = new ZOutputStream(outMs))
+                            {
+                                byte[] readBuffer = new byte[2048];
+                                int readLen = 0;
+                                while ((readLen = inMs.Read(readBuffer, 0, readBuffer.Length)) > 0)
+                                {
+                                    zOut.Write(readBuffer, 0, readLen);
+                                }
+                                zOut.Flush();
+                                outMs.Seek(0, SeekOrigin.Begin);
+
+                                byte[] decompressedBuf = outMs.GetBuffer();
+
+                                decodedMeshOsd = OSDParser.DeserializeLLSDBinary(decompressedBuf);
+                            }
+                        }
+                    }
+                }
+                catch (Exception e)
+                {
+                    m_log.Error("[MESH]: exception decoding physical mesh: " + e.ToString());
+                    return false;
+                }
+
+                if (usemesh)
+                {
+                    OSDArray decodedMeshOsdArray = null;
+
+                    // physics_shape is an array of OSDMaps, one for each submesh
+                    if (decodedMeshOsd is OSDArray)
+                    {
+//                      Console.WriteLine("decodedMeshOsd for {0} - {1}", primName, Util.GetFormattedXml(decodedMeshOsd));
+
+                        decodedMeshOsdArray = (OSDArray)decodedMeshOsd;
+                        foreach (OSD subMeshOsd in decodedMeshOsdArray)
+                        {
+                            if (subMeshOsd is OSDMap)
+                                AddSubMesh(subMeshOsd as OSDMap, coords, faces);
+                        }
+                    }
+                }
+                else
+                {
+                    OSDMap cmap = (OSDMap)decodedMeshOsd;
+                    if (cmap == null)
+                        return false;
+
+                    byte[] data;
+
+                    List<float3> vs = new List<float3>();
+                    PHullResult hullr = new PHullResult();
+                    float3 f3;
+                    Coord c;
+                    Face f;
+                    Vector3 range;
+                    Vector3 min;
+
+                    const float invMaxU16 = 1.0f / 65535f;
+                    int t1;
+                    int t2;
+                    int t3;
+                    int i;
+                    int nverts;
+                    int nindexs;
+
+                    if (cmap.ContainsKey("Max"))
+                        range = cmap["Max"].AsVector3();
+                    else
+                        range = new Vector3(0.5f, 0.5f, 0.5f);
+
+                    if (cmap.ContainsKey("Min"))
+                        min = cmap["Min"].AsVector3();
+                    else
+                        min = new Vector3(-0.5f, -0.5f, -0.5f);
+
+                    range = range - min;
+                    range *= invMaxU16;
+
+                    if (!convex && cmap.ContainsKey("HullList") && cmap.ContainsKey("Positions"))
+                    {
+                        List<int> hsizes = new List<int>();
+                        int totalpoints = 0;
+                        data = cmap["HullList"].AsBinary();
+                        for (i = 0; i < data.Length; i++)
+                        {
+                            t1 = data[i];
+                            if (t1 == 0)
+                                t1 = 256;
+                            totalpoints += t1;
+                            hsizes.Add(t1);
+                        }
+
+                        data = cmap["Positions"].AsBinary();
+                        int ptr = 0;
+                        int vertsoffset = 0;
+
+                        if (totalpoints == data.Length / 6) // 2 bytes per coord, 3 coords per point
+                        {
+                            foreach (int hullsize in hsizes)
+                            {
+                                for (i = 0; i < hullsize; i++ )
+                                {
+                                    t1 = data[ptr++];
+                                    t1 += data[ptr++] << 8;
+                                    t2 = data[ptr++];
+                                    t2 += data[ptr++] << 8;
+                                    t3 = data[ptr++];
+                                    t3 += data[ptr++] << 8;
+
+                                    f3 = new float3((t1 * range.X + min.X),
+                                              (t2 * range.Y + min.Y),
+                                              (t3 * range.Z + min.Z));
+                                    vs.Add(f3);
+                                }
+
+                                if(hullsize <3)
+                                {
+                                    vs.Clear();
+                                    continue;
+                                }
+
+                                if (hullsize <5)
+                                {
+                                    foreach (float3 point in vs)
+                                    {
+                                        c.X = point.x;
+                                        c.Y = point.y;
+                                        c.Z = point.z;
+                                        coords.Add(c);
+                                    }
+                                    f = new Face(vertsoffset, vertsoffset + 1, vertsoffset + 2);
+                                    faces.Add(f);
+
+                                    if (hullsize == 4)
+                                    {
+                                        // not sure about orientation..
+                                        f = new Face(vertsoffset, vertsoffset + 2, vertsoffset + 3);
+                                        faces.Add(f);
+                                        f = new Face(vertsoffset, vertsoffset + 3, vertsoffset + 1);
+                                        faces.Add(f);
+                                        f = new Face(vertsoffset + 3, vertsoffset + 2, vertsoffset + 1);
+                                        faces.Add(f);
+                                    }
+                                    vertsoffset += vs.Count;
+                                    vs.Clear(); 
+                                    continue;
+                                }
+
+                                if (!HullUtils.ComputeHull(vs, ref hullr, 0, 0.0f))
+                                {
+                                    vs.Clear();
+                                    continue;
+                                }
+
+                                nverts = hullr.Vertices.Count;
+                                nindexs = hullr.Indices.Count;
+
+                                if (nindexs % 3 != 0)
+                                {
+                                    vs.Clear();
+                                    continue;
+                                }
+
+                                for (i = 0; i < nverts; i++)
+                                {
+                                    c.X = hullr.Vertices[i].x;
+                                    c.Y = hullr.Vertices[i].y;
+                                    c.Z = hullr.Vertices[i].z;
+                                    coords.Add(c);
+                                }
+                               
+                                for (i = 0; i < nindexs; i += 3)
+                                {
+                                    t1 = hullr.Indices[i];
+                                    if (t1 > nverts)
+                                        break;
+                                    t2 = hullr.Indices[i + 1];
+                                    if (t2 > nverts)
+                                        break;
+                                    t3 = hullr.Indices[i + 2];
+                                    if (t3 > nverts)
+                                        break;
+                                    f = new Face(vertsoffset + t1, vertsoffset + t2, vertsoffset + t3);
+                                    faces.Add(f);
+                                }
+                                vertsoffset += nverts;
+                                vs.Clear();
+                            }
+                        }
+                        if (coords.Count > 0 && faces.Count > 0)
+                            return true;                      
+                    }
+
+                    vs.Clear();
+
+                    if (cmap.ContainsKey("BoundingVerts"))
+                    {
+                        data = cmap["BoundingVerts"].AsBinary();
+
+                        for (i = 0; i < data.Length; )
+                        {
+                            t1 = data[i++];
+                            t1 += data[i++] << 8;
+                            t2 = data[i++];
+                            t2 += data[i++] << 8;
+                            t3 = data[i++];
+                            t3 += data[i++] << 8;
+
+                            f3 = new float3((t1 * range.X + min.X),
+                                      (t2 * range.Y + min.Y),
+                                      (t3 * range.Z + min.Z));
+                            vs.Add(f3);
+                        }
+
+                        if (vs.Count < 3)
+                        {
+                            vs.Clear();
+                            return false;
+                        }
+
+                        if (vs.Count < 5)
+                        {
+                            foreach (float3 point in vs)
+                            {
+                                c.X = point.x;
+                                c.Y = point.y;
+                                c.Z = point.z;
+                                coords.Add(c);
+                            }
+                            f = new Face(0, 1, 2);
+                            faces.Add(f);
+
+                            if (vs.Count == 4)
+                            {
+                                f = new Face(0, 2, 3);
+                                faces.Add(f);
+                                f = new Face(0, 3, 1);
+                                faces.Add(f);
+                                f = new Face( 3, 2, 1);
+                                faces.Add(f);
+                            }
+                            vs.Clear();
+                            return true;
+                        }
+
+                        if (!HullUtils.ComputeHull(vs, ref hullr, 0, 0.0f))
+                            return false;
+
+                        nverts = hullr.Vertices.Count;
+                        nindexs = hullr.Indices.Count;
+
+                        if (nindexs % 3 != 0)
+                            return false;
+
+                        for (i = 0; i < nverts; i++)
+                        {
+                            c.X = hullr.Vertices[i].x;
+                            c.Y = hullr.Vertices[i].y;
+                            c.Z = hullr.Vertices[i].z;
+                            coords.Add(c);
+                        }
+                        for (i = 0; i < nindexs; i += 3)
+                        {
+                            t1 = hullr.Indices[i];
+                            if (t1 > nverts)
+                                break;
+                            t2 = hullr.Indices[i + 1];
+                            if (t2 > nverts)
+                                break;
+                            t3 = hullr.Indices[i + 2];
+                            if (t3 > nverts)
+                                break;
+                            f = new Face(t1, t2, t3);
+                            faces.Add(f);
+                        }
+
+                        if (coords.Count > 0 && faces.Count > 0)
+                            return true;
+                    }
+                    else
+                        return false;
+                }
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Generate the co-ords and faces necessary to construct a mesh from the sculpt data the accompanies a prim.
+        /// </summary>
+        /// <param name="primName"></param>
+        /// <param name="primShape"></param>
+        /// <param name="size"></param>
+        /// <param name="lod"></param>
+        /// <param name="coords">Coords are added to this list by the method.</param>
+        /// <param name="faces">Faces are added to this list by the method.</param>
+        /// <returns>true if coords and faces were successfully generated, false if not</returns>
+        private bool GenerateCoordsAndFacesFromPrimSculptData(
+            string primName, PrimitiveBaseShape primShape, float lod, out List<Coord> coords, out List<Face> faces)
+        {
+            coords = new List<Coord>();
+            faces = new List<Face>();
+            PrimMesher.SculptMesh sculptMesh;
+            Image idata = null;
+
+                if (primShape.SculptData == null || primShape.SculptData.Length == 0)
+                    return false;
+
+                try
+                {
+                    OpenMetaverse.Imaging.ManagedImage unusedData;
+                    OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(primShape.SculptData, out unusedData, out idata);
+
+                    unusedData = null;
+
+                    if (idata == null)
+                    {
+                        // In some cases it seems that the decode can return a null bitmap without throwing
+                        // an exception
+                        m_log.WarnFormat("[PHYSICS]: OpenJPEG decoded sculpt data for {0} to a null bitmap.  Ignoring.", primName);
+                        return false;
+                    }
+                }
+                catch (DllNotFoundException)
+                {
+                    m_log.Error("[PHYSICS]: OpenJpeg is not installed correctly on this system. Physics Proxy generation failed.  Often times this is because of an old version of GLIBC.  You must have version 2.4 or above!");
+                    return false;
+                }
+                catch (IndexOutOfRangeException)
+                {
+                    m_log.Error("[PHYSICS]: OpenJpeg was unable to decode this. Physics Proxy generation failed");
+                    return false;
+                }
+                catch (Exception ex)
+                {
+                    m_log.Error("[PHYSICS]: Unable to generate a Sculpty physics proxy. Sculpty texture decode failed: " + ex.Message);
+                    return false;
+                }
+
+            PrimMesher.SculptMesh.SculptType sculptType;
+            // remove mirror and invert bits
+            OpenMetaverse.SculptType pbsSculptType = ((OpenMetaverse.SculptType)(primShape.SculptType & 0x3f));
+            switch (pbsSculptType)
+            {
+                case OpenMetaverse.SculptType.Cylinder:
+                    sculptType = PrimMesher.SculptMesh.SculptType.cylinder;
+                    break;
+                case OpenMetaverse.SculptType.Plane:
+                    sculptType = PrimMesher.SculptMesh.SculptType.plane;
+                    break;
+                case OpenMetaverse.SculptType.Torus:
+                    sculptType = PrimMesher.SculptMesh.SculptType.torus;
+                    break;
+                case OpenMetaverse.SculptType.Sphere:
+                    sculptType = PrimMesher.SculptMesh.SculptType.sphere;
+                    break;
+                default:
+                    sculptType = PrimMesher.SculptMesh.SculptType.plane;
+                    break;
+            }
+
+            bool mirror = ((primShape.SculptType & 128) != 0);
+            bool invert = ((primShape.SculptType & 64) != 0);
+
+            sculptMesh = new PrimMesher.SculptMesh((Bitmap)idata, sculptType, (int)lod, mirror, invert);
+
+            idata.Dispose();
+
+//            sculptMesh.DumpRaw(baseDir, primName, "primMesh");
+
+            coords = sculptMesh.coords;
+            faces = sculptMesh.faces;
+
+            return true;
+        }
+
+        /// <summary>
+        /// Generate the co-ords and faces necessary to construct a mesh from the shape data the accompanies a prim.
+        /// </summary>
+        /// <param name="primName"></param>
+        /// <param name="primShape"></param>
+        /// <param name="size"></param>
+        /// <param name="coords">Coords are added to this list by the method.</param>
+        /// <param name="faces">Faces are added to this list by the method.</param>
+        /// <returns>true if coords and faces were successfully generated, false if not</returns>
+        private bool GenerateCoordsAndFacesFromPrimShapeData(
+            string primName, PrimitiveBaseShape primShape, float lod, out List<Coord> coords, out List<Face> faces)
+        {
+            PrimMesh primMesh;
+            coords = new List<Coord>();
+            faces = new List<Face>();            
+
+            float pathShearX = primShape.PathShearX < 128 ? (float)primShape.PathShearX * 0.01f : (float)(primShape.PathShearX - 256) * 0.01f;
+            float pathShearY = primShape.PathShearY < 128 ? (float)primShape.PathShearY * 0.01f : (float)(primShape.PathShearY - 256) * 0.01f;
+            float pathBegin = (float)primShape.PathBegin * 2.0e-5f;
+            float pathEnd = 1.0f - (float)primShape.PathEnd * 2.0e-5f;
+            float pathScaleX = (float)(primShape.PathScaleX - 100) * 0.01f;
+            float pathScaleY = (float)(primShape.PathScaleY - 100) * 0.01f;
+
+            float profileBegin = (float)primShape.ProfileBegin * 2.0e-5f;
+            float profileEnd = 1.0f - (float)primShape.ProfileEnd * 2.0e-5f;
+            float profileHollow = (float)primShape.ProfileHollow * 2.0e-5f;
+            if (profileHollow > 0.95f)
+                profileHollow = 0.95f;
+
+            int sides = 4;
+            LevelOfDetail iLOD = (LevelOfDetail)lod;
+            if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.EquilateralTriangle)
+                sides = 3;
+            else if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.Circle)
+            {
+                switch (iLOD)
+                {
+                    case LevelOfDetail.High:    sides = 24;     break;
+                    case LevelOfDetail.Medium:  sides = 12;     break;
+                    case LevelOfDetail.Low:     sides = 6;      break;
+                    case LevelOfDetail.VeryLow: sides = 3;      break;
+                    default:                    sides = 24;     break;
+                }
+            }
+            else if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.HalfCircle)
+            { // half circle, prim is a sphere
+                switch (iLOD)
+                {
+                    case LevelOfDetail.High:    sides = 24;     break;
+                    case LevelOfDetail.Medium:  sides = 12;     break;
+                    case LevelOfDetail.Low:     sides = 6;      break;
+                    case LevelOfDetail.VeryLow: sides = 3;      break;
+                    default:                    sides = 24;     break;
+                }
+
+                profileBegin = 0.5f * profileBegin + 0.5f;
+                profileEnd = 0.5f * profileEnd + 0.5f;
+            }
+
+            int hollowSides = sides;
+            if (primShape.HollowShape == HollowShape.Circle)
+            {
+                switch (iLOD)
+                {
+                    case LevelOfDetail.High:    hollowSides = 24;     break;
+                    case LevelOfDetail.Medium:  hollowSides = 12;     break;
+                    case LevelOfDetail.Low:     hollowSides = 6;      break;
+                    case LevelOfDetail.VeryLow: hollowSides = 3;      break;
+                    default:                    hollowSides = 24;     break;
+                }
+            }
+            else if (primShape.HollowShape == HollowShape.Square)
+                hollowSides = 4;
+            else if (primShape.HollowShape == HollowShape.Triangle)
+                hollowSides = 3;
+
+            primMesh = new PrimMesh(sides, profileBegin, profileEnd, profileHollow, hollowSides);
+
+            if (primMesh.errorMessage != null)
+                if (primMesh.errorMessage.Length > 0)
+                    m_log.Error("[ERROR] " + primMesh.errorMessage);
+
+            primMesh.topShearX = pathShearX;
+            primMesh.topShearY = pathShearY;
+            primMesh.pathCutBegin = pathBegin;
+            primMesh.pathCutEnd = pathEnd;
+
+            if (primShape.PathCurve == (byte)Extrusion.Straight || primShape.PathCurve == (byte) Extrusion.Flexible)
+            {
+                primMesh.twistBegin = primShape.PathTwistBegin * 18 / 10;
+                primMesh.twistEnd = primShape.PathTwist * 18 / 10;
+                primMesh.taperX = pathScaleX;
+                primMesh.taperY = pathScaleY;
+
+                if (profileBegin < 0.0f || profileBegin >= profileEnd || profileEnd > 1.0f)
+                {
+                    ReportPrimError("*** CORRUPT PRIM!! ***", primName, primMesh);
+                    if (profileBegin < 0.0f) profileBegin = 0.0f;
+                    if (profileEnd > 1.0f) profileEnd = 1.0f;
+                }
+#if SPAM
+            m_log.Debug("****** PrimMesh Parameters (Linear) ******\n" + primMesh.ParamsToDisplayString());
+#endif
+                try
+                {
+                    primMesh.ExtrudeLinear();
+                }
+                catch (Exception ex)
+                {
+                    ReportPrimError("Extrusion failure: exception: " + ex.ToString(), primName, primMesh);
+                    return false;
+                }
+            }
+            else
+            {
+                primMesh.holeSizeX = (200 - primShape.PathScaleX) * 0.01f;
+                primMesh.holeSizeY = (200 - primShape.PathScaleY) * 0.01f;
+                primMesh.radius = 0.01f * primShape.PathRadiusOffset;
+                primMesh.revolutions = 1.0f + 0.015f * primShape.PathRevolutions;
+                primMesh.skew = 0.01f * primShape.PathSkew;
+                primMesh.twistBegin = primShape.PathTwistBegin * 36 / 10;
+                primMesh.twistEnd = primShape.PathTwist * 36 / 10;
+                primMesh.taperX = primShape.PathTaperX * 0.01f;
+                primMesh.taperY = primShape.PathTaperY * 0.01f;
+
+                if (profileBegin < 0.0f || profileBegin >= profileEnd || profileEnd > 1.0f)
+                {
+                    ReportPrimError("*** CORRUPT PRIM!! ***", primName, primMesh);
+                    if (profileBegin < 0.0f) profileBegin = 0.0f;
+                    if (profileEnd > 1.0f) profileEnd = 1.0f;
+                }
+#if SPAM
+            m_log.Debug("****** PrimMesh Parameters (Circular) ******\n" + primMesh.ParamsToDisplayString());
+#endif
+                try
+                {
+                    primMesh.ExtrudeCircular();
+                }
+                catch (Exception ex)
+                {
+                    ReportPrimError("Extrusion failure: exception: " + ex.ToString(), primName, primMesh);
+                    return false;
+                }
+            }
+
+//            primMesh.DumpRaw(baseDir, primName, "primMesh");
+
+            coords = primMesh.coords;
+            faces = primMesh.faces;
+
+            return true;
+        }
+
+        public AMeshKey GetMeshUniqueKey(PrimitiveBaseShape primShape, Vector3 size, byte lod, bool convex)
+        {
+            AMeshKey key = new AMeshKey();
+            Byte[] someBytes;
+
+            key.hashB = 5181;
+            key.hashC = 5181;
+            ulong hash = 5381;
+
+            if (primShape.SculptEntry)
+            {
+                key.uuid = primShape.SculptTexture;
+                key.hashC = mdjb2(key.hashC, primShape.SculptType);
+                key.hashC = mdjb2(key.hashC, primShape.PCode);
+            }
+            else
+            {
+                hash = mdjb2(hash, primShape.PathCurve);
+                hash = mdjb2(hash, (byte)primShape.HollowShape);
+                hash = mdjb2(hash, (byte)primShape.ProfileShape);
+                hash = mdjb2(hash, primShape.PathBegin);
+                hash = mdjb2(hash, primShape.PathEnd);
+                hash = mdjb2(hash, primShape.PathScaleX);
+                hash = mdjb2(hash, primShape.PathScaleY);
+                hash = mdjb2(hash, primShape.PathShearX);
+                key.hashA = hash;
+                hash = key.hashB;
+                hash = mdjb2(hash, primShape.PathShearY);
+                hash = mdjb2(hash, (byte)primShape.PathTwist);
+                hash = mdjb2(hash, (byte)primShape.PathTwistBegin);
+                hash = mdjb2(hash, (byte)primShape.PathRadiusOffset);
+                hash = mdjb2(hash, (byte)primShape.PathTaperX);
+                hash = mdjb2(hash, (byte)primShape.PathTaperY);
+                hash = mdjb2(hash, primShape.PathRevolutions);
+                hash = mdjb2(hash, (byte)primShape.PathSkew);
+                hash = mdjb2(hash, primShape.ProfileBegin);
+                hash = mdjb2(hash, primShape.ProfileEnd);
+                hash = mdjb2(hash, primShape.ProfileHollow);
+                hash = mdjb2(hash, primShape.PCode);
+                key.hashB = hash;
+            }
+
+            hash = key.hashC;
+
+            hash = mdjb2(hash, lod);
+
+            if (size == m_MeshUnitSize)
+            {
+                hash = hash << 8;
+                hash |= 8;
+            }
+            else
+            {
+                someBytes = size.GetBytes();
+                for (int i = 0; i < someBytes.Length; i++)
+                    hash = mdjb2(hash, someBytes[i]);
+                hash = hash << 8;
+            }          
+
+            if (convex)
+                hash |= 4;
+
+            if (primShape.SculptEntry)
+            {
+                hash |= 1;
+                if (primShape.SculptType == (byte)SculptType.Mesh)
+                    hash |= 2;
+            }
+
+            key.hashC = hash;
+
+            return key;
+        }
+
+        private ulong mdjb2(ulong hash, byte c)
+        {
+            return ((hash << 5) + hash) + (ulong)c;
+        }
+
+        private ulong mdjb2(ulong hash, ushort c)
+        {
+            hash = ((hash << 5) + hash) + (ulong)((byte)c);
+            return ((hash << 5) + hash) + (ulong)(c >> 8);
+        }
+
+        public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod)
+        {
+            return CreateMesh(primName, primShape, size, lod, false,false,false,false);
+        }
+
+        public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical)
+        {
+            return CreateMesh(primName, primShape, size, lod, false,false,false,false);
+        }
+
+        public IMesh GetMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool convex)
+        {
+            Mesh mesh = null;
+
+            if (size.X < 0.01f) size.X = 0.01f;
+            if (size.Y < 0.01f) size.Y = 0.01f;
+            if (size.Z < 0.01f) size.Z = 0.01f;
+
+            AMeshKey key = GetMeshUniqueKey(primShape, size, (byte)lod, convex);
+            lock (m_uniqueMeshes)
+            {
+                m_uniqueMeshes.TryGetValue(key, out mesh);
+
+                if (mesh != null)
+                {
+                    mesh.RefCount++;
+                    return mesh;
+                }
+
+                // try to find a identical mesh on meshs recently released
+                lock (m_uniqueReleasedMeshes)
+                {
+                    m_uniqueReleasedMeshes.TryGetValue(key, out mesh);
+                    if (mesh != null)
+                    {
+                        m_uniqueReleasedMeshes.Remove(key);
+                        try
+                        {
+                            m_uniqueMeshes.Add(key, mesh);
+                        }
+                        catch { }
+                        mesh.RefCount = 1;
+                        return mesh;
+                    }
+                }
+            }
+            return null;
+        }
+
+        private static Vector3 m_MeshUnitSize = new Vector3(1.0f, 1.0f, 1.0f);
+        
+        public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod, bool isPhysical, bool shouldCache, bool convex, bool forOde)
+        {
+#if SPAM
+            m_log.DebugFormat("[MESH]: Creating mesh for {0}", primName);
+#endif
+
+            Mesh mesh = null;
+
+            if (size.X < 0.01f) size.X = 0.01f;
+            if (size.Y < 0.01f) size.Y = 0.01f;
+            if (size.Z < 0.01f) size.Z = 0.01f;
+
+            // try to find a identical mesh on meshs in use
+
+            AMeshKey key = GetMeshUniqueKey(primShape,size,(byte)lod, convex);
+
+            lock (m_uniqueMeshes)
+            {
+                m_uniqueMeshes.TryGetValue(key, out mesh);
+
+                if (mesh != null)
+                {
+                    mesh.RefCount++;
+                    return mesh;
+                }
+
+                // try to find a identical mesh on meshs recently released
+                lock (m_uniqueReleasedMeshes)
+                {
+                    m_uniqueReleasedMeshes.TryGetValue(key, out mesh);
+                    if (mesh != null)
+                    {
+                        m_uniqueReleasedMeshes.Remove(key);
+                        try
+                        {
+                            m_uniqueMeshes.Add(key, mesh);
+                        }
+                        catch { }
+                        mesh.RefCount = 1;
+                        return mesh;
+                    }
+                }
+            }
+
+            Mesh UnitMesh = null;
+            AMeshKey unitKey = GetMeshUniqueKey(primShape, m_MeshUnitSize, (byte)lod, convex);
+
+            lock (m_uniqueReleasedMeshes)
+            {
+                m_uniqueReleasedMeshes.TryGetValue(unitKey, out UnitMesh);
+                if (UnitMesh != null)
+                {
+                    UnitMesh.RefCount = 1;
+                }
+            }
+
+            if (UnitMesh == null && primShape.SculptEntry && doMeshFileCache)
+                UnitMesh = GetFromFileCache(unitKey);
+
+            if (UnitMesh == null)
+            {
+                UnitMesh = CreateMeshFromPrimMesher(primName, primShape, lod, convex);
+
+                if (UnitMesh == null)
+                    return null;
+
+                UnitMesh.DumpRaw(baseDir, unitKey.ToString(), "Z");
+
+                if (forOde)
+                {
+                    // force pinned mem allocation
+                    UnitMesh.PrepForOde();
+                }
+                else
+                    UnitMesh.TrimExcess();
+
+                UnitMesh.Key = unitKey;
+                UnitMesh.RefCount = 1;
+
+                if (doMeshFileCache && primShape.SculptEntry)
+                    StoreToFileCache(unitKey, UnitMesh);
+
+                lock (m_uniqueReleasedMeshes)
+                {
+                    try
+                    {
+                        m_uniqueReleasedMeshes.Add(unitKey, UnitMesh);
+                    }
+                    catch { }
+                }
+            }
+
+            mesh = UnitMesh.Scale(size);
+            mesh.Key = key;
+            mesh.RefCount = 1;
+            lock (m_uniqueMeshes)
+            {
+                try
+                {
+                    m_uniqueMeshes.Add(key, mesh);
+                }
+                catch { }
+            }           
+
+            return mesh;
+        }
+
+        public void ReleaseMesh(IMesh imesh)
+        {
+            if (imesh == null)
+                return;
+
+            Mesh mesh = (Mesh)imesh;
+
+            lock (m_uniqueMeshes)
+            {
+                int curRefCount = mesh.RefCount;
+                curRefCount--;
+
+                if (curRefCount > 0)
+                {
+                    mesh.RefCount = curRefCount;
+                    return;
+                }
+
+                mesh.RefCount = 0;
+                m_uniqueMeshes.Remove(mesh.Key);
+                lock (m_uniqueReleasedMeshes)
+                {
+                    try
+                    {
+                        m_uniqueReleasedMeshes.Add(mesh.Key, mesh);
+                    }
+                    catch { }
+                }           
+            }
+        }
+
+        public void ExpireReleaseMeshs()
+        {
+            if (m_uniqueReleasedMeshes.Count == 0)
+                return;
+
+            List<Mesh> meshstodelete = new List<Mesh>();
+            int refcntr;
+
+            lock (m_uniqueReleasedMeshes)
+            {
+                foreach (Mesh m in m_uniqueReleasedMeshes.Values)
+                {
+                    refcntr = m.RefCount;
+                    refcntr--;
+                    if (refcntr > -6)
+                        m.RefCount = refcntr;
+                    else
+                        meshstodelete.Add(m);
+                }
+
+                foreach (Mesh m in meshstodelete)
+                {
+                    m_uniqueReleasedMeshes.Remove(m.Key);
+                    m.releaseBuildingMeshData();
+                    m.releasePinned();
+                }
+            }
+        }
+
+        public void FileNames(AMeshKey key, out string dir,out string fullFileName)
+        {
+            string id = key.ToString();
+            string init = id.Substring(0, 1);
+            dir = System.IO.Path.Combine(cachePath, init);
+            fullFileName = System.IO.Path.Combine(dir, id);
+        }
+
+        public string FullFileName(AMeshKey key)
+        {
+            string id = key.ToString();
+            string init = id.Substring(0,1);
+            id = System.IO.Path.Combine(init, id);
+            id = System.IO.Path.Combine(cachePath, id);
+            return id;
+        }
+
+        private Mesh GetFromFileCache(AMeshKey key)
+        {
+            Mesh mesh = null;
+            string filename = FullFileName(key);
+            bool ok = true;
+
+            lock (diskLock)
+            {
+                if (File.Exists(filename))
+                {
+                    FileStream stream = null;
+                    try
+                    {
+                        stream = File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.Read);
+                        BinaryFormatter bformatter = new BinaryFormatter();
+
+                        mesh = Mesh.FromStream(stream, key);
+                        
+                    }
+                    catch (Exception e)
+                    {
+                        ok = false;
+                        m_log.ErrorFormat(
+                            "[MESH CACHE]: Failed to get file {0}.  Exception {1} {2}",
+                            filename, e.Message, e.StackTrace);
+                    }
+
+                    if (stream != null)
+                        stream.Close();
+
+                    if (mesh == null || !ok)
+                        File.Delete(filename);
+                    else
+                        File.SetLastAccessTimeUtc(filename, DateTime.UtcNow);
+                }
+            }
+
+            return mesh;
+        }
+
+        private void StoreToFileCache(AMeshKey key, Mesh mesh)
+        {
+            Stream stream = null;
+            bool ok = false;
+
+            // Make sure the target cache directory exists
+            string dir = String.Empty;
+            string filename = String.Empty;
+
+            FileNames(key, out dir, out filename);
+
+            lock (diskLock)
+            {
+                try
+                {
+                    if (!Directory.Exists(dir))
+                    {
+                        Directory.CreateDirectory(dir);
+                    }
+
+                    stream = File.Open(filename, FileMode.Create);
+                    ok = mesh.ToStream(stream);
+                }
+                catch (IOException e)
+                {
+                    m_log.ErrorFormat(
+                        "[MESH CACHE]: Failed to write file {0}.  Exception {1} {2}.",
+                        filename, e.Message, e.StackTrace);
+                    ok = false;
+                }
+
+                if (stream != null)
+                    stream.Close();
+
+                if (File.Exists(filename))
+                {
+                    if (ok)
+                        File.SetLastAccessTimeUtc(filename, DateTime.UtcNow);
+                    else
+                        File.Delete(filename);
+                }
+            }
+        }
+        
+        public void ExpireFileCache()
+        {
+            if (!doCacheExpire)
+                return;
+
+            string controlfile = System.IO.Path.Combine(cachePath, "cntr");
+
+            lock (diskLock)
+            {
+                try
+                {
+                    if (File.Exists(controlfile))
+                    {
+                        int ndeleted = 0;
+                        int totalfiles = 0;
+                        int ndirs = 0;
+                        DateTime OlderTime = File.GetLastAccessTimeUtc(controlfile) - CacheExpire;
+                        File.SetLastAccessTimeUtc(controlfile, DateTime.UtcNow);
+                        
+                        foreach (string dir in Directory.GetDirectories(cachePath))                       
+                        {
+                            try
+                            {
+                                foreach (string file in Directory.GetFiles(dir))
+                                {
+                                    try
+                                    {
+                                        if (File.GetLastAccessTimeUtc(file) < OlderTime)
+                                        {
+                                            File.Delete(file);
+                                            ndeleted++;
+                                        }
+                                    }
+                                    catch { }
+                                    totalfiles++;
+                                }
+                            }
+                            catch { }
+                            ndirs++;
+                        }
+
+                        if (ndeleted == 0)
+                            m_log.InfoFormat("[MESH CACHE]: {0} Files in {1} cache folders, no expires",
+                                totalfiles,ndirs);
+                        else
+                            m_log.InfoFormat("[MESH CACHE]: {0} Files in {1} cache folders, expired {2} files accessed before {3}",
+                                totalfiles,ndirs, ndeleted, OlderTime.ToString());
+                    }
+                    else
+                    {
+                        m_log.Info("[MESH CACHE]: Expire delayed to next startup");
+                        FileStream fs = File.Create(controlfile,4096,FileOptions.WriteThrough);
+                        fs.Close();
+                    }
+                }
+                catch { }
+            }
+        }
+    }
+}
diff --git a/OpenSim/Region/Physics/UbitMeshing/PrimMesher.cs b/OpenSim/Region/Physics/UbitMeshing/PrimMesher.cs
new file mode 100644
index 0000000..4049ee1
--- /dev/null
+++ b/OpenSim/Region/Physics/UbitMeshing/PrimMesher.cs
@@ -0,0 +1,2324 @@
+/*
+ * Copyright (c) Contributors
+ * 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.Text;
+using System.IO;
+
+namespace PrimMesher
+{
+    public struct Quat
+    {
+        /// <summary>X value</summary>
+        public float X;
+        /// <summary>Y value</summary>
+        public float Y;
+        /// <summary>Z value</summary>
+        public float Z;
+        /// <summary>W value</summary>
+        public float W;
+
+        public Quat(float x, float y, float z, float w)
+        {
+            X = x;
+            Y = y;
+            Z = z;
+            W = w;
+        }
+
+        public Quat(Coord axis, float angle)
+        {
+            axis = axis.Normalize();
+
+            angle *= 0.5f;
+            float c = (float)Math.Cos(angle);
+            float s = (float)Math.Sin(angle);
+
+            X = axis.X * s;
+            Y = axis.Y * s;
+            Z = axis.Z * s;
+            W = c;
+
+            Normalize();
+        }
+
+        public float Length()
+        {
+            return (float)Math.Sqrt(X * X + Y * Y + Z * Z + W * W);
+        }
+
+        public Quat Normalize()
+        {
+            const float MAG_THRESHOLD = 0.0000001f;
+            float mag = Length();
+
+            // Catch very small rounding errors when normalizing
+            if (mag > MAG_THRESHOLD)
+            {
+                float oomag = 1f / mag;
+                X *= oomag;
+                Y *= oomag;
+                Z *= oomag;
+                W *= oomag;
+            }
+            else
+            {
+                X = 0f;
+                Y = 0f;
+                Z = 0f;
+                W = 1f;
+            }
+
+            return this;
+        }
+
+        public static Quat operator *(Quat q1, Quat q2)
+        {
+            float x = q1.W * q2.X + q1.X * q2.W + q1.Y * q2.Z - q1.Z * q2.Y;
+            float y = q1.W * q2.Y - q1.X * q2.Z + q1.Y * q2.W + q1.Z * q2.X;
+            float z = q1.W * q2.Z + q1.X * q2.Y - q1.Y * q2.X + q1.Z * q2.W;
+            float w = q1.W * q2.W - q1.X * q2.X - q1.Y * q2.Y - q1.Z * q2.Z;
+            return new Quat(x, y, z, w);
+        }
+
+        public override string ToString()
+        {
+            return "< X: " + this.X.ToString() + ", Y: " + this.Y.ToString() + ", Z: " + this.Z.ToString() + ", W: " + this.W.ToString() + ">";
+        }
+    }
+
+    public struct Coord
+    {
+        public float X;
+        public float Y;
+        public float Z;
+
+        public Coord(float x, float y, float z)
+        {
+            this.X = x;
+            this.Y = y;
+            this.Z = z;
+        }
+
+        public float Length()
+        {
+            return (float)Math.Sqrt(this.X * this.X + this.Y * this.Y + this.Z * this.Z);
+        }
+
+        public Coord Invert()
+        {
+            this.X = -this.X;
+            this.Y = -this.Y;
+            this.Z = -this.Z;
+
+            return this;
+        }
+
+        public Coord Normalize()
+        {
+            const float MAG_THRESHOLD = 0.0000001f;
+            float mag = Length();
+
+            // Catch very small rounding errors when normalizing
+            if (mag > MAG_THRESHOLD)
+            {
+                float oomag = 1.0f / mag;
+                this.X *= oomag;
+                this.Y *= oomag;
+                this.Z *= oomag;
+            }
+            else
+            {
+                this.X = 0.0f;
+                this.Y = 0.0f;
+                this.Z = 0.0f;
+            }
+
+            return this;
+        }
+
+        public override string ToString()
+        {
+            return this.X.ToString() + " " + this.Y.ToString() + " " + this.Z.ToString();
+        }
+
+        public static Coord Cross(Coord c1, Coord c2)
+        {
+            return new Coord(
+                c1.Y * c2.Z - c2.Y * c1.Z,
+                c1.Z * c2.X - c2.Z * c1.X,
+                c1.X * c2.Y - c2.X * c1.Y
+                );
+        }
+
+        public static Coord operator +(Coord v, Coord a)
+        {
+            return new Coord(v.X + a.X, v.Y + a.Y, v.Z + a.Z);
+        }
+
+        public static Coord operator *(Coord v, Coord m)
+        {
+            return new Coord(v.X * m.X, v.Y * m.Y, v.Z * m.Z);
+        }
+
+        public static Coord operator *(Coord v, Quat q)
+        {
+            // From http://www.euclideanspace.com/maths/algebra/realNormedAlgebra/quaternions/transforms/
+
+            Coord c2 = new Coord(0.0f, 0.0f, 0.0f);
+
+            c2.X = q.W * q.W * v.X +
+                2f * q.Y * q.W * v.Z -
+                2f * q.Z * q.W * v.Y +
+                     q.X * q.X * v.X +
+                2f * q.Y * q.X * v.Y +
+                2f * q.Z * q.X * v.Z -
+                     q.Z * q.Z * v.X -
+                     q.Y * q.Y * v.X;
+
+            c2.Y =
+                2f * q.X * q.Y * v.X +
+                     q.Y * q.Y * v.Y +
+                2f * q.Z * q.Y * v.Z +
+                2f * q.W * q.Z * v.X -
+                     q.Z * q.Z * v.Y +
+                     q.W * q.W * v.Y -
+                2f * q.X * q.W * v.Z -
+                     q.X * q.X * v.Y;
+
+            c2.Z =
+                2f * q.X * q.Z * v.X +
+                2f * q.Y * q.Z * v.Y +
+                     q.Z * q.Z * v.Z -
+                2f * q.W * q.Y * v.X -
+                     q.Y * q.Y * v.Z +
+                2f * q.W * q.X * v.Y -
+                     q.X * q.X * v.Z +
+                     q.W * q.W * v.Z;
+
+            return c2;
+        }
+    }
+
+    public struct UVCoord
+    {
+        public float U;
+        public float V;
+
+
+        public UVCoord(float u, float v)
+        {
+            this.U = u;
+            this.V = v;
+        }
+
+        public UVCoord Flip()
+        {
+            this.U = 1.0f - this.U;
+            this.V = 1.0f - this.V;
+            return this;
+        }
+    }
+
+    public struct Face
+    {
+        public int primFace;
+
+        // vertices
+        public int v1;
+        public int v2;
+        public int v3;
+
+        //normals
+        public int n1;
+        public int n2;
+        public int n3;
+
+        // uvs
+        public int uv1;
+        public int uv2;
+        public int uv3;
+
+        public Face(int v1, int v2, int v3)
+        {
+            primFace = 0;
+
+            this.v1 = v1;
+            this.v2 = v2;
+            this.v3 = v3;
+
+            this.n1 = 0;
+            this.n2 = 0;
+            this.n3 = 0;
+
+            this.uv1 = 0;
+            this.uv2 = 0;
+            this.uv3 = 0;
+
+        }
+
+        public Face(int v1, int v2, int v3, int n1, int n2, int n3)
+        {
+            primFace = 0;
+
+            this.v1 = v1;
+            this.v2 = v2;
+            this.v3 = v3;
+
+            this.n1 = n1;
+            this.n2 = n2;
+            this.n3 = n3;
+
+            this.uv1 = 0;
+            this.uv2 = 0;
+            this.uv3 = 0;
+        }
+
+        public Coord SurfaceNormal(List<Coord> coordList)
+        {
+            Coord c1 = coordList[this.v1];
+            Coord c2 = coordList[this.v2];
+            Coord c3 = coordList[this.v3];
+
+            Coord edge1 = new Coord(c2.X - c1.X, c2.Y - c1.Y, c2.Z - c1.Z);
+            Coord edge2 = new Coord(c3.X - c1.X, c3.Y - c1.Y, c3.Z - c1.Z);
+
+            return Coord.Cross(edge1, edge2).Normalize();
+        }
+    }
+
+    public struct ViewerFace
+    {
+        public int primFaceNumber;
+
+        public Coord v1;
+        public Coord v2;
+        public Coord v3;
+
+        public int coordIndex1;
+        public int coordIndex2;
+        public int coordIndex3;
+
+        public Coord n1;
+        public Coord n2;
+        public Coord n3;
+
+        public UVCoord uv1;
+        public UVCoord uv2;
+        public UVCoord uv3;
+
+        public ViewerFace(int primFaceNumber)
+        {
+            this.primFaceNumber = primFaceNumber;
+
+            this.v1 = new Coord();
+            this.v2 = new Coord();
+            this.v3 = new Coord();
+
+            this.coordIndex1 = this.coordIndex2 = this.coordIndex3 = -1; // -1 means not assigned yet
+
+            this.n1 = new Coord();
+            this.n2 = new Coord();
+            this.n3 = new Coord();
+
+            this.uv1 = new UVCoord();
+            this.uv2 = new UVCoord();
+            this.uv3 = new UVCoord();
+        }
+
+        public void Scale(float x, float y, float z)
+        {
+            this.v1.X *= x;
+            this.v1.Y *= y;
+            this.v1.Z *= z;
+
+            this.v2.X *= x;
+            this.v2.Y *= y;
+            this.v2.Z *= z;
+
+            this.v3.X *= x;
+            this.v3.Y *= y;
+            this.v3.Z *= z;
+        }
+
+        public void AddPos(float x, float y, float z)
+        {
+            this.v1.X += x;
+            this.v2.X += x;
+            this.v3.X += x;
+
+            this.v1.Y += y;
+            this.v2.Y += y;
+            this.v3.Y += y;
+
+            this.v1.Z += z;
+            this.v2.Z += z;
+            this.v3.Z += z;
+        }
+
+        public void AddRot(Quat q)
+        {
+            this.v1 *= q;
+            this.v2 *= q;
+            this.v3 *= q;
+
+            this.n1 *= q;
+            this.n2 *= q;
+            this.n3 *= q;
+        }
+
+        public void CalcSurfaceNormal()
+        {
+
+            Coord edge1 = new Coord(this.v2.X - this.v1.X, this.v2.Y - this.v1.Y, this.v2.Z - this.v1.Z);
+            Coord edge2 = new Coord(this.v3.X - this.v1.X, this.v3.Y - this.v1.Y, this.v3.Z - this.v1.Z);
+
+            this.n1 = this.n2 = this.n3 = Coord.Cross(edge1, edge2).Normalize();
+        }
+    }
+
+    internal struct Angle
+    {
+        internal float angle;
+        internal float X;
+        internal float Y;
+
+        internal Angle(float angle, float x, float y)
+        {
+            this.angle = angle;
+            this.X = x;
+            this.Y = y;
+        }
+    }
+
+    internal class AngleList
+    {
+        private float iX, iY; // intersection point
+
+        private static Angle[] angles3 =
+        {
+            new Angle(0.0f, 1.0f, 0.0f),
+            new Angle(0.33333333333333333f, -0.5f, 0.86602540378443871f),
+            new Angle(0.66666666666666667f, -0.5f, -0.86602540378443837f),
+            new Angle(1.0f, 1.0f, 0.0f)
+        };
+
+        private static Coord[] normals3 =
+        {
+            new Coord(0.25f, 0.4330127019f, 0.0f).Normalize(),
+            new Coord(-0.5f, 0.0f, 0.0f).Normalize(),
+            new Coord(0.25f, -0.4330127019f, 0.0f).Normalize(),
+            new Coord(0.25f, 0.4330127019f, 0.0f).Normalize()
+        };
+
+        private static Angle[] angles4 =
+        {
+            new Angle(0.0f, 1.0f, 0.0f),
+            new Angle(0.25f, 0.0f, 1.0f),
+            new Angle(0.5f, -1.0f, 0.0f),
+            new Angle(0.75f, 0.0f, -1.0f),
+            new Angle(1.0f, 1.0f, 0.0f)
+        };
+
+        private static Coord[] normals4 = 
+        {
+            new Coord(0.5f, 0.5f, 0.0f).Normalize(),
+            new Coord(-0.5f, 0.5f, 0.0f).Normalize(),
+            new Coord(-0.5f, -0.5f, 0.0f).Normalize(),
+            new Coord(0.5f, -0.5f, 0.0f).Normalize(),
+            new Coord(0.5f, 0.5f, 0.0f).Normalize()
+        };
+
+        private static Angle[] angles24 =
+        {
+            new Angle(0.0f, 1.0f, 0.0f),
+            new Angle(0.041666666666666664f, 0.96592582628906831f, 0.25881904510252074f),
+            new Angle(0.083333333333333329f, 0.86602540378443871f, 0.5f),
+            new Angle(0.125f, 0.70710678118654757f, 0.70710678118654746f),
+            new Angle(0.16666666666666667f, 0.5f, 0.8660254037844386f),
+            new Angle(0.20833333333333331f, 0.25881904510252096f, 0.9659258262890682f),
+            new Angle(0.25f, 0.0f, 1.0f),
+            new Angle(0.29166666666666663f, -0.25881904510252063f, 0.96592582628906831f),
+            new Angle(0.33333333333333333f, -0.5f, 0.86602540378443871f),
+            new Angle(0.375f, -0.70710678118654746f, 0.70710678118654757f),
+            new Angle(0.41666666666666663f, -0.86602540378443849f, 0.5f),
+            new Angle(0.45833333333333331f, -0.9659258262890682f, 0.25881904510252102f),
+            new Angle(0.5f, -1.0f, 0.0f),
+            new Angle(0.54166666666666663f, -0.96592582628906842f, -0.25881904510252035f),
+            new Angle(0.58333333333333326f, -0.86602540378443882f, -0.5f),
+            new Angle(0.62499999999999989f, -0.70710678118654791f, -0.70710678118654713f),
+            new Angle(0.66666666666666667f, -0.5f, -0.86602540378443837f),
+            new Angle(0.70833333333333326f, -0.25881904510252152f, -0.96592582628906809f),
+            new Angle(0.75f, 0.0f, -1.0f),
+            new Angle(0.79166666666666663f, 0.2588190451025203f, -0.96592582628906842f),
+            new Angle(0.83333333333333326f, 0.5f, -0.86602540378443904f),
+            new Angle(0.875f, 0.70710678118654735f, -0.70710678118654768f),
+            new Angle(0.91666666666666663f, 0.86602540378443837f, -0.5f),
+            new Angle(0.95833333333333326f, 0.96592582628906809f, -0.25881904510252157f),
+            new Angle(1.0f, 1.0f, 0.0f)
+        };
+
+        private Angle interpolatePoints(float newPoint, Angle p1, Angle p2)
+        {
+            float m = (newPoint - p1.angle) / (p2.angle - p1.angle);
+            return new Angle(newPoint, p1.X + m * (p2.X - p1.X), p1.Y + m * (p2.Y - p1.Y));
+        }
+
+        private void intersection(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4)
+        { // ref: http://local.wasp.uwa.edu.au/~pbourke/geometry/lineline2d/
+            double denom = (y4 - y3) * (x2 - x1) - (x4 - x3) * (y2 - y1);
+            double uaNumerator = (x4 - x3) * (y1 - y3) - (y4 - y3) * (x1 - x3);
+
+            if (denom != 0.0)
+            {
+                double ua = uaNumerator / denom;
+                iX = (float)(x1 + ua * (x2 - x1));
+                iY = (float)(y1 + ua * (y2 - y1));
+            }
+        }
+
+        internal List<Angle> angles;
+        internal List<Coord> normals;
+
+        internal void makeAngles(int sides, float startAngle, float stopAngle)
+        {
+            angles = new List<Angle>();
+            normals = new List<Coord>();
+
+            double twoPi = System.Math.PI * 2.0;
+            float twoPiInv = 1.0f / (float)twoPi;
+
+            if (sides < 1)
+                throw new Exception("number of sides not greater than zero");
+            if (stopAngle <= startAngle)
+                throw new Exception("stopAngle not greater than startAngle");
+
+            if ((sides == 3 || sides == 4 || sides == 24))
+            {
+                startAngle *= twoPiInv;
+                stopAngle *= twoPiInv;
+
+                Angle[] sourceAngles;
+                if (sides == 3)
+                    sourceAngles = angles3;
+                else if (sides == 4)
+                    sourceAngles = angles4;
+                else sourceAngles = angles24;
+
+                int startAngleIndex = (int)(startAngle * sides);
+                int endAngleIndex = sourceAngles.Length - 1;
+                if (stopAngle < 1.0f)
+                    endAngleIndex = (int)(stopAngle * sides) + 1;
+                if (endAngleIndex == startAngleIndex)
+                    endAngleIndex++;
+
+                for (int angleIndex = startAngleIndex; angleIndex < endAngleIndex + 1; angleIndex++)
+                {
+                    angles.Add(sourceAngles[angleIndex]);
+                    if (sides == 3)
+                        normals.Add(normals3[angleIndex]);
+                    else if (sides == 4)
+                        normals.Add(normals4[angleIndex]);
+                }
+
+                if (startAngle > 0.0f)
+                    angles[0] = interpolatePoints(startAngle, angles[0], angles[1]);
+
+                if (stopAngle < 1.0f)
+                {
+                    int lastAngleIndex = angles.Count - 1;
+                    angles[lastAngleIndex] = interpolatePoints(stopAngle, angles[lastAngleIndex - 1], angles[lastAngleIndex]);
+                }
+            }
+            else
+            {
+                double stepSize = twoPi / sides;
+
+                int startStep = (int)(startAngle / stepSize);
+                double angle = stepSize * startStep;
+                int step = startStep;
+                double stopAngleTest = stopAngle;
+                if (stopAngle < twoPi)
+                {
+                    stopAngleTest = stepSize * ((int)(stopAngle / stepSize) + 1);
+                    if (stopAngleTest < stopAngle)
+                        stopAngleTest += stepSize;
+                    if (stopAngleTest > twoPi)
+                        stopAngleTest = twoPi;
+                }
+
+                while (angle <= stopAngleTest)
+                {
+                    Angle newAngle;
+                    newAngle.angle = (float)angle;
+                    newAngle.X = (float)System.Math.Cos(angle);
+                    newAngle.Y = (float)System.Math.Sin(angle);
+                    angles.Add(newAngle);
+                    step += 1;
+                    angle = stepSize * step;
+                }
+
+                if (startAngle > angles[0].angle)
+                {
+                    Angle newAngle;
+                    intersection(angles[0].X, angles[0].Y, angles[1].X, angles[1].Y, 0.0f, 0.0f, (float)Math.Cos(startAngle), (float)Math.Sin(startAngle));
+                    newAngle.angle = startAngle;
+                    newAngle.X = iX;
+                    newAngle.Y = iY;
+                    angles[0] = newAngle;
+                }
+
+                int index = angles.Count - 1;
+                if (stopAngle < angles[index].angle)
+                {
+                    Angle newAngle;
+                    intersection(angles[index - 1].X, angles[index - 1].Y, angles[index].X, angles[index].Y, 0.0f, 0.0f, (float)Math.Cos(stopAngle), (float)Math.Sin(stopAngle));
+                    newAngle.angle = stopAngle;
+                    newAngle.X = iX;
+                    newAngle.Y = iY;
+                    angles[index] = newAngle;
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// generates a profile for extrusion
+    /// </summary>
+    public class Profile
+    {
+        private const float twoPi = 2.0f * (float)Math.PI;
+
+        public string errorMessage = null;
+
+        public List<Coord> coords;
+        public List<Face> faces;
+        public List<Coord> vertexNormals;
+        public List<float> us;
+        public List<UVCoord> faceUVs;
+        public List<int> faceNumbers;
+
+        // use these for making individual meshes for each prim face
+        public List<int> outerCoordIndices = null;
+        public List<int> hollowCoordIndices = null;
+        public List<int> cut1CoordIndices = null;
+        public List<int> cut2CoordIndices = null;
+
+        public Coord faceNormal = new Coord(0.0f, 0.0f, 1.0f);
+        public Coord cutNormal1 = new Coord();
+        public Coord cutNormal2 = new Coord();
+
+        public int numOuterVerts = 0;
+        public int numHollowVerts = 0;
+
+        public int outerFaceNumber = -1;
+        public int hollowFaceNumber = -1;
+
+        public bool calcVertexNormals = false;
+        public int bottomFaceNumber = 0;
+        public int numPrimFaces = 0;
+
+        public Profile()
+        {
+            this.coords = new List<Coord>();
+            this.faces = new List<Face>();
+            this.vertexNormals = new List<Coord>();
+            this.us = new List<float>();
+            this.faceUVs = new List<UVCoord>();
+            this.faceNumbers = new List<int>();
+        }
+
+        public Profile(int sides, float profileStart, float profileEnd, float hollow, int hollowSides, bool createFaces, bool calcVertexNormals)
+        {
+            this.calcVertexNormals = calcVertexNormals;
+            this.coords = new List<Coord>();
+            this.faces = new List<Face>();
+            this.vertexNormals = new List<Coord>();
+            this.us = new List<float>();
+            this.faceUVs = new List<UVCoord>();
+            this.faceNumbers = new List<int>();
+
+            Coord center = new Coord(0.0f, 0.0f, 0.0f);
+
+            List<Coord> hollowCoords = new List<Coord>();
+            List<Coord> hollowNormals = new List<Coord>();
+            List<float> hollowUs = new List<float>();
+
+            if (calcVertexNormals)
+            {
+                this.outerCoordIndices = new List<int>();
+                this.hollowCoordIndices = new List<int>();
+                this.cut1CoordIndices = new List<int>();
+                this.cut2CoordIndices = new List<int>();
+            }
+
+            bool hasHollow = (hollow > 0.0f);
+
+            bool hasProfileCut = (profileStart > 0.0f || profileEnd < 1.0f);
+
+            AngleList angles = new AngleList();
+            AngleList hollowAngles = new AngleList();
+
+            float xScale = 0.5f;
+            float yScale = 0.5f;
+            if (sides == 4)  // corners of a square are sqrt(2) from center
+            {
+                xScale = 0.707107f;
+                yScale = 0.707107f;
+            }
+
+            float startAngle = profileStart * twoPi;
+            float stopAngle = profileEnd * twoPi;
+
+            try { angles.makeAngles(sides, startAngle, stopAngle); }
+            catch (Exception ex)
+            {
+
+                errorMessage = "makeAngles failed: Exception: " + ex.ToString()
+                + "\nsides: " + sides.ToString() + " startAngle: " + startAngle.ToString() + " stopAngle: " + stopAngle.ToString();
+
+                return;
+            }
+
+            this.numOuterVerts = angles.angles.Count;
+
+            // flag to create as few triangles as possible for 3 or 4 side profile
+            bool simpleFace = (sides < 5 && !hasHollow && !hasProfileCut);
+
+            if (hasHollow)
+            {
+                if (sides == hollowSides)
+                    hollowAngles = angles;
+                else
+                {
+                    try { hollowAngles.makeAngles(hollowSides, startAngle, stopAngle); }
+                    catch (Exception ex)
+                    {
+                        errorMessage = "makeAngles failed: Exception: " + ex.ToString()
+                        + "\nsides: " + sides.ToString() + " startAngle: " + startAngle.ToString() + " stopAngle: " + stopAngle.ToString();
+
+                        return;
+                    }
+                }
+                this.numHollowVerts = hollowAngles.angles.Count;
+            }
+            else if (!simpleFace)
+            {
+                this.coords.Add(center);
+                if (this.calcVertexNormals)
+                    this.vertexNormals.Add(new Coord(0.0f, 0.0f, 1.0f));
+                this.us.Add(0.0f);
+            }
+
+            float z = 0.0f;
+
+            Angle angle;
+            Coord newVert = new Coord();
+            if (hasHollow && hollowSides != sides)
+            {
+                int numHollowAngles = hollowAngles.angles.Count;
+                for (int i = 0; i < numHollowAngles; i++)
+                {
+                    angle = hollowAngles.angles[i];
+                    newVert.X = hollow * xScale * angle.X;
+                    newVert.Y = hollow * yScale * angle.Y;
+                    newVert.Z = z;
+
+                    hollowCoords.Add(newVert);
+                    if (this.calcVertexNormals)
+                    {
+                        if (hollowSides < 5)
+                            hollowNormals.Add(hollowAngles.normals[i].Invert());
+                        else
+                            hollowNormals.Add(new Coord(-angle.X, -angle.Y, 0.0f));
+
+                        if (hollowSides == 4)
+                            hollowUs.Add(angle.angle * hollow * 0.707107f);
+                        else
+                            hollowUs.Add(angle.angle * hollow);
+                    }
+                }
+            }
+
+            int index = 0;
+            int numAngles = angles.angles.Count;
+
+            for (int i = 0; i < numAngles; i++)
+            {
+                angle = angles.angles[i];
+                newVert.X = angle.X * xScale;
+                newVert.Y = angle.Y * yScale;
+                newVert.Z = z;
+                this.coords.Add(newVert);
+                if (this.calcVertexNormals)
+                {
+                    this.outerCoordIndices.Add(this.coords.Count - 1);
+
+                    if (sides < 5)
+                    {
+                        this.vertexNormals.Add(angles.normals[i]);
+                        float u = angle.angle;
+                        this.us.Add(u);
+                    }
+                    else
+                    {
+                        this.vertexNormals.Add(new Coord(angle.X, angle.Y, 0.0f));
+                        this.us.Add(angle.angle);
+                    }
+                }
+
+                if (hasHollow)
+                {
+                    if (hollowSides == sides)
+                    {
+                        newVert.X *= hollow;
+                        newVert.Y *= hollow;
+                        newVert.Z = z;
+                        hollowCoords.Add(newVert);
+                        if (this.calcVertexNormals)
+                        {
+                            if (sides < 5)
+                            {
+                                hollowNormals.Add(angles.normals[i].Invert());
+                            }
+
+                            else
+                                hollowNormals.Add(new Coord(-angle.X, -angle.Y, 0.0f));
+
+                            hollowUs.Add(angle.angle * hollow);
+                        }
+                    }
+                }
+                else if (!simpleFace && createFaces && angle.angle > 0.0001f)
+                {
+                    Face newFace = new Face();
+                    newFace.v1 = 0;
+                    newFace.v2 = index;
+                    newFace.v3 = index + 1;
+
+                    this.faces.Add(newFace);
+                }
+                index += 1;
+            }
+
+            if (hasHollow)
+            {
+                hollowCoords.Reverse();
+                if (this.calcVertexNormals)
+                {
+                    hollowNormals.Reverse();
+                    hollowUs.Reverse();
+                }
+
+                if (createFaces)
+                {
+                    int numTotalVerts = this.numOuterVerts + this.numHollowVerts;
+
+                    if (this.numOuterVerts == this.numHollowVerts)
+                    {
+                        Face newFace = new Face();
+
+                        for (int coordIndex = 0; coordIndex < this.numOuterVerts - 1; coordIndex++)
+                        {
+                            newFace.v1 = coordIndex;
+                            newFace.v2 = coordIndex + 1;
+                            newFace.v3 = numTotalVerts - coordIndex - 1;
+                            this.faces.Add(newFace);
+
+                            newFace.v1 = coordIndex + 1;
+                            newFace.v2 = numTotalVerts - coordIndex - 2;
+                            newFace.v3 = numTotalVerts - coordIndex - 1;
+                            this.faces.Add(newFace);
+                        }
+                    }
+                    else
+                    {
+                        if (this.numOuterVerts < this.numHollowVerts)
+                        {
+                            Face newFace = new Face();
+                            int j = 0; // j is the index for outer vertices
+                            int maxJ = this.numOuterVerts - 1;
+                            for (int i = 0; i < this.numHollowVerts; i++) // i is the index for inner vertices
+                            {
+                                if (j < maxJ)
+                                    if (angles.angles[j + 1].angle - hollowAngles.angles[i].angle < hollowAngles.angles[i].angle - angles.angles[j].angle + 0.000001f)
+                                    {
+                                        newFace.v1 = numTotalVerts - i - 1;
+                                        newFace.v2 = j;
+                                        newFace.v3 = j + 1;
+
+                                        this.faces.Add(newFace);
+                                        j += 1;
+                                    }
+
+                                newFace.v1 = j;
+                                newFace.v2 = numTotalVerts - i - 2;
+                                newFace.v3 = numTotalVerts - i - 1;
+
+                                this.faces.Add(newFace);
+                            }
+                        }
+                        else // numHollowVerts < numOuterVerts
+                        {
+                            Face newFace = new Face();
+                            int j = 0; // j is the index for inner vertices
+                            int maxJ = this.numHollowVerts - 1;
+                            for (int i = 0; i < this.numOuterVerts; i++)
+                            {
+                                if (j < maxJ)
+                                    if (hollowAngles.angles[j + 1].angle - angles.angles[i].angle < angles.angles[i].angle - hollowAngles.angles[j].angle + 0.000001f)
+                                    {
+                                        newFace.v1 = i;
+                                        newFace.v2 = numTotalVerts - j - 2;
+                                        newFace.v3 = numTotalVerts - j - 1;
+
+                                        this.faces.Add(newFace);
+                                        j += 1;
+                                    }
+
+                                newFace.v1 = numTotalVerts - j - 1;
+                                newFace.v2 = i;
+                                newFace.v3 = i + 1;
+
+                                this.faces.Add(newFace);
+                            }
+                        }
+                    }
+                }
+
+                if (calcVertexNormals)
+                {
+                    foreach (Coord hc in hollowCoords)
+                    {
+                        this.coords.Add(hc);
+                        hollowCoordIndices.Add(this.coords.Count - 1);
+                    }
+                }
+                else
+                    this.coords.AddRange(hollowCoords);
+
+                if (this.calcVertexNormals)
+                {
+                    this.vertexNormals.AddRange(hollowNormals);
+                    this.us.AddRange(hollowUs);
+
+                }
+            }
+
+            if (simpleFace && createFaces)
+            {
+                if (sides == 3)
+                    this.faces.Add(new Face(0, 1, 2));
+                else if (sides == 4)
+                {
+                    this.faces.Add(new Face(0, 1, 2));
+                    this.faces.Add(new Face(0, 2, 3));
+                }
+            }
+
+            if (calcVertexNormals && hasProfileCut)
+            {
+                int lastOuterVertIndex = this.numOuterVerts - 1;
+
+                if (hasHollow)
+                {
+                    this.cut1CoordIndices.Add(0);
+                    this.cut1CoordIndices.Add(this.coords.Count - 1);
+
+                    this.cut2CoordIndices.Add(lastOuterVertIndex + 1);
+                    this.cut2CoordIndices.Add(lastOuterVertIndex);
+
+                    this.cutNormal1.X = this.coords[0].Y - this.coords[this.coords.Count - 1].Y;
+                    this.cutNormal1.Y = -(this.coords[0].X - this.coords[this.coords.Count - 1].X);
+
+                    this.cutNormal2.X = this.coords[lastOuterVertIndex + 1].Y - this.coords[lastOuterVertIndex].Y;
+                    this.cutNormal2.Y = -(this.coords[lastOuterVertIndex + 1].X - this.coords[lastOuterVertIndex].X);
+                }
+
+                else
+                {
+                    this.cut1CoordIndices.Add(0);
+                    this.cut1CoordIndices.Add(1);
+
+                    this.cut2CoordIndices.Add(lastOuterVertIndex);
+                    this.cut2CoordIndices.Add(0);
+
+                    this.cutNormal1.X = this.vertexNormals[1].Y;
+                    this.cutNormal1.Y = -this.vertexNormals[1].X;
+
+                    this.cutNormal2.X = -this.vertexNormals[this.vertexNormals.Count - 2].Y;
+                    this.cutNormal2.Y = this.vertexNormals[this.vertexNormals.Count - 2].X;
+
+                }
+                this.cutNormal1.Normalize();
+                this.cutNormal2.Normalize();
+            }
+
+            this.MakeFaceUVs();
+
+            hollowCoords = null;
+            hollowNormals = null;
+            hollowUs = null;
+
+            if (calcVertexNormals)
+            { // calculate prim face numbers
+
+                // face number order is top, outer, hollow, bottom, start cut, end cut
+                // I know it's ugly but so is the whole concept of prim face numbers
+
+                int faceNum = 1; // start with outer faces
+                this.outerFaceNumber = faceNum;
+
+                int startVert = hasProfileCut && !hasHollow ? 1 : 0;
+                if (startVert > 0)
+                    this.faceNumbers.Add(-1);
+                for (int i = 0; i < this.numOuterVerts - 1; i++)
+                    this.faceNumbers.Add(sides < 5 && i <= sides ? faceNum++ : faceNum);
+
+                this.faceNumbers.Add(hasProfileCut ? -1 : faceNum++);
+
+                if (sides > 4 && (hasHollow || hasProfileCut))
+                    faceNum++;
+
+                if (sides < 5 && (hasHollow || hasProfileCut) && this.numOuterVerts < sides)
+                    faceNum++;
+
+                if (hasHollow)
+                {
+                    for (int i = 0; i < this.numHollowVerts; i++)
+                        this.faceNumbers.Add(faceNum);
+
+                    this.hollowFaceNumber = faceNum++;
+                }
+
+                this.bottomFaceNumber = faceNum++;
+
+                if (hasHollow && hasProfileCut)
+                    this.faceNumbers.Add(faceNum++);
+
+                for (int i = 0; i < this.faceNumbers.Count; i++)
+                    if (this.faceNumbers[i] == -1)
+                        this.faceNumbers[i] = faceNum++;
+
+                this.numPrimFaces = faceNum;
+            }
+
+        }
+
+        public void MakeFaceUVs()
+        {
+            this.faceUVs = new List<UVCoord>();
+            foreach (Coord c in this.coords)
+                this.faceUVs.Add(new UVCoord(1.0f - (0.5f + c.X), 1.0f - (0.5f - c.Y)));
+        }
+
+        public Profile Copy()
+        {
+            return this.Copy(true);
+        }
+
+        public Profile Copy(bool needFaces)
+        {
+            Profile copy = new Profile();
+
+            copy.coords.AddRange(this.coords);
+            copy.faceUVs.AddRange(this.faceUVs);
+
+            if (needFaces)
+                copy.faces.AddRange(this.faces);
+            if ((copy.calcVertexNormals = this.calcVertexNormals) == true)
+            {
+                copy.vertexNormals.AddRange(this.vertexNormals);
+                copy.faceNormal = this.faceNormal;
+                copy.cutNormal1 = this.cutNormal1;
+                copy.cutNormal2 = this.cutNormal2;
+                copy.us.AddRange(this.us);
+                copy.faceNumbers.AddRange(this.faceNumbers);
+
+                copy.cut1CoordIndices = new List<int>(this.cut1CoordIndices);
+                copy.cut2CoordIndices = new List<int>(this.cut2CoordIndices);
+                copy.hollowCoordIndices = new List<int>(this.hollowCoordIndices);
+                copy.outerCoordIndices = new List<int>(this.outerCoordIndices);
+            }
+            copy.numOuterVerts = this.numOuterVerts;
+            copy.numHollowVerts = this.numHollowVerts;
+
+            return copy;
+        }
+
+        public void AddPos(Coord v)
+        {
+            this.AddPos(v.X, v.Y, v.Z);
+        }
+
+        public void AddPos(float x, float y, float z)
+        {
+            int i;
+            int numVerts = this.coords.Count;
+            Coord vert;
+
+            for (i = 0; i < numVerts; i++)
+            {
+                vert = this.coords[i];
+                vert.X += x;
+                vert.Y += y;
+                vert.Z += z;
+                this.coords[i] = vert;
+            }
+        }
+
+        public void AddRot(Quat q)
+        {
+            int i;
+            int numVerts = this.coords.Count;
+
+            for (i = 0; i < numVerts; i++)
+                this.coords[i] *= q;
+
+            if (this.calcVertexNormals)
+            {
+                int numNormals = this.vertexNormals.Count;
+                for (i = 0; i < numNormals; i++)
+                    this.vertexNormals[i] *= q;
+
+                this.faceNormal *= q;
+                this.cutNormal1 *= q;
+                this.cutNormal2 *= q;
+
+            }
+        }
+
+        public void Scale(float x, float y)
+        {
+            int i;
+            int numVerts = this.coords.Count;
+            Coord vert;
+
+            for (i = 0; i < numVerts; i++)
+            {
+                vert = this.coords[i];
+                vert.X *= x;
+                vert.Y *= y;
+                this.coords[i] = vert;
+            }
+        }
+
+        /// <summary>
+        /// Changes order of the vertex indices and negates the center vertex normal. Does not alter vertex normals of radial vertices
+        /// </summary>
+        public void FlipNormals()
+        {
+            int i;
+            int numFaces = this.faces.Count;
+            Face tmpFace;
+            int tmp;
+
+            for (i = 0; i < numFaces; i++)
+            {
+                tmpFace = this.faces[i];
+                tmp = tmpFace.v3;
+                tmpFace.v3 = tmpFace.v1;
+                tmpFace.v1 = tmp;
+                this.faces[i] = tmpFace;
+            }
+
+            if (this.calcVertexNormals)
+            {
+                int normalCount = this.vertexNormals.Count;
+                if (normalCount > 0)
+                {
+                    Coord n = this.vertexNormals[normalCount - 1];
+                    n.Z = -n.Z;
+                    this.vertexNormals[normalCount - 1] = n;
+                }
+            }
+
+            this.faceNormal.X = -this.faceNormal.X;
+            this.faceNormal.Y = -this.faceNormal.Y;
+            this.faceNormal.Z = -this.faceNormal.Z;
+
+            int numfaceUVs = this.faceUVs.Count;
+            for (i = 0; i < numfaceUVs; i++)
+            {
+                UVCoord uv = this.faceUVs[i];
+                uv.V = 1.0f - uv.V;
+                this.faceUVs[i] = uv;
+            }
+        }
+
+        public void AddValue2FaceVertexIndices(int num)
+        {
+            int numFaces = this.faces.Count;
+            Face tmpFace;
+            for (int i = 0; i < numFaces; i++)
+            {
+                tmpFace = this.faces[i];
+                tmpFace.v1 += num;
+                tmpFace.v2 += num;
+                tmpFace.v3 += num;
+
+                this.faces[i] = tmpFace;
+            }
+        }
+
+        public void AddValue2FaceNormalIndices(int num)
+        {
+            if (this.calcVertexNormals)
+            {
+                int numFaces = this.faces.Count;
+                Face tmpFace;
+                for (int i = 0; i < numFaces; i++)
+                {
+                    tmpFace = this.faces[i];
+                    tmpFace.n1 += num;
+                    tmpFace.n2 += num;
+                    tmpFace.n3 += num;
+
+                    this.faces[i] = tmpFace;
+                }
+            }
+        }
+
+        public void DumpRaw(String path, String name, String title)
+        {
+            if (path == null)
+                return;
+            String fileName = name + "_" + title + ".raw";
+            String completePath = System.IO.Path.Combine(path, fileName);
+            StreamWriter sw = new StreamWriter(completePath);
+
+            for (int i = 0; i < this.faces.Count; i++)
+            {
+                string s = this.coords[this.faces[i].v1].ToString();
+                s += " " + this.coords[this.faces[i].v2].ToString();
+                s += " " + this.coords[this.faces[i].v3].ToString();
+
+                sw.WriteLine(s);
+            }
+
+            sw.Close();
+        }
+    }
+
+    public struct PathNode
+    {
+        public Coord position;
+        public Quat rotation;
+        public float xScale;
+        public float yScale;
+        public float percentOfPath;
+    }
+
+    public enum PathType { Linear = 0, Circular = 1, Flexible = 2 }
+
+    public class Path
+    {
+        public List<PathNode> pathNodes = new List<PathNode>();
+
+        public float twistBegin = 0.0f;
+        public float twistEnd = 0.0f;
+        public float topShearX = 0.0f;
+        public float topShearY = 0.0f;
+        public float pathCutBegin = 0.0f;
+        public float pathCutEnd = 1.0f;
+        public float dimpleBegin = 0.0f;
+        public float dimpleEnd = 1.0f;
+        public float skew = 0.0f;
+        public float holeSizeX = 1.0f; // called pathScaleX in pbs
+        public float holeSizeY = 0.25f;
+        public float taperX = 0.0f;
+        public float taperY = 0.0f;
+        public float radius = 0.0f;
+        public float revolutions = 1.0f;
+        public int stepsPerRevolution = 24;
+
+        private const float twoPi = 2.0f * (float)Math.PI;
+
+        public void Create(PathType pathType, int steps)
+        {
+            if (this.taperX > 0.999f)
+                this.taperX = 0.999f;
+            if (this.taperX < -0.999f)
+                this.taperX = -0.999f;
+            if (this.taperY > 0.999f)
+                this.taperY = 0.999f;
+            if (this.taperY < -0.999f)
+                this.taperY = -0.999f;
+
+            if (pathType == PathType.Linear || pathType == PathType.Flexible)
+            {
+                int step = 0;
+
+                float length = this.pathCutEnd - this.pathCutBegin;
+                float twistTotal = twistEnd - twistBegin;
+                float twistTotalAbs = Math.Abs(twistTotal);
+                if (twistTotalAbs > 0.01f)
+                    steps += (int)(twistTotalAbs * 3.66); //  dahlia's magic number
+
+                float start = -0.5f;
+                float stepSize = length / (float)steps;
+                float percentOfPathMultiplier = stepSize * 0.999999f;
+                float xOffset = this.topShearX * this.pathCutBegin;
+                float yOffset = this.topShearY * this.pathCutBegin;
+                float zOffset = start;
+                float xOffsetStepIncrement = this.topShearX * length / steps;
+                float yOffsetStepIncrement = this.topShearY * length / steps;
+
+                float percentOfPath = this.pathCutBegin;
+                zOffset += percentOfPath;
+
+                // sanity checks
+
+                bool done = false;
+
+                while (!done)
+                {
+                    PathNode newNode = new PathNode();
+
+                    newNode.xScale = 1.0f;
+                    if (this.taperX == 0.0f)
+                        newNode.xScale = 1.0f;
+                    else if (this.taperX > 0.0f)
+                        newNode.xScale = 1.0f - percentOfPath * this.taperX;
+                    else newNode.xScale = 1.0f + (1.0f - percentOfPath) * this.taperX;
+
+                    newNode.yScale = 1.0f;
+                    if (this.taperY == 0.0f)
+                        newNode.yScale = 1.0f;
+                    else if (this.taperY > 0.0f)
+                        newNode.yScale = 1.0f - percentOfPath * this.taperY;
+                    else newNode.yScale = 1.0f + (1.0f - percentOfPath) * this.taperY;
+
+                    float twist = twistBegin + twistTotal * percentOfPath;
+
+                    newNode.rotation = new Quat(new Coord(0.0f, 0.0f, 1.0f), twist);
+                    newNode.position = new Coord(xOffset, yOffset, zOffset);
+                    newNode.percentOfPath = percentOfPath;
+
+                    pathNodes.Add(newNode);
+
+                    if (step < steps)
+                    {
+                        step += 1;
+                        percentOfPath += percentOfPathMultiplier;
+                        xOffset += xOffsetStepIncrement;
+                        yOffset += yOffsetStepIncrement;
+                        zOffset += stepSize;
+                        if (percentOfPath > this.pathCutEnd)
+                            done = true;
+                    }
+                    else done = true;
+                }
+            } // end of linear path code
+
+            else // pathType == Circular
+            {
+                float twistTotal = twistEnd - twistBegin;
+
+                // if the profile has a lot of twist, add more layers otherwise the layers may overlap
+                // and the resulting mesh may be quite inaccurate. This method is arbitrary and doesn't
+                // accurately match the viewer
+                float twistTotalAbs = Math.Abs(twistTotal);
+                if (twistTotalAbs > 0.01f)
+                {
+                    if (twistTotalAbs > Math.PI * 1.5f)
+                        steps *= 2;
+                    if (twistTotalAbs > Math.PI * 3.0f)
+                        steps *= 2;
+                }
+
+                float yPathScale = this.holeSizeY * 0.5f;
+                float pathLength = this.pathCutEnd - this.pathCutBegin;
+                float totalSkew = this.skew * 2.0f * pathLength;
+                float skewStart = this.pathCutBegin * 2.0f * this.skew - this.skew;
+                float xOffsetTopShearXFactor = this.topShearX * (0.25f + 0.5f * (0.5f - this.holeSizeY));
+                float yShearCompensation = 1.0f + Math.Abs(this.topShearY) * 0.25f;
+
+                // It's not quite clear what pushY (Y top shear) does, but subtracting it from the start and end
+                // angles appears to approximate it's effects on path cut. Likewise, adding it to the angle used
+                // to calculate the sine for generating the path radius appears to approximate it's effects there
+                // too, but there are some subtle differences in the radius which are noticeable as the prim size
+                // increases and it may affect megaprims quite a bit. The effect of the Y top shear parameter on
+                // the meshes generated with this technique appear nearly identical in shape to the same prims when
+                // displayed by the viewer.
+
+                float startAngle = (twoPi * this.pathCutBegin * this.revolutions) - this.topShearY * 0.9f;
+                float endAngle = (twoPi * this.pathCutEnd * this.revolutions) - this.topShearY * 0.9f;
+                float stepSize = twoPi / this.stepsPerRevolution;
+
+                int step = (int)(startAngle / stepSize);
+                float angle = startAngle;
+
+                bool done = false;
+                while (!done) // loop through the length of the path and add the layers
+                {
+                    PathNode newNode = new PathNode();
+
+                    float xProfileScale = (1.0f - Math.Abs(this.skew)) * this.holeSizeX;
+                    float yProfileScale = this.holeSizeY;
+
+                    float percentOfPath = angle / (twoPi * this.revolutions);
+                    float percentOfAngles = (angle - startAngle) / (endAngle - startAngle);
+
+                    if (this.taperX > 0.01f)
+                        xProfileScale *= 1.0f - percentOfPath * this.taperX;
+                    else if (this.taperX < -0.01f)
+                        xProfileScale *= 1.0f + (1.0f - percentOfPath) * this.taperX;
+
+                    if (this.taperY > 0.01f)
+                        yProfileScale *= 1.0f - percentOfPath * this.taperY;
+                    else if (this.taperY < -0.01f)
+                        yProfileScale *= 1.0f + (1.0f - percentOfPath) * this.taperY;
+
+                    newNode.xScale = xProfileScale;
+                    newNode.yScale = yProfileScale;
+
+                    float radiusScale = 1.0f;
+                    if (this.radius > 0.001f)
+                        radiusScale = 1.0f - this.radius * percentOfPath;
+                    else if (this.radius < 0.001f)
+                        radiusScale = 1.0f + this.radius * (1.0f - percentOfPath);
+
+                    float twist = twistBegin + twistTotal * percentOfPath;
+
+                    float xOffset = 0.5f * (skewStart + totalSkew * percentOfAngles);
+                    xOffset += (float)Math.Sin(angle) * xOffsetTopShearXFactor;
+
+                    float yOffset = yShearCompensation * (float)Math.Cos(angle) * (0.5f - yPathScale) * radiusScale;
+
+                    float zOffset = (float)Math.Sin(angle + this.topShearY) * (0.5f - yPathScale) * radiusScale;
+
+                    newNode.position = new Coord(xOffset, yOffset, zOffset);
+
+                    // now orient the rotation of the profile layer relative to it's position on the path
+                    // adding taperY to the angle used to generate the quat appears to approximate the viewer
+
+                    newNode.rotation = new Quat(new Coord(1.0f, 0.0f, 0.0f), angle + this.topShearY);
+
+                    // next apply twist rotation to the profile layer
+                    if (twistTotal != 0.0f || twistBegin != 0.0f)
+                        newNode.rotation *= new Quat(new Coord(0.0f, 0.0f, 1.0f), twist);
+
+                    newNode.percentOfPath = percentOfPath;
+
+                    pathNodes.Add(newNode);
+
+                    // calculate terms for next iteration
+                    // calculate the angle for the next iteration of the loop
+
+                    if (angle >= endAngle - 0.01)
+                        done = true;
+                    else
+                    {
+                        step += 1;
+                        angle = stepSize * step;
+                        if (angle > endAngle)
+                            angle = endAngle;
+                    }
+                }
+            }
+        }
+    }
+
+    public class PrimMesh
+    {
+        public string errorMessage = "";
+        private const float twoPi = 2.0f * (float)Math.PI;
+
+        public List<Coord> coords;
+        public List<Coord> normals;
+        public List<Face> faces;
+
+        public List<ViewerFace> viewerFaces;
+
+        private int sides = 4;
+        private int hollowSides = 4;
+        private float profileStart = 0.0f;
+        private float profileEnd = 1.0f;
+        private float hollow = 0.0f;
+        public int twistBegin = 0;
+        public int twistEnd = 0;
+        public float topShearX = 0.0f;
+        public float topShearY = 0.0f;
+        public float pathCutBegin = 0.0f;
+        public float pathCutEnd = 1.0f;
+        public float dimpleBegin = 0.0f;
+        public float dimpleEnd = 1.0f;
+        public float skew = 0.0f;
+        public float holeSizeX = 1.0f; // called pathScaleX in pbs
+        public float holeSizeY = 0.25f;
+        public float taperX = 0.0f;
+        public float taperY = 0.0f;
+        public float radius = 0.0f;
+        public float revolutions = 1.0f;
+        public int stepsPerRevolution = 24;
+
+        private int profileOuterFaceNumber = -1;
+        private int profileHollowFaceNumber = -1;
+
+        private bool hasProfileCut = false;
+        private bool hasHollow = false;
+        public bool calcVertexNormals = false;
+        private bool normalsProcessed = false;
+        public bool viewerMode = false;
+        public bool sphereMode = false;
+
+        public int numPrimFaces = 0;
+
+        /// <summary>
+        /// Human readable string representation of the parameters used to create a mesh.
+        /// </summary>
+        /// <returns></returns>
+        public string ParamsToDisplayString()
+        {
+            string s = "";
+            s += "sides..................: " + this.sides.ToString();
+            s += "\nhollowSides..........: " + this.hollowSides.ToString();
+            s += "\nprofileStart.........: " + this.profileStart.ToString();
+            s += "\nprofileEnd...........: " + this.profileEnd.ToString();
+            s += "\nhollow...............: " + this.hollow.ToString();
+            s += "\ntwistBegin...........: " + this.twistBegin.ToString();
+            s += "\ntwistEnd.............: " + this.twistEnd.ToString();
+            s += "\ntopShearX............: " + this.topShearX.ToString();
+            s += "\ntopShearY............: " + this.topShearY.ToString();
+            s += "\npathCutBegin.........: " + this.pathCutBegin.ToString();
+            s += "\npathCutEnd...........: " + this.pathCutEnd.ToString();
+            s += "\ndimpleBegin..........: " + this.dimpleBegin.ToString();
+            s += "\ndimpleEnd............: " + this.dimpleEnd.ToString();
+            s += "\nskew.................: " + this.skew.ToString();
+            s += "\nholeSizeX............: " + this.holeSizeX.ToString();
+            s += "\nholeSizeY............: " + this.holeSizeY.ToString();
+            s += "\ntaperX...............: " + this.taperX.ToString();
+            s += "\ntaperY...............: " + this.taperY.ToString();
+            s += "\nradius...............: " + this.radius.ToString();
+            s += "\nrevolutions..........: " + this.revolutions.ToString();
+            s += "\nstepsPerRevolution...: " + this.stepsPerRevolution.ToString();
+            s += "\nsphereMode...........: " + this.sphereMode.ToString();
+            s += "\nhasProfileCut........: " + this.hasProfileCut.ToString();
+            s += "\nhasHollow............: " + this.hasHollow.ToString();
+            s += "\nviewerMode...........: " + this.viewerMode.ToString();
+
+            return s;
+        }
+
+        public int ProfileOuterFaceNumber
+        {
+            get { return profileOuterFaceNumber; }
+        }
+
+        public int ProfileHollowFaceNumber
+        {
+            get { return profileHollowFaceNumber; }
+        }
+
+        public bool HasProfileCut
+        {
+            get { return hasProfileCut; }
+        }
+
+        public bool HasHollow
+        {
+            get { return hasHollow; }
+        }
+
+
+        /// <summary>
+        /// Constructs a PrimMesh object and creates the profile for extrusion.
+        /// </summary>
+        /// <param name="sides"></param>
+        /// <param name="profileStart"></param>
+        /// <param name="profileEnd"></param>
+        /// <param name="hollow"></param>
+        /// <param name="hollowSides"></param>
+        public PrimMesh(int sides, float profileStart, float profileEnd, float hollow, int hollowSides)
+        {
+            this.coords = new List<Coord>();
+            this.faces = new List<Face>();
+
+            this.sides = sides;
+            this.profileStart = profileStart;
+            this.profileEnd = profileEnd;
+            this.hollow = hollow;
+            this.hollowSides = hollowSides;
+
+            if (sides < 3)
+                this.sides = 3;
+            if (hollowSides < 3)
+                this.hollowSides = 3;
+            if (profileStart < 0.0f)
+                this.profileStart = 0.0f;
+            if (profileEnd > 1.0f)
+                this.profileEnd = 1.0f;
+            if (profileEnd < 0.02f)
+                this.profileEnd = 0.02f;
+            if (profileStart >= profileEnd)
+                this.profileStart = profileEnd - 0.02f;
+            if (hollow > 0.99f)
+                this.hollow = 0.99f;
+            if (hollow < 0.0f)
+                this.hollow = 0.0f;
+        }
+
+        /// <summary>
+        /// Extrudes a profile along a path.
+        /// </summary>
+        public void Extrude(PathType pathType)
+        {
+            bool needEndFaces = false;
+
+            this.coords = new List<Coord>();
+            this.faces = new List<Face>();
+
+            if (this.viewerMode)
+            {
+                this.viewerFaces = new List<ViewerFace>();
+                this.calcVertexNormals = true;
+            }
+
+            if (this.calcVertexNormals)
+                this.normals = new List<Coord>();
+
+            int steps = 1;
+
+            float length = this.pathCutEnd - this.pathCutBegin;
+            normalsProcessed = false;
+
+            if (this.viewerMode && this.sides == 3)
+            {
+                // prisms don't taper well so add some vertical resolution
+                // other prims may benefit from this but just do prisms for now
+                if (Math.Abs(this.taperX) > 0.01 || Math.Abs(this.taperY) > 0.01)
+                    steps = (int)(steps * 4.5 * length);
+            }
+
+            if (this.sphereMode)
+                this.hasProfileCut = this.profileEnd - this.profileStart < 0.4999f;
+            else
+                this.hasProfileCut = this.profileEnd - this.profileStart < 0.9999f;
+            this.hasHollow = (this.hollow > 0.001f);
+
+            float twistBegin = this.twistBegin / 360.0f * twoPi;
+            float twistEnd = this.twistEnd / 360.0f * twoPi;
+            float twistTotal = twistEnd - twistBegin;
+            float twistTotalAbs = Math.Abs(twistTotal);
+            if (twistTotalAbs > 0.01f)
+                steps += (int)(twistTotalAbs * 3.66); //  dahlia's magic number
+
+            float hollow = this.hollow;
+
+            if (pathType == PathType.Circular)
+            {
+                needEndFaces = false;
+                if (this.pathCutBegin != 0.0f || this.pathCutEnd != 1.0f)
+                    needEndFaces = true;
+                else if (this.taperX != 0.0f || this.taperY != 0.0f)
+                    needEndFaces = true;
+                else if (this.skew != 0.0f)
+                    needEndFaces = true;
+                else if (twistTotal != 0.0f)
+                    needEndFaces = true;
+                else if (this.radius != 0.0f)
+                    needEndFaces = true;
+            }
+            else needEndFaces = true;
+
+            // sanity checks
+            float initialProfileRot = 0.0f;
+            if (pathType == PathType.Circular)
+            {
+                if (this.sides == 3)
+                {
+                    initialProfileRot = (float)Math.PI;
+                    if (this.hollowSides == 4)
+                    {
+                        if (hollow > 0.7f)
+                            hollow = 0.7f;
+                        hollow *= 0.707f;
+                    }
+                    else hollow *= 0.5f;
+                }
+                else if (this.sides == 4)
+                {
+                    initialProfileRot = 0.25f * (float)Math.PI;
+                    if (this.hollowSides != 4)
+                        hollow *= 0.707f;
+                }
+                else if (this.sides > 4)
+                {
+                    initialProfileRot = (float)Math.PI;
+                    if (this.hollowSides == 4)
+                    {
+                        if (hollow > 0.7f)
+                            hollow = 0.7f;
+                        hollow /= 0.7f;
+                    }
+                }
+            }
+            else
+            {
+                if (this.sides == 3)
+                {
+                    if (this.hollowSides == 4)
+                    {
+                        if (hollow > 0.7f)
+                            hollow = 0.7f;
+                        hollow *= 0.707f;
+                    }
+                    else hollow *= 0.5f;
+                }
+                else if (this.sides == 4)
+                {
+                    initialProfileRot = 1.25f * (float)Math.PI;
+                    if (this.hollowSides != 4)
+                        hollow *= 0.707f;
+                }
+                else if (this.sides == 24 && this.hollowSides == 4)
+                    hollow *= 1.414f;
+            }
+
+            Profile profile = new Profile(this.sides, this.profileStart, this.profileEnd, hollow, this.hollowSides, true, calcVertexNormals);
+            this.errorMessage = profile.errorMessage;
+
+            this.numPrimFaces = profile.numPrimFaces;
+
+            int cut1FaceNumber = profile.bottomFaceNumber + 1;
+            int cut2FaceNumber = cut1FaceNumber + 1;
+            if (!needEndFaces)
+            {
+                cut1FaceNumber -= 2;
+                cut2FaceNumber -= 2;
+            }
+
+            profileOuterFaceNumber = profile.outerFaceNumber;
+            if (!needEndFaces)
+                profileOuterFaceNumber--;
+
+            if (hasHollow)
+            {
+                profileHollowFaceNumber = profile.hollowFaceNumber;
+                if (!needEndFaces)
+                    profileHollowFaceNumber--;
+            }
+
+            int cut1Vert = -1;
+            int cut2Vert = -1;
+            if (hasProfileCut)
+            {
+                cut1Vert = hasHollow ? profile.coords.Count - 1 : 0;
+                cut2Vert = hasHollow ? profile.numOuterVerts - 1 : profile.numOuterVerts;
+            }
+
+            if (initialProfileRot != 0.0f)
+            {
+                profile.AddRot(new Quat(new Coord(0.0f, 0.0f, 1.0f), initialProfileRot));
+                if (viewerMode)
+                    profile.MakeFaceUVs();
+            }
+
+            Coord lastCutNormal1 = new Coord();
+            Coord lastCutNormal2 = new Coord();
+            float thisV = 0.0f;
+            float lastV = 0.0f;
+
+            Path path = new Path();
+            path.twistBegin = twistBegin;
+            path.twistEnd = twistEnd;
+            path.topShearX = topShearX;
+            path.topShearY = topShearY;
+            path.pathCutBegin = pathCutBegin;
+            path.pathCutEnd = pathCutEnd;
+            path.dimpleBegin = dimpleBegin;
+            path.dimpleEnd = dimpleEnd;
+            path.skew = skew;
+            path.holeSizeX = holeSizeX;
+            path.holeSizeY = holeSizeY;
+            path.taperX = taperX;
+            path.taperY = taperY;
+            path.radius = radius;
+            path.revolutions = revolutions;
+            path.stepsPerRevolution = stepsPerRevolution;
+
+            path.Create(pathType, steps);
+
+            for (int nodeIndex = 0; nodeIndex < path.pathNodes.Count; nodeIndex++)
+            {
+                PathNode node = path.pathNodes[nodeIndex];
+                Profile newLayer = profile.Copy();
+                newLayer.Scale(node.xScale, node.yScale);
+
+                newLayer.AddRot(node.rotation);
+                newLayer.AddPos(node.position);
+
+                if (needEndFaces && nodeIndex == 0)
+                {
+                    newLayer.FlipNormals();
+
+                    // add the bottom faces to the viewerFaces list
+                    if (this.viewerMode)
+                    {
+                        Coord faceNormal = newLayer.faceNormal;
+                        ViewerFace newViewerFace = new ViewerFace(profile.bottomFaceNumber);
+                        int numFaces = newLayer.faces.Count;
+                        List<Face> faces = newLayer.faces;
+
+                        for (int i = 0; i < numFaces; i++)
+                        {
+                            Face face = faces[i];
+                            newViewerFace.v1 = newLayer.coords[face.v1];
+                            newViewerFace.v2 = newLayer.coords[face.v2];
+                            newViewerFace.v3 = newLayer.coords[face.v3];
+
+                            newViewerFace.coordIndex1 = face.v1;
+                            newViewerFace.coordIndex2 = face.v2;
+                            newViewerFace.coordIndex3 = face.v3;
+
+                            newViewerFace.n1 = faceNormal;
+                            newViewerFace.n2 = faceNormal;
+                            newViewerFace.n3 = faceNormal;
+
+                            newViewerFace.uv1 = newLayer.faceUVs[face.v1];
+                            newViewerFace.uv2 = newLayer.faceUVs[face.v2];
+                            newViewerFace.uv3 = newLayer.faceUVs[face.v3];
+
+                            if (pathType == PathType.Linear)
+                            {
+                                newViewerFace.uv1.Flip();
+                                newViewerFace.uv2.Flip();
+                                newViewerFace.uv3.Flip();
+                            }
+
+                            this.viewerFaces.Add(newViewerFace);
+                        }
+                    }
+                } // if (nodeIndex == 0)
+
+                // append this layer
+
+                int coordsLen = this.coords.Count;
+                newLayer.AddValue2FaceVertexIndices(coordsLen);
+
+                this.coords.AddRange(newLayer.coords);
+
+                if (this.calcVertexNormals)
+                {
+                    newLayer.AddValue2FaceNormalIndices(this.normals.Count);
+                    this.normals.AddRange(newLayer.vertexNormals);
+                }
+
+                if (node.percentOfPath < this.pathCutBegin + 0.01f || node.percentOfPath > this.pathCutEnd - 0.01f)
+                    this.faces.AddRange(newLayer.faces);
+
+                // fill faces between layers
+
+                int numVerts = newLayer.coords.Count;
+                Face newFace1 = new Face();
+                Face newFace2 = new Face();
+
+                thisV = 1.0f - node.percentOfPath;
+
+                if (nodeIndex > 0)
+                {
+                    int startVert = coordsLen + 1;
+                    int endVert = this.coords.Count;
+
+                    if (sides < 5 || this.hasProfileCut || this.hasHollow)
+                        startVert--;
+
+                    for (int i = startVert; i < endVert; i++)
+                    {
+                        int iNext = i + 1;
+                        if (i == endVert - 1)
+                            iNext = startVert;
+
+                        int whichVert = i - startVert;
+
+                        newFace1.v1 = i;
+                        newFace1.v2 = i - numVerts;
+                        newFace1.v3 = iNext;
+
+                        newFace1.n1 = newFace1.v1;
+                        newFace1.n2 = newFace1.v2;
+                        newFace1.n3 = newFace1.v3;
+                        this.faces.Add(newFace1);
+
+                        newFace2.v1 = iNext;
+                        newFace2.v2 = i - numVerts;
+                        newFace2.v3 = iNext - numVerts;
+
+                        newFace2.n1 = newFace2.v1;
+                        newFace2.n2 = newFace2.v2;
+                        newFace2.n3 = newFace2.v3;
+                        this.faces.Add(newFace2);
+
+                        if (this.viewerMode)
+                        {
+                            // add the side faces to the list of viewerFaces here
+
+                            int primFaceNum = profile.faceNumbers[whichVert];
+                            if (!needEndFaces)
+                                primFaceNum -= 1;
+
+                            ViewerFace newViewerFace1 = new ViewerFace(primFaceNum);
+                            ViewerFace newViewerFace2 = new ViewerFace(primFaceNum);
+
+                            int uIndex = whichVert;
+                            if (!hasHollow && sides > 4 && uIndex < newLayer.us.Count - 1)
+                            {
+                                uIndex++;
+                            }
+
+                            float u1 = newLayer.us[uIndex];
+                            float u2 = 1.0f;
+                            if (uIndex < (int)newLayer.us.Count - 1)
+                                u2 = newLayer.us[uIndex + 1];
+
+                            if (whichVert == cut1Vert || whichVert == cut2Vert)
+                            {
+                                u1 = 0.0f;
+                                u2 = 1.0f;
+                            }
+                            else if (sides < 5)
+                            {
+                                if (whichVert < profile.numOuterVerts)
+                                { // boxes and prisms have one texture face per side of the prim, so the U values have to be scaled
+                                    // to reflect the entire texture width
+                                    u1 *= sides;
+                                    u2 *= sides;
+                                    u2 -= (int)u1;
+                                    u1 -= (int)u1;
+                                    if (u2 < 0.1f)
+                                        u2 = 1.0f;
+                                }
+                            }
+
+                            if (this.sphereMode)
+                            {
+                                if (whichVert != cut1Vert && whichVert != cut2Vert)
+                                {
+                                    u1 = u1 * 2.0f - 1.0f;
+                                    u2 = u2 * 2.0f - 1.0f;
+
+                                    if (whichVert >= newLayer.numOuterVerts)
+                                    {
+                                        u1 -= hollow;
+                                        u2 -= hollow;
+                                    }
+
+                                }
+                            }
+
+                            newViewerFace1.uv1.U = u1;
+                            newViewerFace1.uv2.U = u1;
+                            newViewerFace1.uv3.U = u2;
+
+                            newViewerFace1.uv1.V = thisV;
+                            newViewerFace1.uv2.V = lastV;
+                            newViewerFace1.uv3.V = thisV;
+
+                            newViewerFace2.uv1.U = u2;
+                            newViewerFace2.uv2.U = u1;
+                            newViewerFace2.uv3.U = u2;
+
+                            newViewerFace2.uv1.V = thisV;
+                            newViewerFace2.uv2.V = lastV;
+                            newViewerFace2.uv3.V = lastV;
+
+                            newViewerFace1.v1 = this.coords[newFace1.v1];
+                            newViewerFace1.v2 = this.coords[newFace1.v2];
+                            newViewerFace1.v3 = this.coords[newFace1.v3];
+
+                            newViewerFace2.v1 = this.coords[newFace2.v1];
+                            newViewerFace2.v2 = this.coords[newFace2.v2];
+                            newViewerFace2.v3 = this.coords[newFace2.v3];
+
+                            newViewerFace1.coordIndex1 = newFace1.v1;
+                            newViewerFace1.coordIndex2 = newFace1.v2;
+                            newViewerFace1.coordIndex3 = newFace1.v3;
+
+                            newViewerFace2.coordIndex1 = newFace2.v1;
+                            newViewerFace2.coordIndex2 = newFace2.v2;
+                            newViewerFace2.coordIndex3 = newFace2.v3;
+
+                            // profile cut faces
+                            if (whichVert == cut1Vert)
+                            {
+                                newViewerFace1.primFaceNumber = cut1FaceNumber;
+                                newViewerFace2.primFaceNumber = cut1FaceNumber;
+                                newViewerFace1.n1 = newLayer.cutNormal1;
+                                newViewerFace1.n2 = newViewerFace1.n3 = lastCutNormal1;
+
+                                newViewerFace2.n1 = newViewerFace2.n3 = newLayer.cutNormal1;
+                                newViewerFace2.n2 = lastCutNormal1;
+                            }
+                            else if (whichVert == cut2Vert)
+                            {
+                                newViewerFace1.primFaceNumber = cut2FaceNumber;
+                                newViewerFace2.primFaceNumber = cut2FaceNumber;
+                                newViewerFace1.n1 = newLayer.cutNormal2;
+                                newViewerFace1.n2 = lastCutNormal2;
+                                newViewerFace1.n3 = lastCutNormal2;
+
+                                newViewerFace2.n1 = newLayer.cutNormal2;
+                                newViewerFace2.n3 = newLayer.cutNormal2;
+                                newViewerFace2.n2 = lastCutNormal2;
+                            }
+
+                            else // outer and hollow faces
+                            {
+                                if ((sides < 5 && whichVert < newLayer.numOuterVerts) || (hollowSides < 5 && whichVert >= newLayer.numOuterVerts))
+                                { // looks terrible when path is twisted... need vertex normals here
+                                    newViewerFace1.CalcSurfaceNormal();
+                                    newViewerFace2.CalcSurfaceNormal();
+                                }
+                                else
+                                {
+                                    newViewerFace1.n1 = this.normals[newFace1.n1];
+                                    newViewerFace1.n2 = this.normals[newFace1.n2];
+                                    newViewerFace1.n3 = this.normals[newFace1.n3];
+
+                                    newViewerFace2.n1 = this.normals[newFace2.n1];
+                                    newViewerFace2.n2 = this.normals[newFace2.n2];
+                                    newViewerFace2.n3 = this.normals[newFace2.n3];
+                                }
+                            }
+
+                            this.viewerFaces.Add(newViewerFace1);
+                            this.viewerFaces.Add(newViewerFace2);
+
+                        }
+                    }
+                }
+
+                lastCutNormal1 = newLayer.cutNormal1;
+                lastCutNormal2 = newLayer.cutNormal2;
+                lastV = thisV;
+
+                if (needEndFaces && nodeIndex == path.pathNodes.Count - 1 && viewerMode)
+                {
+                    // add the top faces to the viewerFaces list here
+                    Coord faceNormal = newLayer.faceNormal;
+                    ViewerFace newViewerFace = new ViewerFace(0);
+                    int numFaces = newLayer.faces.Count;
+                    List<Face> faces = newLayer.faces;
+
+                    for (int i = 0; i < numFaces; i++)
+                    {
+                        Face face = faces[i];
+                        newViewerFace.v1 = newLayer.coords[face.v1 - coordsLen];
+                        newViewerFace.v2 = newLayer.coords[face.v2 - coordsLen];
+                        newViewerFace.v3 = newLayer.coords[face.v3 - coordsLen];
+
+                        newViewerFace.coordIndex1 = face.v1 - coordsLen;
+                        newViewerFace.coordIndex2 = face.v2 - coordsLen;
+                        newViewerFace.coordIndex3 = face.v3 - coordsLen;
+
+                        newViewerFace.n1 = faceNormal;
+                        newViewerFace.n2 = faceNormal;
+                        newViewerFace.n3 = faceNormal;
+
+                        newViewerFace.uv1 = newLayer.faceUVs[face.v1 - coordsLen];
+                        newViewerFace.uv2 = newLayer.faceUVs[face.v2 - coordsLen];
+                        newViewerFace.uv3 = newLayer.faceUVs[face.v3 - coordsLen];
+
+                        if (pathType == PathType.Linear)
+                        {
+                            newViewerFace.uv1.Flip();
+                            newViewerFace.uv2.Flip();
+                            newViewerFace.uv3.Flip();
+                        }
+
+                        this.viewerFaces.Add(newViewerFace);
+                    }
+                }
+
+
+            } // for (int nodeIndex = 0; nodeIndex < path.pathNodes.Count; nodeIndex++)
+
+        }
+
+
+        /// <summary>
+        /// DEPRICATED - use Extrude(PathType.Linear) instead
+        /// Extrudes a profile along a straight line path. Used for prim types box, cylinder, and prism.
+        /// </summary>
+        /// 
+        public void ExtrudeLinear()
+        {
+            this.Extrude(PathType.Linear);
+        }
+
+
+        /// <summary>
+        /// DEPRICATED - use Extrude(PathType.Circular) instead
+        /// Extrude a profile into a circular path prim mesh. Used for prim types torus, tube, and ring.
+        /// </summary>
+        /// 
+        public void ExtrudeCircular()
+        {
+            this.Extrude(PathType.Circular);
+        }
+
+
+        private Coord SurfaceNormal(Coord c1, Coord c2, Coord c3)
+        {
+            Coord edge1 = new Coord(c2.X - c1.X, c2.Y - c1.Y, c2.Z - c1.Z);
+            Coord edge2 = new Coord(c3.X - c1.X, c3.Y - c1.Y, c3.Z - c1.Z);
+
+            Coord normal = Coord.Cross(edge1, edge2);
+
+            normal.Normalize();
+
+            return normal;
+        }
+
+        private Coord SurfaceNormal(Face face)
+        {
+            return SurfaceNormal(this.coords[face.v1], this.coords[face.v2], this.coords[face.v3]);
+        }
+
+        /// <summary>
+        /// Calculate the surface normal for a face in the list of faces
+        /// </summary>
+        /// <param name="faceIndex"></param>
+        /// <returns></returns>
+        public Coord SurfaceNormal(int faceIndex)
+        {
+            int numFaces = this.faces.Count;
+            if (faceIndex < 0 || faceIndex >= numFaces)
+                throw new Exception("faceIndex out of range");
+
+            return SurfaceNormal(this.faces[faceIndex]);
+        }
+
+        /// <summary>
+        /// Duplicates a PrimMesh object. All object properties are copied by value, including lists.
+        /// </summary>
+        /// <returns></returns>
+        public PrimMesh Copy()
+        {
+            PrimMesh copy = new PrimMesh(this.sides, this.profileStart, this.profileEnd, this.hollow, this.hollowSides);
+            copy.twistBegin = this.twistBegin;
+            copy.twistEnd = this.twistEnd;
+            copy.topShearX = this.topShearX;
+            copy.topShearY = this.topShearY;
+            copy.pathCutBegin = this.pathCutBegin;
+            copy.pathCutEnd = this.pathCutEnd;
+            copy.dimpleBegin = this.dimpleBegin;
+            copy.dimpleEnd = this.dimpleEnd;
+            copy.skew = this.skew;
+            copy.holeSizeX = this.holeSizeX;
+            copy.holeSizeY = this.holeSizeY;
+            copy.taperX = this.taperX;
+            copy.taperY = this.taperY;
+            copy.radius = this.radius;
+            copy.revolutions = this.revolutions;
+            copy.stepsPerRevolution = this.stepsPerRevolution;
+            copy.calcVertexNormals = this.calcVertexNormals;
+            copy.normalsProcessed = this.normalsProcessed;
+            copy.viewerMode = this.viewerMode;
+            copy.numPrimFaces = this.numPrimFaces;
+            copy.errorMessage = this.errorMessage;
+
+            copy.coords = new List<Coord>(this.coords);
+            copy.faces = new List<Face>(this.faces);
+            copy.viewerFaces = new List<ViewerFace>(this.viewerFaces);
+            copy.normals = new List<Coord>(this.normals);
+
+            return copy;
+        }
+
+        /// <summary>
+        /// Calculate surface normals for all of the faces in the list of faces in this mesh
+        /// </summary>
+        public void CalcNormals()
+        {
+            if (normalsProcessed)
+                return;
+
+            normalsProcessed = true;
+
+            int numFaces = faces.Count;
+
+            if (!this.calcVertexNormals)
+                this.normals = new List<Coord>();
+
+            for (int i = 0; i < numFaces; i++)
+            {
+                Face face = faces[i];
+
+                this.normals.Add(SurfaceNormal(i).Normalize());
+
+                int normIndex = normals.Count - 1;
+                face.n1 = normIndex;
+                face.n2 = normIndex;
+                face.n3 = normIndex;
+
+                this.faces[i] = face;
+            }
+        }
+
+        /// <summary>
+        /// Adds a value to each XYZ vertex coordinate in the mesh
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <param name="z"></param>
+        public void AddPos(float x, float y, float z)
+        {
+            int i;
+            int numVerts = this.coords.Count;
+            Coord vert;
+
+            for (i = 0; i < numVerts; i++)
+            {
+                vert = this.coords[i];
+                vert.X += x;
+                vert.Y += y;
+                vert.Z += z;
+                this.coords[i] = vert;
+            }
+
+            if (this.viewerFaces != null)
+            {
+                int numViewerFaces = this.viewerFaces.Count;
+
+                for (i = 0; i < numViewerFaces; i++)
+                {
+                    ViewerFace v = this.viewerFaces[i];
+                    v.AddPos(x, y, z);
+                    this.viewerFaces[i] = v;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Rotates the mesh
+        /// </summary>
+        /// <param name="q"></param>
+        public void AddRot(Quat q)
+        {
+            int i;
+            int numVerts = this.coords.Count;
+
+            for (i = 0; i < numVerts; i++)
+                this.coords[i] *= q;
+
+            if (this.normals != null)
+            {
+                int numNormals = this.normals.Count;
+                for (i = 0; i < numNormals; i++)
+                    this.normals[i] *= q;
+            }
+
+            if (this.viewerFaces != null)
+            {
+                int numViewerFaces = this.viewerFaces.Count;
+
+                for (i = 0; i < numViewerFaces; i++)
+                {
+                    ViewerFace v = this.viewerFaces[i];
+                    v.v1 *= q;
+                    v.v2 *= q;
+                    v.v3 *= q;
+
+                    v.n1 *= q;
+                    v.n2 *= q;
+                    v.n3 *= q;
+                    this.viewerFaces[i] = v;
+                }
+            }
+        }
+
+#if VERTEX_INDEXER
+        public VertexIndexer GetVertexIndexer()
+        {
+            if (this.viewerMode && this.viewerFaces.Count > 0)
+                return new VertexIndexer(this);
+            return null;
+        }
+#endif
+
+        /// <summary>
+        /// Scales the mesh
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <param name="z"></param>
+        public void Scale(float x, float y, float z)
+        {
+            int i;
+            int numVerts = this.coords.Count;
+            //Coord vert;
+
+            Coord m = new Coord(x, y, z);
+            for (i = 0; i < numVerts; i++)
+                this.coords[i] *= m;
+
+            if (this.viewerFaces != null)
+            {
+                int numViewerFaces = this.viewerFaces.Count;
+                for (i = 0; i < numViewerFaces; i++)
+                {
+                    ViewerFace v = this.viewerFaces[i];
+                    v.v1 *= m;
+                    v.v2 *= m;
+                    v.v3 *= m;
+                    this.viewerFaces[i] = v;
+                }
+
+            }
+
+        }
+
+        /// <summary>
+        /// Dumps the mesh to a Blender compatible "Raw" format file
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="name"></param>
+        /// <param name="title"></param>
+        public void DumpRaw(String path, String name, String title)
+        {
+            if (path == null)
+                return;
+            String fileName = name + "_" + title + ".raw";
+            String completePath = System.IO.Path.Combine(path, fileName);
+            StreamWriter sw = new StreamWriter(completePath);
+
+            for (int i = 0; i < this.faces.Count; i++)
+            {
+                string s = this.coords[this.faces[i].v1].ToString();
+                s += " " + this.coords[this.faces[i].v2].ToString();
+                s += " " + this.coords[this.faces[i].v3].ToString();
+
+                sw.WriteLine(s);
+            }
+
+            sw.Close();
+        }
+    }
+}
diff --git a/OpenSim/Region/Physics/UbitMeshing/SculptMap.cs b/OpenSim/Region/Physics/UbitMeshing/SculptMap.cs
new file mode 100644
index 0000000..1c75db6
--- /dev/null
+++ b/OpenSim/Region/Physics/UbitMeshing/SculptMap.cs
@@ -0,0 +1,244 @@
+/*
+ * Copyright (c) Contributors
+ * 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.Text;
+
+using System.Drawing;
+using System.Drawing.Imaging;
+
+namespace PrimMesher
+{
+    public class SculptMap
+    {
+        public int width;
+        public int height;
+        public byte[] redBytes;
+        public byte[] greenBytes;
+        public byte[] blueBytes;
+
+        public SculptMap()
+        {
+        }
+
+        public SculptMap(Bitmap bm, int lod)
+        {
+            int bmW = bm.Width;
+            int bmH = bm.Height;
+
+            if (bmW == 0 || bmH == 0)
+                throw new Exception("SculptMap: bitmap has no data");
+
+            int numLodPixels = lod * lod;  // (32 * 2)^2  = 64^2 pixels for default sculpt map image
+
+            bool needsScaling = false;
+            bool smallMap = false;
+
+            width = bmW;
+            height = bmH;
+
+            while (width * height > numLodPixels * 4)
+            {
+                width >>= 1;
+                height >>= 1;
+                needsScaling = true;
+            }
+
+            try
+            {
+                if (needsScaling)
+                    bm = ScaleImage(bm, width, height);
+            }
+
+            catch (Exception e)
+            {
+                throw new Exception("Exception in ScaleImage(): e: " + e.ToString());
+            }
+
+            if (width * height > numLodPixels)
+            {
+                smallMap = false;
+                width >>= 1;
+                height >>= 1;
+            }
+            else
+                smallMap = true;
+
+            int numBytes = (width + 1) * (height + 1);
+            redBytes = new byte[numBytes];
+            greenBytes = new byte[numBytes];
+            blueBytes = new byte[numBytes];
+
+            int byteNdx = 0;
+            Color c;
+
+            try
+            {
+                for (int y = 0; y <= height; y++)
+                {
+                    for (int x = 0; x < width; x++)
+                    {
+                        if (smallMap)
+                            c = bm.GetPixel(x,  y < height ? y : y - 1);
+                        else
+                            c = bm.GetPixel(x * 2, y < height ? y * 2 : y * 2 - 1);
+
+                        redBytes[byteNdx] = c.R;
+                        greenBytes[byteNdx] = c.G;
+                        blueBytes[byteNdx] = c.B;
+
+                        ++byteNdx;
+                    }
+
+                    if (smallMap)
+                        c = bm.GetPixel(width - 1, y < height ? y : y - 1);
+                    else
+                        c = bm.GetPixel(width * 2 - 1, y < height ? y * 2 : y * 2 - 1);
+
+                    redBytes[byteNdx] = c.R;
+                    greenBytes[byteNdx] = c.G;
+                    blueBytes[byteNdx] = c.B;
+
+                    ++byteNdx;
+                }
+            }
+            catch (Exception e)
+            {
+                throw new Exception("Caught exception processing byte arrays in SculptMap(): e: " + e.ToString());
+            }
+
+            width++;
+            height++;
+        }
+
+        public List<List<Coord>> ToRows(bool mirror)
+        {
+            int numRows = height;
+            int numCols = width;
+
+            List<List<Coord>> rows = new List<List<Coord>>(numRows);
+
+            float pixScale = 1.0f / 255;
+
+            int rowNdx, colNdx;
+            int smNdx = 0;
+
+            for (rowNdx = 0; rowNdx < numRows; rowNdx++)
+            {
+                List<Coord> row = new List<Coord>(numCols);
+                for (colNdx = 0; colNdx < numCols; colNdx++)
+                {
+
+                    if (mirror)
+                        row.Add(new Coord(-((float)redBytes[smNdx] * pixScale - 0.5f), ((float)greenBytes[smNdx] * pixScale - 0.5f), (float)blueBytes[smNdx] * pixScale - 0.5f));
+                    else
+                        row.Add(new Coord((float)redBytes[smNdx] * pixScale - 0.5f, (float)greenBytes[smNdx] * pixScale - 0.5f, (float)blueBytes[smNdx] * pixScale - 0.5f));
+
+                    ++smNdx;
+                }
+                rows.Add(row);
+            }
+            return rows;
+        }
+
+        private Bitmap ScaleImage(Bitmap srcImage, int destWidth, int destHeight)
+        {
+
+            Bitmap scaledImage = new Bitmap(destWidth, destHeight, PixelFormat.Format24bppRgb);
+
+            Color c;
+            
+
+            // will let last step to be eventually diferent, as seems to be in sl
+
+            float xscale = (float)srcImage.Width / (float)destWidth;
+            float yscale = (float)srcImage.Height / (float)destHeight;
+
+            int lastsx = srcImage.Width - 1;
+            int lastsy = srcImage.Height - 1;
+            int lastdx = destWidth - 1;
+            int lastdy = destHeight - 1;
+
+            float sy = 0.5f;
+            float sx;
+
+            for (int y = 0; y < lastdy; y++)
+            {
+                sx = 0.5f;
+                for (int x = 0; x < lastdx; x++)
+                {
+                    try
+                    {
+                        c = srcImage.GetPixel((int)(sx), (int)(sy));
+                        scaledImage.SetPixel(x, y, Color.FromArgb(c.R, c.G, c.B));
+                    }
+                    catch (IndexOutOfRangeException)
+                    {
+                    }
+                    sx += xscale;
+                }
+                try
+                {
+                    c = srcImage.GetPixel(lastsx, (int)(sy));
+                    scaledImage.SetPixel(lastdx, y, Color.FromArgb(c.R, c.G, c.B));
+                }
+                catch (IndexOutOfRangeException)
+                {
+                }
+
+                sy += yscale;
+            }
+
+            sx = 0.5f;
+            for (int x = 0; x < lastdx; x++)
+            {
+                try
+                {
+                    c = srcImage.GetPixel((int)(sx), lastsy);
+                    scaledImage.SetPixel(x, lastdy, Color.FromArgb(c.R, c.G, c.B));
+                }
+                catch (IndexOutOfRangeException)
+                {
+                }
+
+                sx += xscale;
+            }
+            try
+            {
+                c = srcImage.GetPixel(lastsx, lastsy);
+                scaledImage.SetPixel(lastdx, lastdy, Color.FromArgb(c.R, c.G, c.B));
+            }
+            catch (IndexOutOfRangeException)
+            {
+            }
+
+            srcImage.Dispose();
+            return scaledImage;
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Physics/UbitMeshing/SculptMesh.cs b/OpenSim/Region/Physics/UbitMeshing/SculptMesh.cs
new file mode 100644
index 0000000..bc1375b
--- /dev/null
+++ b/OpenSim/Region/Physics/UbitMeshing/SculptMesh.cs
@@ -0,0 +1,220 @@
+/*
+ * Copyright (c) Contributors
+ * 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.Text;
+using System.IO;
+
+using System.Drawing;
+using System.Drawing.Imaging;
+
+namespace PrimMesher
+{
+
+    public class SculptMesh
+    {
+        public List<Coord> coords;
+        public List<Face> faces;
+
+        public enum SculptType { sphere = 1, torus = 2, plane = 3, cylinder = 4 };
+
+
+        public SculptMesh(Bitmap sculptBitmap, SculptType sculptType, int lod, bool mirror, bool invert)
+        {
+            if (mirror)
+                invert = !invert;
+
+            SculptMap smap = new SculptMap(sculptBitmap, lod);
+
+            List<List<Coord>> rows = smap.ToRows(mirror);
+
+            _SculptMesh(rows, sculptType, invert);
+        }
+
+        private void _SculptMesh(List<List<Coord>> rows, SculptType sculptType, bool invert)
+        {
+            coords = new List<Coord>();
+            faces = new List<Face>();
+
+            sculptType = (SculptType)(((int)sculptType) & 0x07);
+
+            int width = rows[0].Count;
+
+            int p1, p2, p3, p4;
+
+            int imageX, imageY;
+
+            if (sculptType != SculptType.plane)
+            {
+                if (rows.Count % 2 == 0)
+                {
+                    for (int rowNdx = 0; rowNdx < rows.Count; rowNdx++)
+                        rows[rowNdx].Add(rows[rowNdx][0]);
+                }
+                else
+                {
+                    int lastIndex = rows[0].Count - 1;
+
+                    for (int i = 0; i < rows.Count; i++)
+                        rows[i][0] = rows[i][lastIndex];
+                }
+            }
+
+            Coord topPole = rows[0][width / 2];
+            Coord bottomPole = rows[rows.Count - 1][width / 2];
+
+            if (sculptType == SculptType.sphere)
+            {
+                if (rows.Count % 2 == 0)
+                {
+                    int count = rows[0].Count;
+                    List<Coord> topPoleRow = new List<Coord>(count);
+                    List<Coord> bottomPoleRow = new List<Coord>(count);
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        topPoleRow.Add(topPole);
+                        bottomPoleRow.Add(bottomPole);
+                    }
+                    rows.Insert(0, topPoleRow);
+                    rows.Add(bottomPoleRow);
+                }
+                else
+                {
+                    int count = rows[0].Count;
+
+                    List<Coord> topPoleRow = rows[0];
+                    List<Coord> bottomPoleRow = rows[rows.Count - 1];
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        topPoleRow[i] = topPole;
+                        bottomPoleRow[i] = bottomPole;
+                    }
+                }
+            }
+
+            if (sculptType == SculptType.torus)
+                rows.Add(rows[0]);
+
+            int coordsDown = rows.Count;
+            int coordsAcross = rows[0].Count;
+
+            float widthUnit = 1.0f / (coordsAcross - 1);
+            float heightUnit = 1.0f / (coordsDown - 1);
+
+            for (imageY = 0; imageY < coordsDown; imageY++)
+            {
+                int rowOffset = imageY * coordsAcross;
+
+                for (imageX = 0; imageX < coordsAcross; imageX++)
+                {
+                    /*
+                    *   p1-----p2
+                    *   | \ f2 |
+                    *   |   \  |
+                    *   | f1  \|
+                    *   p3-----p4
+                    */
+
+                    p4 = rowOffset + imageX;
+                    p3 = p4 - 1;
+
+                    p2 = p4 - coordsAcross;
+                    p1 = p3 - coordsAcross;
+
+                    this.coords.Add(rows[imageY][imageX]);
+
+                    if (imageY > 0 && imageX > 0)
+                    {
+                        Face f1, f2;
+
+                            if (invert)
+                            {
+                                f1 = new Face(p1, p4, p3);
+                                f2 = new Face(p1, p2, p4);
+                            }
+                            else
+                            {
+                                f1 = new Face(p1, p3, p4);
+                                f2 = new Face(p1, p4, p2);
+                            }
+
+                        this.faces.Add(f1);
+                        this.faces.Add(f2);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Duplicates a SculptMesh object. All object properties are copied by value, including lists.
+        /// </summary>
+        /// <returns></returns>
+        public SculptMesh Copy()
+        {
+            return new SculptMesh(this);
+        }
+
+        public SculptMesh(SculptMesh sm)
+        {
+            coords = new List<Coord>(sm.coords);
+            faces = new List<Face>(sm.faces);
+        }
+
+        public void Scale(float x, float y, float z)
+        {
+            int i;
+            int numVerts = this.coords.Count;
+
+            Coord m = new Coord(x, y, z);
+            for (i = 0; i < numVerts; i++)
+                this.coords[i] *= m;
+        }
+
+        public void DumpRaw(String path, String name, String title)
+        {
+            if (path == null)
+                return;
+            String fileName = name + "_" + title + ".raw";
+            String completePath = System.IO.Path.Combine(path, fileName);
+            StreamWriter sw = new StreamWriter(completePath);
+
+            for (int i = 0; i < this.faces.Count; i++)
+            {
+                string s = this.coords[this.faces[i].v1].ToString();
+                s += " " + this.coords[this.faces[i].v2].ToString();
+                s += " " + this.coords[this.faces[i].v3].ToString();
+
+                sw.WriteLine(s);
+            }
+
+            sw.Close();
+        }
+    }
+}
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/UbitOdePlugin/AssemblyInfo.cs
new file mode 100644
index 0000000..d46341b
--- /dev/null
+++ b/OpenSim/Region/Physics/UbitOdePlugin/AssemblyInfo.cs
@@ -0,0 +1,58 @@
+/*
+ * 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.Reflection;
+using System.Runtime.InteropServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly : AssemblyTitle("OdePlugin")]
+[assembly : AssemblyDescription("Ubit Variation")]
+[assembly : AssemblyConfiguration("")]
+[assembly : AssemblyCompany("http://opensimulator.org")]
+[assembly : AssemblyProduct("OdePlugin")]
+[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2009")]
+[assembly : AssemblyTrademark("")]
+[assembly : AssemblyCulture("")]
+
+// This sets the default COM visibility of types in the assembly to invisible.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+
+[assembly : ComVisible(false)]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// 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.6.5.*")]
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
new file mode 100644
index 0000000..f7e4c1c
--- /dev/null
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
@@ -0,0 +1,1950 @@
+/*
+ * 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.
+ */
+
+
+// Revision by Ubit 2011/12
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using OpenMetaverse;
+using OdeAPI;
+using OpenSim.Framework;
+using OpenSim.Region.Physics.Manager;
+using log4net;
+
+namespace OpenSim.Region.Physics.OdePlugin
+{
+    /// <summary>
+    /// Various properties that ODE uses for AMotors but isn't exposed in ODE.NET so we must define them ourselves.
+    /// </summary>
+
+    public enum dParam : int
+    {
+        LowStop = 0,
+        HiStop = 1,
+        Vel = 2,
+        FMax = 3,
+        FudgeFactor = 4,
+        Bounce = 5,
+        CFM = 6,
+        StopERP = 7,
+        StopCFM = 8,
+        LoStop2 = 256,
+        HiStop2 = 257,
+        Vel2 = 258,
+        FMax2 = 259,
+        StopERP2 = 7 + 256,
+        StopCFM2 = 8 + 256,
+        LoStop3 = 512,
+        HiStop3 = 513,
+        Vel3 = 514,
+        FMax3 = 515,
+        StopERP3 = 7 + 512,
+        StopCFM3 = 8 + 512
+    }
+ 
+    public class OdeCharacter : PhysicsActor
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private Vector3 _position;
+        private Vector3 _zeroPosition;
+        private Vector3 _velocity;
+        private Vector3 _target_velocity;
+        private Vector3 _acceleration;
+        private Vector3 m_rotationalVelocity;
+        private Vector3 m_size;
+        private Quaternion m_orientation;
+        private Quaternion m_orientation2D;
+        private float m_mass = 80f;
+        public float m_density = 60f;
+        private bool m_pidControllerActive = true;
+
+        const float basePID_D = 0.55f; // scaled for unit mass unit time (2200 /(50*80))
+        const float basePID_P = 0.225f; // scaled for unit mass unit time (900 /(50*80))
+        public float PID_D;
+        public float PID_P;
+
+        private float timeStep;
+        private float invtimeStep;
+
+        private float m_feetOffset = 0;
+        private float feetOff = 0;
+        private float feetSZ = 0.5f;
+        const float feetScale = 0.8f;
+        private float boneOff = 0;
+        private float m_lastVelocitySqr = 0;
+
+        public float walkDivisor = 1.3f;
+        public float runDivisor = 0.8f;
+        private bool flying = false;
+        private bool m_iscolliding = false;
+        private bool m_iscollidingGround = false;
+        private bool m_iscollidingObj = false;
+        private bool m_alwaysRun = false;
+
+        private bool _zeroFlag = false;
+
+        private int m_requestedUpdateFrequency = 0;
+        private uint m_localID = 0;
+        public bool m_returnCollisions = false;
+        // taints and their non-tainted counterparts
+        public bool m_isPhysical = false; // the current physical status
+        public float MinimumGroundFlightOffset = 3f;
+
+        private float m_buoyancy = 0f;
+
+        private bool m_freemove = false;
+        // private CollisionLocker ode;
+
+//        private string m_name = String.Empty;
+        // other filter control
+        int m_colliderfilter = 0;
+        int m_colliderGroundfilter = 0;
+        int m_colliderObjectfilter = 0;
+        bool m_collisionException = false;
+
+        // Default we're a Character
+        private CollisionCategories m_collisionCategories = (CollisionCategories.Character);
+
+        // Default, Collide with Other Geometries, spaces, bodies and characters.
+        private CollisionCategories m_collisionFlags = (CollisionCategories.Character
+                                                        | CollisionCategories.Geom
+                                                        | CollisionCategories.VolumeDtc
+                                                        );
+        // we do land collisions not ode                | CollisionCategories.Land);
+        public IntPtr Body = IntPtr.Zero;
+        private OdeScene _parent_scene;
+        private IntPtr topbox = IntPtr.Zero;
+        private IntPtr midbox = IntPtr.Zero;
+        private IntPtr feetbox = IntPtr.Zero;
+        private IntPtr bbox = IntPtr.Zero;
+        public IntPtr collider = IntPtr.Zero;
+
+        public IntPtr Amotor = IntPtr.Zero;
+
+        public d.Mass ShellMass;
+
+
+
+
+        public int m_eventsubscription = 0;
+        private int m_cureventsubscription = 0;
+        private CollisionEventUpdate CollisionEventsThisFrame = null;
+        private bool SentEmptyCollisionsEvent;
+
+        // unique UUID of this character object
+        public UUID m_uuid;
+        public bool bad = false;
+
+        float mu;
+
+        
+
+        public OdeCharacter(uint localID, String avName, OdeScene parent_scene, Vector3 pos, Vector3 pSize, float pfeetOffset, float density, float walk_divisor, float rundivisor)
+        {
+            m_uuid = UUID.Random();
+            m_localID = localID;
+
+            timeStep = parent_scene.ODE_STEPSIZE;
+            invtimeStep = 1 / timeStep;
+
+            if (pos.IsFinite())
+            {
+                if (pos.Z > 99999f)
+                {
+                    pos.Z = parent_scene.GetTerrainHeightAtXY(127, 127) + 5;
+                }
+                if (pos.Z < -100f) // shouldn't this be 0 ?
+                {
+                    pos.Z = parent_scene.GetTerrainHeightAtXY(127, 127) + 5;
+                }
+                _position = pos;
+            }
+            else
+            {
+                _position = new Vector3(((float)_parent_scene.WorldExtents.X * 0.5f), ((float)_parent_scene.WorldExtents.Y * 0.5f), parent_scene.GetTerrainHeightAtXY(128f, 128f) + 10f);
+                m_log.Warn("[PHYSICS]: Got NaN Position on Character Create");
+            }
+
+            _parent_scene = parent_scene;
+
+
+            m_size.X = pSize.X;
+            m_size.Y = pSize.Y;
+            m_size.Z = pSize.Z;
+
+            if(m_size.X <0.01f)
+                m_size.X = 0.01f;
+            if(m_size.Y <0.01f)
+                m_size.Y = 0.01f;
+            if(m_size.Z <0.01f)
+                m_size.Z = 0.01f;
+
+            m_feetOffset = pfeetOffset;
+            m_orientation = Quaternion.Identity;
+            m_orientation2D = Quaternion.Identity;
+            m_density = density;
+
+            // force lower density for testing
+            m_density = 3.0f;
+
+            m_density *= 1.4f; // scale to have mass similar to capsule
+
+            mu = parent_scene.AvatarFriction;
+
+            walkDivisor = walk_divisor;
+            runDivisor = rundivisor;
+
+            m_mass = m_density * m_size.X * m_size.Y * m_size.Z; ; // sure we have a default           
+
+            PID_D = basePID_D * m_mass * invtimeStep;
+            PID_P = basePID_P * m_mass * invtimeStep;
+
+            m_isPhysical = false; // current status: no ODE information exists
+
+            Name = avName;
+
+            AddChange(changes.Add, null);
+        }
+
+        public override int PhysicsActorType
+        {
+            get { return (int)ActorTypes.Agent; }
+            set { return; }
+        }
+
+        public override void getContactData(ref ContactData cdata)
+        {
+            cdata.mu = mu;
+            cdata.bounce = 0;
+            cdata.softcolide = false;
+        }
+
+        public override bool Building { get; set; }
+
+        /// <summary>
+        /// If this is set, the avatar will move faster
+        /// </summary>
+        public override bool SetAlwaysRun
+        {
+            get { return m_alwaysRun; }
+            set { m_alwaysRun = value; }
+        }
+
+        public override uint LocalID
+        {
+            get { return m_localID; }     
+            set { m_localID = value; }
+        }
+
+        public override PhysicsActor ParentActor
+        {
+            get { return (PhysicsActor)this; }
+        }
+
+        public override bool Grabbed
+        {
+            set { return; }
+        }
+
+        public override bool Selected
+        {
+            set { return; }
+        }
+
+        public override float Buoyancy
+        {
+            get { return m_buoyancy; }
+            set { m_buoyancy = value; }
+        }
+
+        public override bool FloatOnWater
+        {
+            set { return; }
+        }
+
+        public override bool IsPhysical
+        {
+            get { return m_isPhysical; }
+            set { return; }
+        }
+
+        public override bool ThrottleUpdates
+        {
+            get { return false; }
+            set { return; }
+        }
+
+        public override bool Flying
+        {
+            get { return flying; }
+            set
+            {
+                flying = value;
+//                m_log.DebugFormat("[PHYSICS]: Set OdeCharacter Flying to {0}", flying);
+            }
+        }
+
+        /// <summary>
+        /// Returns if the avatar is colliding in general.
+        /// This includes the ground and objects and avatar.
+        /// </summary>
+        public override bool IsColliding
+        {
+            get { return (m_iscolliding || m_iscollidingGround); }
+            set
+            {
+                if (value)
+                {
+                    m_colliderfilter += 2;
+                    if (m_colliderfilter > 2)
+                        m_colliderfilter = 2;
+                }
+                else
+                {
+                    m_colliderfilter--;
+                    if (m_colliderfilter < 0)
+                        m_colliderfilter = 0;
+                }
+
+                if (m_colliderfilter == 0)
+                    m_iscolliding = false;
+                else
+                {
+                    m_pidControllerActive = true;
+                    m_iscolliding = true;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns if an avatar is colliding with the ground
+        /// </summary>
+        public override bool CollidingGround
+        {
+            get { return m_iscollidingGround; }
+            set
+            {
+/*  we now control this
+                if (value)
+                    {
+                    m_colliderGroundfilter += 2;
+                    if (m_colliderGroundfilter > 2)
+                        m_colliderGroundfilter = 2;
+                    }
+                else
+                    {
+                    m_colliderGroundfilter--;
+                    if (m_colliderGroundfilter < 0)
+                        m_colliderGroundfilter = 0;
+                    }
+
+                if (m_colliderGroundfilter == 0)
+                    m_iscollidingGround = false;
+                else
+                    m_iscollidingGround = true;
+ */
+            }
+
+        }
+
+        /// <summary>
+        /// Returns if the avatar is colliding with an object
+        /// </summary>
+        public override bool CollidingObj
+        {
+            get { return m_iscollidingObj; }
+            set
+            {
+                // Ubit filter this also
+                if (value)
+                {
+                    m_colliderObjectfilter += 2;
+                    if (m_colliderObjectfilter > 2)
+                        m_colliderObjectfilter = 2;
+                }
+                else
+                {
+                    m_colliderObjectfilter--;
+                    if (m_colliderObjectfilter < 0)
+                        m_colliderObjectfilter = 0;
+                }
+
+                if (m_colliderObjectfilter == 0)
+                    m_iscollidingObj = false;
+                else
+                    m_iscollidingObj = true;
+
+//            m_iscollidingObj = value;
+
+                if (m_iscollidingObj)
+                    m_pidControllerActive = false;
+                else
+                    m_pidControllerActive = true;
+            }
+        }
+
+        /// <summary>
+        /// turn the PID controller on or off.
+        /// The PID Controller will turn on all by itself in many situations
+        /// </summary>
+        /// <param name="status"></param>
+        public void SetPidStatus(bool status)
+        {
+            m_pidControllerActive = status;
+        }
+
+        public override bool Stopped
+        {
+            get { return _zeroFlag; }
+        }
+
+        /// <summary>
+        /// This 'puts' an avatar somewhere in the physics space.
+        /// Not really a good choice unless you 'know' it's a good
+        /// spot otherwise you're likely to orbit the avatar.
+        /// </summary>
+        public override Vector3 Position
+        {
+            get { return _position; }
+            set
+            {
+                if (value.IsFinite())
+                {
+                    if (value.Z > 9999999f)
+                    {
+                        value.Z = _parent_scene.GetTerrainHeightAtXY(127, 127) + 5;
+                    }
+                    if (value.Z < -100f)
+                    {
+                        value.Z = _parent_scene.GetTerrainHeightAtXY(127, 127) + 5;
+                    }
+                    AddChange(changes.Position, value);
+                }
+                else
+                {
+                    m_log.Warn("[PHYSICS]: Got a NaN Position from Scene on a Character");
+                }
+            }
+        }
+
+        public override Vector3 RotationalVelocity
+        {
+            get { return m_rotationalVelocity; }
+            set { m_rotationalVelocity = value; }
+        }
+
+        /// <summary>
+        /// This property sets the height of the avatar only.  We use the height to make sure the avatar stands up straight
+        /// and use it to offset landings properly
+        /// </summary>
+        public override Vector3 Size
+        {
+            get
+            {
+                return m_size;
+            }
+            set
+            {
+                if (value.IsFinite())
+                {
+                    if(value.X <0.01f)
+                        value.X = 0.01f;
+                    if(value.Y <0.01f)
+                        value.Y = 0.01f;
+                    if(value.Z <0.01f)
+                        value.Z = 0.01f;
+
+                    AddChange(changes.Size, value);
+                }
+                else
+                {
+                    m_log.Warn("[PHYSICS]: Got a NaN Size from Scene on a Character");
+                }
+            }
+        }
+
+        public override void setAvatarSize(Vector3 size, float feetOffset)
+        {
+            if (size.IsFinite())
+            {
+                if (size.X < 0.01f)
+                    size.X = 0.01f;
+                if (size.Y < 0.01f)
+                    size.Y = 0.01f;
+                if (size.Z < 0.01f)
+                    size.Z = 0.01f;
+
+                strAvatarSize st = new strAvatarSize();
+                st.size = size;
+                st.offset = feetOffset;
+                AddChange(changes.AvatarSize, st);
+            }
+            else
+            {
+                m_log.Warn("[PHYSICS]: Got a NaN AvatarSize from Scene on a Character");
+            }
+            
+        }
+        /// <summary>
+        /// This creates the Avatar's physical Surrogate at the position supplied
+        /// </summary>
+        /// <param name="npositionX"></param>
+        /// <param name="npositionY"></param>
+        /// <param name="npositionZ"></param>
+
+        //
+        /// <summary>
+        /// Uses the capped cyllinder volume formula to calculate the avatar's mass.
+        /// This may be used in calculations in the scene/scenepresence
+        /// </summary>
+        public override float Mass
+        {
+            get
+            {
+                return m_mass;
+            }
+        }
+        public override void link(PhysicsActor obj)
+        {
+
+        }
+
+        public override void delink()
+        {
+
+        }
+
+        public override void LockAngularMotion(Vector3 axis)
+        {
+
+        }
+
+
+        public override Vector3 Force
+        {
+            get { return _target_velocity; }
+            set { return; }
+        }
+
+        public override int VehicleType
+        {
+            get { return 0; }
+            set { return; }
+        }
+
+        public override void VehicleFloatParam(int param, float value)
+        {
+
+        }
+
+        public override void VehicleVectorParam(int param, Vector3 value)
+        {
+
+        }
+
+        public override void VehicleRotationParam(int param, Quaternion rotation)
+        {
+
+        }
+
+        public override void VehicleFlags(int param, bool remove)
+        {
+
+        }
+
+        public override void SetVolumeDetect(int param)
+        {
+
+        }
+
+        public override Vector3 CenterOfMass
+        {
+            get
+            {
+                Vector3 pos = _position;
+                return pos;
+            }
+        }
+
+        public override Vector3 GeometricCenter
+        {
+            get
+            {
+                Vector3 pos = _position;
+                return pos;
+            }
+        }
+
+        public override PrimitiveBaseShape Shape
+        {
+            set { return; }
+        }
+
+        public override Vector3 Velocity
+        {
+            get
+            {
+                return _velocity;
+            }
+            set
+            {
+                if (value.IsFinite())
+                {
+                    AddChange(changes.Velocity, value);
+                }
+                else
+                {
+                    m_log.Warn("[PHYSICS]: Got a NaN velocity from Scene in a Character");
+                }
+            }
+        }
+
+        public override Vector3 Torque
+        {
+            get { return Vector3.Zero; }
+            set { return; }
+        }
+
+        public override float CollisionScore
+        {
+            get { return 0f; }
+            set { }
+        }
+
+        public override bool Kinematic
+        {
+            get { return false; }
+            set { }
+        }
+
+        public override Quaternion Orientation
+        {
+            get { return m_orientation; }
+            set
+            {
+//                fakeori = value;
+//                givefakeori++;
+                value.Normalize();
+                AddChange(changes.Orientation, value);
+            }
+        }
+
+        public override Vector3 Acceleration
+        {
+            get { return _acceleration; }
+            set { }
+        }
+
+        public void SetAcceleration(Vector3 accel)
+        {
+            m_pidControllerActive = true;
+            _acceleration = accel;
+        }
+
+        /// <summary>
+        /// Adds the force supplied to the Target Velocity
+        /// The PID controller takes this target velocity and tries to make it a reality
+        /// </summary>
+        /// <param name="force"></param>
+        public override void AddForce(Vector3 force, bool pushforce)
+        {
+            if (force.IsFinite())
+            {
+                if (pushforce)
+                {
+                    AddChange(changes.Force, force * m_density / (_parent_scene.ODE_STEPSIZE * 28f));
+                }
+                else
+                {
+                    AddChange(changes.Velocity, force);
+                }
+            }
+            else
+            {
+                m_log.Warn("[PHYSICS]: Got a NaN force applied to a Character");
+            }
+            //m_lastUpdateSent = false;
+        }
+
+        public override void AddAngularForce(Vector3 force, bool pushforce)
+        {
+
+        }
+
+        public override void SetMomentum(Vector3 momentum)
+        {
+            if (momentum.IsFinite())
+                AddChange(changes.Momentum, momentum);
+        }
+
+        private void ajustCollider()
+        {
+            float vq = _velocity.LengthSquared();
+            if (m_lastVelocitySqr != vq)
+            {
+                m_lastVelocitySqr = vq;
+                if (vq > 100.0f)
+                {
+                    Vector3 off = _velocity;
+                    float t = 0.5f * timeStep;
+                    off = off * t;
+                    d.Quaternion qtmp;
+                    d.GeomCopyQuaternion(bbox, out qtmp);
+                    Quaternion q;
+                    q.X = qtmp.X;
+                    q.Y = qtmp.Y;
+                    q.Z = qtmp.Z;
+                    q.W = qtmp.W;
+                    off *= Quaternion.Conjugate(q);
+
+                    d.GeomSetOffsetPosition(bbox, off.X, off.Y, off.Z);
+
+                    off.X = 2.0f * (m_size.X + Math.Abs(off.X));
+                    off.Y = 2.0f * (m_size.Y + Math.Abs(off.Y));
+                    off.Z = m_size.Z + 2.0f * Math.Abs(off.Z);
+                    d.GeomBoxSetLengths(bbox, off.X, off.Y, off.Z);
+
+                    d.GeomSetCategoryBits(bbox, (uint)m_collisionCategories);
+                    d.GeomSetCollideBits(bbox, (uint)m_collisionFlags);
+                    d.GeomSetCategoryBits(topbox, 0);
+                    d.GeomSetCollideBits(topbox, 0);
+                    d.GeomSetCategoryBits(midbox, 0);
+                    d.GeomSetCollideBits(midbox, 0);
+                    d.GeomSetCategoryBits(feetbox, 0);
+                    d.GeomSetCollideBits(feetbox, 0);
+                }
+                else
+                {
+                    d.GeomSetCategoryBits(bbox, 0);
+                    d.GeomSetCollideBits(bbox, 0);
+                    d.GeomSetCategoryBits(topbox, (uint)m_collisionCategories);
+                    d.GeomSetCollideBits(topbox, (uint)m_collisionFlags);
+                    d.GeomSetCategoryBits(midbox, (uint)m_collisionCategories);
+                    d.GeomSetCollideBits(midbox, (uint)m_collisionFlags);
+                    d.GeomSetCategoryBits(feetbox, (uint)m_collisionCategories);
+                    d.GeomSetCollideBits(feetbox, (uint)m_collisionFlags);
+                }
+                uint cat1 = d.GeomGetCategoryBits(bbox);
+                uint col1 = d.GeomGetCollideBits(bbox);
+
+            }
+        }
+
+        private void AvatarGeomAndBodyCreation(float npositionX, float npositionY, float npositionZ)
+        {
+            // sizes  one day should came from visual parameters
+            float sx = m_size.X;
+            float sy = m_size.Y;
+            float sz = m_size.Z;
+
+            float topsx = sx * 0.9f;
+            float midsx = sx;
+            float feetsx = sx * feetScale;
+            float bonesx = sx * 0.2f;
+
+            float topsy = sy * 0.4f;
+            float midsy = sy;
+            float feetsy = sy * feetScale * 0.8f;
+            float bonesy = feetsy * 0.2f;
+
+            float topsz = sz * 0.15f;
+            float feetsz = sz * 0.45f;
+            if (feetsz > 0.6f)
+                feetsz = 0.6f;
+
+            float midsz = sz - topsz - feetsz;
+            float bonesz = sz;
+
+            float bot = -sz * 0.5f + m_feetOffset;
+
+            boneOff = bot + 0.3f;
+
+            float feetz = bot + feetsz * 0.5f;
+            bot += feetsz;
+
+            feetOff = bot;
+            feetSZ = feetsz;
+
+            float midz = bot + midsz * 0.5f;
+            bot += midsz;
+            float topz = bot + topsz * 0.5f;
+
+            _parent_scene.waitForSpaceUnlock(_parent_scene.CharsSpace);
+
+            collider = d.HashSpaceCreate(_parent_scene.CharsSpace);
+            d.HashSpaceSetLevels(collider, -4, 3);
+            d.SpaceSetSublevel(collider, 3);
+            d.SpaceSetCleanup(collider, false);
+            d.GeomSetCategoryBits(collider, (uint)m_collisionCategories);
+            d.GeomSetCollideBits(collider, (uint)m_collisionFlags);
+
+            feetbox = d.CreateBox(collider, feetsx, feetsy, feetsz);
+            midbox = d.CreateBox(collider, midsx, midsy, midsz);
+            topbox = d.CreateBox(collider, topsx, topsy, topsz);
+            bbox = d.CreateBox(collider, m_size.X, m_size.Y, m_size.Z);
+
+            m_mass = m_density * m_size.X * m_size.Y * m_size.Z;  // update mass
+
+            d.MassSetBoxTotal(out ShellMass, m_mass, m_size.X, m_size.Y, m_size.Z);
+
+            PID_D = basePID_D * m_mass / _parent_scene.ODE_STEPSIZE;
+            PID_P = basePID_P * m_mass / _parent_scene.ODE_STEPSIZE;
+            
+            Body = d.BodyCreate(_parent_scene.world);
+
+            _zeroFlag = false;
+            m_collisionException = false;
+            m_pidControllerActive = true;
+            m_freemove = false;
+
+            _velocity = Vector3.Zero;
+            m_lastVelocitySqr = 0;
+
+            d.BodySetAutoDisableFlag(Body, false);
+            d.BodySetPosition(Body, npositionX, npositionY, npositionZ);
+
+            _position.X = npositionX;
+            _position.Y = npositionY;
+            _position.Z = npositionZ;
+
+            d.BodySetMass(Body, ref ShellMass);
+            d.GeomSetBody(feetbox, Body);
+            d.GeomSetBody(midbox, Body);
+            d.GeomSetBody(topbox, Body);
+            d.GeomSetBody(bbox, Body);
+
+            d.GeomSetOffsetPosition(feetbox, 0, 0, feetz);
+            d.GeomSetOffsetPosition(midbox, 0, 0, midz);
+            d.GeomSetOffsetPosition(topbox, 0, 0, topz);
+
+            ajustCollider();
+
+
+            // The purpose of the AMotor here is to keep the avatar's physical
+            // surrogate from rotating while moving
+            Amotor = d.JointCreateAMotor(_parent_scene.world, IntPtr.Zero);
+            d.JointAttach(Amotor, Body, IntPtr.Zero);
+
+            d.JointSetAMotorMode(Amotor, 0);
+            d.JointSetAMotorNumAxes(Amotor, 3);
+            d.JointSetAMotorAxis(Amotor, 0, 0, 1, 0, 0);
+            d.JointSetAMotorAxis(Amotor, 1, 0, 0, 1, 0);
+            d.JointSetAMotorAxis(Amotor, 2, 0, 0, 0, 1);
+
+            d.JointSetAMotorAngle(Amotor, 0, 0);
+            d.JointSetAMotorAngle(Amotor, 1, 0);
+            d.JointSetAMotorAngle(Amotor, 2, 0);
+
+            d.JointSetAMotorParam(Amotor, (int)dParam.StopCFM, 0f); // make it HARD
+            d.JointSetAMotorParam(Amotor, (int)dParam.StopCFM2, 0f);
+            d.JointSetAMotorParam(Amotor, (int)dParam.StopCFM3, 0f);
+            d.JointSetAMotorParam(Amotor, (int)dParam.StopERP, 0.8f);
+            d.JointSetAMotorParam(Amotor, (int)dParam.StopERP2, 0.8f);
+            d.JointSetAMotorParam(Amotor, (int)dParam.StopERP3, 0.8f);
+
+            // These lowstops and high stops are effectively (no wiggle room)
+            d.JointSetAMotorParam(Amotor, (int)dParam.LowStop, -1e-5f);
+            d.JointSetAMotorParam(Amotor, (int)dParam.HiStop, 1e-5f);
+            d.JointSetAMotorParam(Amotor, (int)dParam.LoStop2, -1e-5f);
+            d.JointSetAMotorParam(Amotor, (int)dParam.HiStop2, 1e-5f);
+            d.JointSetAMotorParam(Amotor, (int)dParam.LoStop3, -1e-5f);
+            d.JointSetAMotorParam(Amotor, (int)dParam.HiStop3, 1e-5f);
+
+            d.JointSetAMotorParam(Amotor, (int)d.JointParam.Vel, 0);
+            d.JointSetAMotorParam(Amotor, (int)d.JointParam.Vel2, 0);
+            d.JointSetAMotorParam(Amotor, (int)d.JointParam.Vel3, 0);
+
+            d.JointSetAMotorParam(Amotor, (int)dParam.FMax, 5e8f);
+            d.JointSetAMotorParam(Amotor, (int)dParam.FMax2, 5e8f);
+            d.JointSetAMotorParam(Amotor, (int)dParam.FMax3, 5e8f);
+        }
+
+        /// <summary>
+        /// Destroys the avatar body and geom
+
+        private void AvatarGeomAndBodyDestroy()
+        {
+            // Kill the Amotor
+            if (Amotor != IntPtr.Zero)
+            {
+                d.JointDestroy(Amotor);
+                Amotor = IntPtr.Zero;
+            }
+
+            if (Body != IntPtr.Zero)
+            {
+                //kill the body
+                d.BodyDestroy(Body);
+                Body = IntPtr.Zero;
+            }
+
+            //kill the Geoms
+            if (topbox != IntPtr.Zero)
+            {
+                _parent_scene.actor_name_map.Remove(topbox);
+                _parent_scene.waitForSpaceUnlock(collider);
+                d.GeomDestroy(topbox);
+                topbox = IntPtr.Zero;
+            }
+            if (midbox != IntPtr.Zero)
+            {
+                _parent_scene.actor_name_map.Remove(midbox);
+                _parent_scene.waitForSpaceUnlock(collider);
+                d.GeomDestroy(midbox);
+                midbox = IntPtr.Zero;
+            }
+            if (feetbox != IntPtr.Zero)
+            {
+                _parent_scene.actor_name_map.Remove(feetbox);
+                _parent_scene.waitForSpaceUnlock(collider);
+                d.GeomDestroy(feetbox);
+                feetbox = IntPtr.Zero;
+            }
+
+            if (bbox != IntPtr.Zero)
+            {
+                _parent_scene.actor_name_map.Remove(bbox);
+                _parent_scene.waitForSpaceUnlock(collider);
+                d.GeomDestroy(bbox);
+                bbox = IntPtr.Zero;
+            }
+
+            if (collider != IntPtr.Zero)
+            {
+                d.SpaceDestroy(collider);
+                collider = IntPtr.Zero;
+            }
+
+        }
+
+        //in place 2D rotation around Z assuming rot is normalised and is a rotation around Z
+        public void RotateXYonZ(ref float x, ref float y, ref Quaternion rot)
+        {
+            float sin = 2.0f * rot.Z * rot.W;
+            float cos = rot.W * rot.W - rot.Z * rot.Z;
+            float tx = x;
+
+            x = tx * cos - y * sin;
+            y = tx * sin + y * cos;
+        }
+        public void RotateXYonZ(ref float x, ref float y, ref float sin, ref float cos)
+        {
+            float tx = x;
+            x = tx * cos - y * sin;
+            y = tx * sin + y * cos;
+        }
+        public void invRotateXYonZ(ref float x, ref float y, ref float sin, ref float cos)
+        {
+            float tx = x;
+            x = tx * cos + y * sin;
+            y = -tx * sin + y * cos;
+        }
+
+        public void invRotateXYonZ(ref float x, ref float y, ref Quaternion rot)
+        {
+            float sin = - 2.0f * rot.Z * rot.W;
+            float cos = rot.W * rot.W - rot.Z * rot.Z;
+            float tx = x;
+
+            x = tx * cos - y * sin;
+            y = tx * sin + y * cos;
+        }
+
+
+        public bool Collide(IntPtr me, bool reverse, ref d.ContactGeom contact, ref bool feetcollision)
+        {
+            feetcollision = false;
+            if (m_collisionException)
+                return false;
+
+            Vector3 offset;
+
+            if (me == bbox) // if moving fast
+            {
+                // force a full inelastic collision
+                m_collisionException = true;
+
+                offset = m_size * m_orientation2D;
+
+                offset.X = (float)Math.Abs(offset.X) * 0.5f + contact.depth;
+                offset.Y = (float)Math.Abs(offset.Y) * 0.5f + contact.depth;
+                offset.Z = (float)Math.Abs(offset.Z) * 0.5f + contact.depth;
+
+                if (reverse)
+                {
+                    offset.X *= -contact.normal.X;
+                    offset.Y *= -contact.normal.Y;
+                    offset.Z *= -contact.normal.Z;
+                }
+                else
+                {
+                    offset.X *= contact.normal.X;
+                    offset.Y *= contact.normal.Y;
+                    offset.Z *= contact.normal.Z;
+                }
+
+                offset.X += contact.pos.X;
+                offset.Y += contact.pos.Y;
+                offset.Z += contact.pos.Z;
+
+                _position = offset;
+                return false;
+            }
+
+            offset.X = contact.pos.X - _position.X;
+            offset.Y = contact.pos.Y - _position.Y;
+
+            if (me == topbox)
+            {
+                offset.Z = contact.pos.Z - _position.Z;
+
+                offset.Normalize();
+
+                if (reverse)
+                {
+                    contact.normal.X = offset.X;
+                    contact.normal.Y = offset.Y;
+                    contact.normal.Z = offset.Z;
+                }
+                else
+                {
+                    contact.normal.X = -offset.X;
+                    contact.normal.Y = -offset.Y;
+                    contact.normal.Z = -offset.Z;
+                }
+                return true;
+            }
+
+            if (me == midbox)
+            {
+                if (Math.Abs(contact.normal.Z) > 0.95f)
+                    offset.Z = contact.pos.Z - _position.Z;
+                else
+                    offset.Z = contact.normal.Z;
+
+                offset.Normalize();
+
+                if (reverse)
+                {
+                    contact.normal.X = offset.X;
+                    contact.normal.Y = offset.Y;
+                    contact.normal.Z = offset.Z;
+                }
+                else
+                {
+                    contact.normal.X = -offset.X;
+                    contact.normal.Y = -offset.Y;
+                    contact.normal.Z = -offset.Z;
+                }
+
+                return true;
+            }
+
+            else if (me == feetbox)
+            {
+                float h = contact.pos.Z - _position.Z;
+
+                if (Math.Abs(contact.normal.Z) > 0.95f)
+                {
+                    if (contact.normal.Z > 0)
+                        contact.normal.Z = 1.0f;
+                    else
+                        contact.normal.Z = -1.0f;
+                    contact.normal.X = 0.0f;
+                    contact.normal.Y = 0.0f;
+                    feetcollision = true;
+                    if (h < boneOff)
+                        IsColliding = true;
+                    return true;
+                }
+
+                offset.Z = h - feetOff; // distance from top of feetbox
+
+                if (offset.Z > 0)
+                    return false;
+
+                if (offset.Z > -0.01)
+                {
+                    offset.X = 0;
+                    offset.Y = 0;
+                    offset.Z = -1.0f;
+                }
+                else
+                {
+                    offset.Normalize();
+                }
+
+                if (reverse)
+                {
+                    contact.normal.X = offset.X;
+                    contact.normal.Y = offset.Y;
+                    contact.normal.Z = offset.Z;
+                }
+                else
+                {
+                    contact.normal.X = -offset.X;
+                    contact.normal.Y = -offset.Y;
+                    contact.normal.Z = -offset.Z;
+                }
+                feetcollision = true;
+                if (h < boneOff)
+                    IsColliding = true;
+            }
+            else
+                return false;
+
+            return true;
+        }
+
+        /// <summary>
+        /// Called from Simulate
+        /// This is the avatar's movement control + PID Controller
+        /// </summary>
+        /// <param name="timeStep"></param>
+        public void Move(List<OdeCharacter> defects)
+        {
+            if (Body == IntPtr.Zero)
+                return;
+
+            if (m_collisionException)
+            {
+                d.BodySetPosition(Body,_position.X, _position.Y, _position.Z);
+                d.BodySetLinearVel(Body, 0, 0, 0);
+
+                float v = _velocity.Length();
+                if (v != 0)
+                {
+                    v = 5.0f / v;
+                    _velocity = _velocity * v;
+                    d.BodySetLinearVel(Body, _velocity.X, _velocity.Y, _velocity.Z);
+                }
+                ajustCollider();
+                m_collisionException = false;
+                return;
+            }
+
+            d.Vector3 dtmp = d.BodyGetPosition(Body);
+            Vector3 localpos = new Vector3(dtmp.X, dtmp.Y, dtmp.Z);
+
+            // the Amotor still lets avatar rotation to drift during colisions
+            // so force it back to identity
+
+            d.Quaternion qtmp;
+            qtmp.W = m_orientation2D.W;
+            qtmp.X = m_orientation2D.X;
+            qtmp.Y = m_orientation2D.Y;
+            qtmp.Z = m_orientation2D.Z;
+            d.BodySetQuaternion(Body, ref qtmp);
+
+            if (m_pidControllerActive == false)
+            {
+                _zeroPosition = localpos;
+            }
+
+            if (!localpos.IsFinite())
+            {
+                m_log.Warn("[PHYSICS]: Avatar Position is non-finite!");
+                defects.Add(this);
+                // _parent_scene.RemoveCharacter(this);
+
+                // destroy avatar capsule and related ODE data
+                AvatarGeomAndBodyDestroy();
+                return;
+            }
+
+            // check outbounds forcing to be in world
+            bool fixbody = false;
+            if (localpos.X < 0.0f)
+            {
+                fixbody = true;
+                localpos.X = 0.1f;
+            }
+            else if (localpos.X > _parent_scene.WorldExtents.X - 0.1f)
+            {
+                fixbody = true;
+                localpos.X = _parent_scene.WorldExtents.X - 0.1f;
+            }
+            if (localpos.Y < 0.0f)
+            {
+                fixbody = true;
+                localpos.Y = 0.1f;
+            }
+            else if (localpos.Y > _parent_scene.WorldExtents.Y - 0.1)
+            {
+                fixbody = true;
+                localpos.Y = _parent_scene.WorldExtents.Y - 0.1f;
+            }
+            if (fixbody)
+            {
+                m_freemove = false;
+                d.BodySetPosition(Body, localpos.X, localpos.Y, localpos.Z);
+            }
+
+            float breakfactor;
+
+            Vector3 vec = Vector3.Zero;
+            dtmp = d.BodyGetLinearVel(Body);
+            Vector3 vel = new Vector3(dtmp.X, dtmp.Y, dtmp.Z);
+            float velLengthSquared = vel.LengthSquared();
+
+            float movementdivisor = 1f;
+            //Ubit change divisions into multiplications below
+            if (!m_alwaysRun)
+                movementdivisor = 1 / walkDivisor;
+            else
+                movementdivisor = 1 / runDivisor;
+
+            //******************************************
+            // colide with land
+
+            d.AABB aabb;
+            d.GeomGetAABB(feetbox, out aabb);
+            float chrminZ = aabb.MinZ; ; // move up a bit
+            Vector3 posch = localpos;
+
+            float ftmp;
+
+            if (flying)
+            {
+                ftmp = timeStep;
+                posch.X += vel.X * ftmp;
+                posch.Y += vel.Y * ftmp;
+            }
+
+            float terrainheight = _parent_scene.GetTerrainHeightAtXY(posch.X, posch.Y);
+            if (chrminZ < terrainheight)
+            {
+                float depth = terrainheight - chrminZ;
+                if (!flying)
+                {
+                    vec.Z = -vel.Z * PID_D * 1.5f + depth * PID_P * 50;
+                }
+                else
+                    vec.Z = depth * PID_P * 50;
+
+                if (depth < 0.1f)
+                {
+                    m_colliderGroundfilter++;
+                    if (m_colliderGroundfilter > 2)
+                    {
+                        m_iscolliding = true;
+                        m_colliderfilter = 2;
+
+                        if (m_colliderGroundfilter > 10)
+                        {
+                            m_colliderGroundfilter = 10;
+                            m_freemove = false;
+                        }
+
+                        m_iscollidingGround = true;
+
+                        ContactPoint contact = new ContactPoint();
+                        contact.PenetrationDepth = depth;
+                        contact.Position.X = localpos.X;
+                        contact.Position.Y = localpos.Y;
+                        contact.Position.Z = terrainheight;
+                        contact.SurfaceNormal.X = 0.0f;
+                        contact.SurfaceNormal.Y = 0.0f;
+                        contact.SurfaceNormal.Z = -1f;
+                        contact.RelativeSpeed = -vel.Z;
+                        contact.CharacterFeet = true;
+                        AddCollisionEvent(0, contact);
+
+                        vec.Z *= 0.5f;
+                    }
+                }
+
+                else
+                {
+                    m_colliderGroundfilter = 0;
+                    m_iscollidingGround = false;
+                }
+            }
+            else
+            {
+                m_colliderGroundfilter = 0;
+                m_iscollidingGround = false;
+            }
+
+            
+            //******************************************
+
+            bool tviszero = (_target_velocity.X == 0.0f && _target_velocity.Y == 0.0f && _target_velocity.Z == 0.0f);
+
+            //            if (!tviszero || m_iscolliding || velLengthSquared <0.01)
+            if (!tviszero)
+                m_freemove = false;
+
+            if (!m_freemove)
+            {
+
+                //  if velocity is zero, use position control; otherwise, velocity control
+                if (tviszero && m_iscolliding)
+                {
+                    //  keep track of where we stopped.  No more slippin' & slidin'
+                    if (!_zeroFlag)
+                    {
+                        _zeroFlag = true;
+                        _zeroPosition = localpos;
+                    }
+                    if (m_pidControllerActive)
+                    {
+                        // We only want to deactivate the PID Controller if we think we want to have our surrogate
+                        // react to the physics scene by moving it's position.
+                        // Avatar to Avatar collisions
+                        // Prim to avatar collisions
+
+                        vec.X = -vel.X * PID_D + (_zeroPosition.X - localpos.X) * (PID_P * 2);
+                        vec.Y = -vel.Y * PID_D + (_zeroPosition.Y - localpos.Y) * (PID_P * 2);
+                        if (flying)
+                        {
+                            vec.Z += -vel.Z * PID_D + (_zeroPosition.Z - localpos.Z) * PID_P;
+                        }
+                    }
+                    //PidStatus = true;
+                }
+                else
+                {
+                    m_pidControllerActive = true;
+                    _zeroFlag = false;
+
+                    if (m_iscolliding)
+                    {
+                        if (!flying)
+                        {
+                            if (_target_velocity.Z > 0.0f)
+                            {
+                                // We're colliding with something and we're not flying but we're moving
+                                // This means we're walking or running. JUMPING
+                                vec.Z += (_target_velocity.Z - vel.Z) * PID_D * 1.2f;// +(_zeroPosition.Z - localpos.Z) * PID_P;
+                            }
+                            // We're standing on something
+                            vec.X = ((_target_velocity.X * movementdivisor) - vel.X) * (PID_D);
+                            vec.Y = ((_target_velocity.Y * movementdivisor) - vel.Y) * (PID_D);
+                        }
+                        else
+                        {
+                            // We're flying and colliding with something
+                            vec.X = ((_target_velocity.X * movementdivisor) - vel.X) * (PID_D * 0.0625f);
+                            vec.Y = ((_target_velocity.Y * movementdivisor) - vel.Y) * (PID_D * 0.0625f);
+                            vec.Z += (_target_velocity.Z - vel.Z) * (PID_D);
+                        }
+                    }
+                    else // ie not colliding
+                    {
+                        if (flying) //(!m_iscolliding && flying)
+                        {
+                            // we're in mid air suspended
+                            vec.X = ((_target_velocity.X * movementdivisor) - vel.X) * (PID_D * 1.667f);
+                            vec.Y = ((_target_velocity.Y * movementdivisor) - vel.Y) * (PID_D * 1.667f);
+                            vec.Z += (_target_velocity.Z - vel.Z) * (PID_D);
+                        }
+
+                        else
+                        {
+                            // we're not colliding and we're not flying so that means we're falling!
+                            // m_iscolliding includes collisions with the ground.
+
+                            // d.Vector3 pos = d.BodyGetPosition(Body);
+                            vec.X = (_target_velocity.X - vel.X) * PID_D * 0.833f;
+                            vec.Y = (_target_velocity.Y - vel.Y) * PID_D * 0.833f;
+                        }
+                    }
+                }
+
+                if (velLengthSquared > 2500.0f) // 50m/s apply breaks
+                {
+                    breakfactor = 0.16f * m_mass;
+                    vec.X -= breakfactor * vel.X;
+                    vec.Y -= breakfactor * vel.Y;
+                    vec.Z -= breakfactor * vel.Z;
+                }
+            }
+            else
+            {
+                breakfactor = m_mass;
+                vec.X -= breakfactor * vel.X;
+                vec.Y -= breakfactor * vel.Y;
+                if (flying)
+                    vec.Z -= breakfactor * vel.Z;
+                else
+                    vec.Z -= .5f* m_mass * vel.Z;
+            }
+
+            if (flying)
+            {
+                vec.Z -= _parent_scene.gravityz * m_mass;
+
+                //Added for auto fly height. Kitto Flora
+                float target_altitude = _parent_scene.GetTerrainHeightAtXY(localpos.X, localpos.Y) + MinimumGroundFlightOffset;
+
+                if (localpos.Z < target_altitude)
+                {
+                    vec.Z += (target_altitude - localpos.Z) * PID_P * 5.0f;
+                }
+                // end add Kitto Flora
+            }
+
+            if (vec.IsFinite())
+            {
+                if (vec.X != 0 || vec.Y !=0 || vec.Z !=0)
+                    d.BodyAddForce(Body, vec.X, vec.Y, vec.Z);
+            }
+            else
+            {
+                m_log.Warn("[PHYSICS]: Got a NaN force vector in Move()");
+                m_log.Warn("[PHYSICS]: Avatar Position is non-finite!");
+                defects.Add(this);
+                // _parent_scene.RemoveCharacter(this);
+                // destroy avatar capsule and related ODE data
+                AvatarGeomAndBodyDestroy();
+                return;
+            }
+
+            // update our local ideia of position velocity and aceleration
+            //            _position = localpos;
+            _position = localpos;
+
+            if (_zeroFlag)
+            {
+                _velocity = Vector3.Zero;
+                _acceleration = Vector3.Zero;
+                m_rotationalVelocity = Vector3.Zero;
+            }
+            else
+            {
+                Vector3 a =_velocity; // previus velocity
+                SetSmooth(ref _velocity, ref vel, 2);
+                a = (_velocity - a) * invtimeStep;
+                SetSmooth(ref _acceleration, ref a, 2);
+
+                dtmp = d.BodyGetAngularVel(Body);
+                m_rotationalVelocity.X = 0f;
+                m_rotationalVelocity.Y = 0f;
+                m_rotationalVelocity.Z = dtmp.Z;
+                Math.Round(m_rotationalVelocity.Z,3);
+            }
+            ajustCollider();
+        }
+
+        public void round(ref Vector3 v, int digits)
+        {
+            v.X = (float)Math.Round(v.X, digits);
+            v.Y = (float)Math.Round(v.Y, digits);
+            v.Z = (float)Math.Round(v.Z, digits);
+         }
+
+        public void SetSmooth(ref Vector3 dst, ref Vector3 value)
+        {
+            dst.X = 0.1f * dst.X + 0.9f * value.X;
+            dst.Y = 0.1f * dst.Y + 0.9f * value.Y;
+            dst.Z = 0.1f * dst.Z + 0.9f * value.Z;
+        }
+
+        public void SetSmooth(ref Vector3 dst, ref Vector3 value, int rounddigits)
+        {
+            dst.X = 0.4f * dst.X + 0.6f * value.X;
+            dst.X = (float)Math.Round(dst.X, rounddigits);
+
+            dst.Y = 0.4f * dst.Y + 0.6f * value.Y;
+            dst.Y = (float)Math.Round(dst.Y, rounddigits);
+
+            dst.Z = 0.4f * dst.Z + 0.6f * value.Z;
+            dst.Z = (float)Math.Round(dst.Z, rounddigits);
+        }
+
+
+        /// <summary>
+        /// Updates the reported position and velocity.
+        /// Used to copy variables from unmanaged space at heartbeat rate and also trigger scene updates acording
+        /// also outbounds checking
+        /// copy and outbounds now done in move(..) at ode rate
+        /// 
+        /// </summary>
+        public void UpdatePositionAndVelocity()
+        {
+            return;
+
+//            if (Body == IntPtr.Zero)
+//                return;
+
+        }
+
+        /// <summary>
+        /// Cleanup the things we use in the scene.
+        /// </summary>
+        public void Destroy()
+        {
+            AddChange(changes.Remove, null);
+        }
+
+        public override void CrossingFailure()
+        {
+        }
+
+        public override Vector3 PIDTarget { set { return; } }
+        public override bool PIDActive { set { return; } }
+        public override float PIDTau { set { return; } }
+
+        public override float PIDHoverHeight { set { return; } }
+        public override bool PIDHoverActive { set { return; } }
+        public override PIDHoverType PIDHoverType { set { return; } }
+        public override float PIDHoverTau { set { return; } }
+
+        public override Quaternion APIDTarget { set { return; } }
+
+        public override bool APIDActive { set { return; } }
+
+        public override float APIDStrength { set { return; } }
+
+        public override float APIDDamping { set { return; } }
+
+
+        public override void SubscribeEvents(int ms)
+        {
+            m_eventsubscription = ms;
+            m_cureventsubscription = 0;
+            if (CollisionEventsThisFrame == null)
+                CollisionEventsThisFrame = new CollisionEventUpdate();
+            SentEmptyCollisionsEvent = false;
+        }
+
+        public override void UnSubscribeEvents()
+        {
+            if (CollisionEventsThisFrame != null)
+            {
+                lock (CollisionEventsThisFrame)
+                {
+                    CollisionEventsThisFrame.Clear();
+                    CollisionEventsThisFrame = null;
+                }
+            }
+            m_eventsubscription = 0;
+        }
+
+        public override void AddCollisionEvent(uint CollidedWith, ContactPoint contact)
+        {
+            if (CollisionEventsThisFrame == null)
+                CollisionEventsThisFrame = new CollisionEventUpdate();
+            lock (CollisionEventsThisFrame)
+            {
+                CollisionEventsThisFrame.AddCollider(CollidedWith, contact);
+                _parent_scene.AddCollisionEventReporting(this);
+            }
+        }
+
+        public void SendCollisions()
+        {
+            if (CollisionEventsThisFrame == null)
+                return;
+
+            lock (CollisionEventsThisFrame)
+            {
+                if (m_cureventsubscription < m_eventsubscription)
+                    return;
+
+                m_cureventsubscription = 0;
+
+                int ncolisions = CollisionEventsThisFrame.m_objCollisionList.Count;
+
+                if (!SentEmptyCollisionsEvent || ncolisions > 0)
+                {
+                    base.SendCollisionUpdate(CollisionEventsThisFrame);
+
+                    if (ncolisions == 0)
+                    {
+                        SentEmptyCollisionsEvent = true;
+                        _parent_scene.RemoveCollisionEventReporting(this);
+                    }
+                    else
+                    {
+                        SentEmptyCollisionsEvent = false;
+                        CollisionEventsThisFrame.Clear();
+                    }
+                }
+            }           
+        }
+
+        internal void AddCollisionFrameTime(int t)
+        {
+            // protect it from overflow crashing
+            if (m_cureventsubscription < 50000)
+                m_cureventsubscription += t;
+        }
+
+        public override bool SubscribedEvents()
+        {
+            if (m_eventsubscription > 0)
+                return true;
+            return false;
+        }
+
+        private void changePhysicsStatus(bool NewStatus)
+        {
+            if (NewStatus != m_isPhysical)
+            {
+                if (NewStatus)
+                {
+                    AvatarGeomAndBodyDestroy();
+
+                    AvatarGeomAndBodyCreation(_position.X, _position.Y, _position.Z);
+
+                    _parent_scene.actor_name_map[collider] = (PhysicsActor)this;
+                    _parent_scene.actor_name_map[feetbox] = (PhysicsActor)this;
+                    _parent_scene.actor_name_map[midbox] = (PhysicsActor)this;
+                    _parent_scene.actor_name_map[topbox] = (PhysicsActor)this;
+                    _parent_scene.actor_name_map[bbox] = (PhysicsActor)this;
+                    _parent_scene.AddCharacter(this);
+                }
+                else
+                {
+                    _parent_scene.RemoveCollisionEventReporting(this);
+                    _parent_scene.RemoveCharacter(this);
+                    // destroy avatar capsule and related ODE data
+                    AvatarGeomAndBodyDestroy();
+                }
+                m_freemove = false;
+                m_isPhysical = NewStatus;
+            }
+        }
+
+        private void changeAdd()
+        {
+            changePhysicsStatus(true);
+        }
+
+        private void changeRemove()
+        {
+            changePhysicsStatus(false);
+        }
+
+        private void changeShape(PrimitiveBaseShape arg)
+        {
+        }
+
+        private void changeAvatarSize(strAvatarSize st)
+        {
+            m_feetOffset = st.offset;
+            changeSize(st.size);
+        }
+
+        private void changeSize(Vector3 pSize)
+        {
+            if (pSize.IsFinite())
+            {
+                // for now only look to Z changes since viewers also don't change X and Y
+                if (pSize.Z != m_size.Z)
+                {
+                    AvatarGeomAndBodyDestroy();
+
+
+                    float oldsz = m_size.Z;
+                    m_size = pSize;
+
+
+                    AvatarGeomAndBodyCreation(_position.X, _position.Y,
+                                      _position.Z + (m_size.Z - oldsz) * 0.5f);
+
+                    Velocity = Vector3.Zero;
+                    
+
+                    _parent_scene.actor_name_map[collider] = (PhysicsActor)this;
+                    _parent_scene.actor_name_map[feetbox] = (PhysicsActor)this;
+                    _parent_scene.actor_name_map[midbox] = (PhysicsActor)this;
+                    _parent_scene.actor_name_map[topbox] = (PhysicsActor)this;
+                    _parent_scene.actor_name_map[bbox] = (PhysicsActor)this;
+                }
+                m_freemove = false;
+                m_collisionException = false;
+                m_pidControllerActive = true;
+            }
+            else
+            {
+                m_log.Warn("[PHYSICS]: Got a NaN Size from Scene on a Character");
+            }
+        }
+
+        private void changePosition( Vector3 newPos)
+            {
+                if (Body != IntPtr.Zero)
+                    d.BodySetPosition(Body, newPos.X, newPos.Y, newPos.Z);
+                _position = newPos;
+                m_freemove = false;
+                m_pidControllerActive = true;               
+            }
+
+        private void changeOrientation(Quaternion newOri)
+        {
+            if (m_orientation != newOri)
+            {
+                m_orientation = newOri; // keep a copy for core use
+                // but only use rotations around Z
+
+                m_orientation2D.W = newOri.W;
+                m_orientation2D.Z = newOri.Z;
+
+                float t = m_orientation2D.W * m_orientation2D.W + m_orientation2D.Z * m_orientation2D.Z;
+                if (t > 0)
+                {
+                    t = 1.0f / (float)Math.Sqrt(t);
+                    m_orientation2D.W *= t;
+                    m_orientation2D.Z *= t;
+                }
+                else
+                {
+                    m_orientation2D.W = 1.0f;
+                    m_orientation2D.Z = 0f;
+                }
+                m_orientation2D.Y = 0f;
+                m_orientation2D.X = 0f;
+
+                d.Quaternion myrot = new d.Quaternion();
+                myrot.X = m_orientation2D.X;
+                myrot.Y = m_orientation2D.Y;
+                myrot.Z = m_orientation2D.Z;
+                myrot.W = m_orientation2D.W;
+                d.BodySetQuaternion(Body, ref myrot);
+            }
+        }
+
+        private void changeVelocity(Vector3 newVel)
+        {
+            m_pidControllerActive = true;
+            m_freemove = false;
+            _target_velocity = newVel;
+        }
+
+        private void changeSetTorque(Vector3 newTorque)
+        {
+        }                                 
+
+        private void changeAddForce(Vector3 newForce)
+        {
+        }                                 
+
+        private void changeAddAngularForce(Vector3 arg)
+        {
+        }                                 
+
+        private void changeAngularLock(Vector3 arg)
+        {
+        }                                 
+
+        private void changeFloatOnWater(bool arg)
+        {
+        }                                 
+
+        private void changeVolumedetetion(bool arg)
+        {
+        }                                 
+
+        private void changeSelectedStatus(bool arg)
+        {
+        }                                 
+
+        private void changeDisable(bool arg)
+        {
+        }                                 
+
+        private void changeBuilding(bool arg)
+        {
+        }
+
+        private void setFreeMove()
+        {
+            m_pidControllerActive = true;
+            _zeroFlag = false;
+            _target_velocity = Vector3.Zero;
+            m_freemove = true;
+            m_colliderfilter = -2;
+            m_colliderObjectfilter = -2;
+            m_colliderGroundfilter = -2;
+
+            m_iscolliding = false;
+            m_iscollidingGround = false;
+            m_iscollidingObj = false;
+
+            CollisionEventsThisFrame.Clear();
+        }
+
+        private void changeForce(Vector3 newForce)
+        {
+            setFreeMove();
+
+            if (Body != IntPtr.Zero)
+            {
+                if (newForce.X != 0f || newForce.Y != 0f || newForce.Z != 0)
+                    d.BodyAddForce(Body, newForce.X, newForce.Y, newForce.Z);
+            }
+        }
+
+        // for now momentum is actually velocity
+        private void changeMomentum(Vector3 newmomentum)
+        {
+            _velocity = newmomentum;
+            setFreeMove();
+
+            if (Body != IntPtr.Zero)
+                d.BodySetLinearVel(Body, newmomentum.X, newmomentum.Y, newmomentum.Z);
+            ajustCollider();
+        }
+
+        private void donullchange()
+        {
+        }
+
+        public bool DoAChange(changes what, object arg)
+        {
+            if (collider == IntPtr.Zero && what != changes.Add && what != changes.Remove)
+            {
+                return false;
+            }
+
+            // nasty switch
+            switch (what)
+            {
+                case changes.Add:
+                    changeAdd();
+                    break;
+                case changes.Remove:
+                    changeRemove();
+                    break;
+
+                case changes.Position:
+                    changePosition((Vector3)arg);
+                    break;
+
+                case changes.Orientation:
+                    changeOrientation((Quaternion)arg);
+                    break;
+
+                case changes.PosOffset:
+                    donullchange();
+                    break;
+
+                case changes.OriOffset:
+                    donullchange();
+                    break;
+
+                case changes.Velocity:
+                    changeVelocity((Vector3)arg);
+                    break;
+
+                //                case changes.Acceleration:
+                //                    changeacceleration((Vector3)arg);
+                //                    break;
+                //                case changes.AngVelocity:
+                //                    changeangvelocity((Vector3)arg);
+                //                    break;
+
+                case changes.Force:
+                    changeForce((Vector3)arg);
+                    break;
+
+                case changes.Torque:
+                    changeSetTorque((Vector3)arg);
+                    break;
+
+                case changes.AddForce:
+                    changeAddForce((Vector3)arg);
+                    break;
+
+                case changes.AddAngForce:
+                    changeAddAngularForce((Vector3)arg);
+                    break;
+
+                case changes.AngLock:
+                    changeAngularLock((Vector3)arg);
+                    break;
+
+                case changes.Size:
+                    changeSize((Vector3)arg);
+                    break;
+
+                case changes.AvatarSize:
+                    changeAvatarSize((strAvatarSize)arg);
+                    break;
+
+                case changes.Momentum:
+                    changeMomentum((Vector3)arg);
+                    break;
+/* not in use for now
+                case changes.Shape:
+                    changeShape((PrimitiveBaseShape)arg);
+                    break;
+
+                case changes.CollidesWater:
+                    changeFloatOnWater((bool)arg);
+                    break;
+
+                case changes.VolumeDtc:
+                    changeVolumedetetion((bool)arg);
+                    break;
+
+                case changes.Physical:
+                    changePhysicsStatus((bool)arg);
+                    break;
+
+                case changes.Selected:
+                    changeSelectedStatus((bool)arg);
+                    break;
+
+                case changes.disabled:
+                    changeDisable((bool)arg);
+                    break;
+
+                case changes.building:
+                    changeBuilding((bool)arg);
+                    break;
+*/
+                case changes.Null:
+                    donullchange();
+                    break;
+
+                default:
+                    donullchange();
+                    break;
+            }
+            return false;
+        }
+
+        public void AddChange(changes what, object arg)
+        {
+            _parent_scene.AddChange((PhysicsActor)this, what, arg);
+        }
+
+        private struct strAvatarSize
+        {
+            public Vector3 size;
+            public float offset;
+        }
+
+    }
+}
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs
new file mode 100644
index 0000000..a7dda7a
--- /dev/null
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs
@@ -0,0 +1,1087 @@
+/*
+ * 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.
+ */
+
+/* Revised Aug, Sept 2009 by Kitto Flora. ODEDynamics.cs replaces
+ * ODEVehicleSettings.cs. It and ODEPrim.cs are re-organised:
+ * ODEPrim.cs contains methods dealing with Prim editing, Prim
+ * characteristics and Kinetic motion.
+ * ODEDynamics.cs contains methods dealing with Prim Physical motion
+ * (dynamics) and the associated settings. Old Linear and angular
+ * motors for dynamic motion have been replace with  MoveLinear()
+ * and MoveAngular(); 'Physical' is used only to switch ODE dynamic
+ * simualtion on/off; VEHICAL_TYPE_NONE/VEHICAL_TYPE_<other> is to
+ * switch between 'VEHICLE' parameter use and general dynamics
+ * settings use.
+ */
+
+// Extensive change Ubit 2012
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using log4net;
+using OpenMetaverse;
+using OdeAPI;
+using OpenSim.Framework;
+using OpenSim.Region.Physics.Manager;
+
+namespace OpenSim.Region.Physics.OdePlugin
+{
+    public class ODEDynamics
+    {
+        public Vehicle Type
+        {
+            get { return m_type; }
+        }
+
+        private OdePrim rootPrim;
+        private OdeScene _pParentScene;
+
+        // Vehicle properties
+        // WARNING this are working copies for internel use
+        // their values may not be the corresponding parameter
+
+        private Quaternion m_referenceFrame = Quaternion.Identity;      // Axis modifier
+        private Quaternion m_RollreferenceFrame = Quaternion.Identity;  // what hell is this ?
+
+        private Vehicle m_type = Vehicle.TYPE_NONE;                     // If a 'VEHICLE', and what kind
+
+        private VehicleFlag m_flags = (VehicleFlag) 0;                  // Boolean settings:
+                                                                        // HOVER_TERRAIN_ONLY
+                                                                        // HOVER_GLOBAL_HEIGHT
+                                                                        // NO_DEFLECTION_UP
+                                                                        // HOVER_WATER_ONLY
+                                                                        // HOVER_UP_ONLY
+                                                                        // LIMIT_MOTOR_UP
+                                                                        // LIMIT_ROLL_ONLY
+        private Vector3 m_BlockingEndPoint = Vector3.Zero;              // not sl
+
+        // Linear properties
+        private Vector3 m_linearMotorDirection = Vector3.Zero;          // velocity requested by LSL, decayed by time
+        private Vector3 m_linearFrictionTimescale = new Vector3(1000, 1000, 1000);
+        private float m_linearMotorDecayTimescale = 120;
+        private float m_linearMotorTimescale = 1000;
+        private Vector3 m_linearMotorOffset = Vector3.Zero;
+
+        //Angular properties
+        private Vector3 m_angularMotorDirection = Vector3.Zero;         // angular velocity requested by LSL motor
+        private float m_angularMotorTimescale = 1000;                      // motor angular velocity ramp up rate
+        private float m_angularMotorDecayTimescale = 120;                 // motor angular velocity decay rate
+        private Vector3 m_angularFrictionTimescale = new Vector3(1000, 1000, 1000);      // body angular velocity  decay rate
+
+        //Deflection properties
+        private float m_angularDeflectionEfficiency = 0;
+        private float m_angularDeflectionTimescale = 1000;
+        private float m_linearDeflectionEfficiency = 0;
+        private float m_linearDeflectionTimescale = 1000;
+
+        //Banking properties
+        private float m_bankingEfficiency = 0;
+        private float m_bankingMix = 0;
+        private float m_bankingTimescale = 1000;
+
+        //Hover and Buoyancy properties
+        private float m_VhoverHeight = 0f;
+        private float m_VhoverEfficiency = 0f;
+        private float m_VhoverTimescale = 1000f;
+        private float m_VehicleBuoyancy = 0f;           //KF: m_VehicleBuoyancy is set by VEHICLE_BUOYANCY for a vehicle.
+                    // Modifies gravity. Slider between -1 (double-gravity) and 1 (full anti-gravity)
+                    // KF: So far I have found no good method to combine a script-requested .Z velocity and gravity.
+                    // Therefore only m_VehicleBuoyancy=1 (0g) will use the script-requested .Z velocity.
+
+        //Attractor properties
+        private float m_verticalAttractionEfficiency = 1.0f;        // damped
+        private float m_verticalAttractionTimescale = 1000f;        // Timescale > 300  means no vert attractor.
+
+
+        // auxiliar
+        private float m_lmEfect = 0f;                                            // current linear motor eficiency
+        private float m_lmDecay = 0f;                                            // current linear decay
+
+        private float m_amEfect = 0;                                            // current angular motor eficiency
+        private float m_amDecay = 0f;                                            // current linear decay
+
+        private float m_ffactor = 1.0f;
+
+        private float m_timestep = 0.02f;
+        private float m_invtimestep = 50;
+
+
+        float m_ampwr;
+        float m_amdampX;
+        float m_amdampY;
+        float m_amdampZ;
+
+
+        public float FrictionFactor
+        {
+            get
+            {
+                return m_ffactor;
+            }
+        }
+
+
+        public ODEDynamics(OdePrim rootp)
+        {
+            rootPrim = rootp;
+            _pParentScene = rootPrim._parent_scene;
+            m_timestep = _pParentScene.ODE_STEPSIZE;
+            m_invtimestep = 1.0f / m_timestep;
+        }
+
+        public void DoSetVehicle(VehicleData vd)
+        {
+            m_type = vd.m_type;
+            m_flags = vd.m_flags;
+
+            
+            // Linear properties
+            m_linearMotorDirection = vd.m_linearMotorDirection;
+
+            m_linearFrictionTimescale = vd.m_linearFrictionTimescale;
+            if (m_linearFrictionTimescale.X < m_timestep) m_linearFrictionTimescale.X = m_timestep;
+            if (m_linearFrictionTimescale.Y < m_timestep) m_linearFrictionTimescale.Y = m_timestep;
+            if (m_linearFrictionTimescale.Z < m_timestep) m_linearFrictionTimescale.Z = m_timestep;
+
+            m_linearMotorDecayTimescale = vd.m_linearMotorDecayTimescale;
+            if (m_linearMotorDecayTimescale < m_timestep) m_linearMotorDecayTimescale = m_timestep;
+            m_linearMotorDecayTimescale += 0.2f;
+            m_linearMotorDecayTimescale *= m_invtimestep;
+
+            m_linearMotorTimescale = vd.m_linearMotorTimescale;
+            if (m_linearMotorTimescale < m_timestep) m_linearMotorTimescale = m_timestep;
+
+            m_linearMotorOffset = vd.m_linearMotorOffset;
+
+            //Angular properties
+            m_angularMotorDirection = vd.m_angularMotorDirection;
+            m_angularMotorTimescale = vd.m_angularMotorTimescale;
+            if (m_angularMotorTimescale < m_timestep) m_angularMotorTimescale = m_timestep;
+
+            m_angularMotorDecayTimescale = vd.m_angularMotorDecayTimescale;
+            if (m_angularMotorDecayTimescale < m_timestep) m_angularMotorDecayTimescale = m_timestep;
+            m_angularMotorDecayTimescale *= m_invtimestep;
+
+            m_angularFrictionTimescale = vd.m_angularFrictionTimescale;
+            if (m_angularFrictionTimescale.X < m_timestep) m_angularFrictionTimescale.X = m_timestep;
+            if (m_angularFrictionTimescale.Y < m_timestep) m_angularFrictionTimescale.Y = m_timestep;
+            if (m_angularFrictionTimescale.Z < m_timestep) m_angularFrictionTimescale.Z = m_timestep;
+
+            //Deflection properties
+            m_angularDeflectionEfficiency = vd.m_angularDeflectionEfficiency;
+            m_angularDeflectionTimescale = vd.m_angularDeflectionTimescale;
+            if (m_angularDeflectionTimescale < m_timestep) m_angularDeflectionTimescale = m_timestep;
+
+            m_linearDeflectionEfficiency = vd.m_linearDeflectionEfficiency;
+            m_linearDeflectionTimescale = vd.m_linearDeflectionTimescale;
+            if (m_linearDeflectionTimescale < m_timestep) m_linearDeflectionTimescale = m_timestep;
+
+            //Banking properties
+            m_bankingEfficiency = vd.m_bankingEfficiency;
+            m_bankingMix = vd.m_bankingMix;
+            m_bankingTimescale = vd.m_bankingTimescale;
+            if (m_bankingTimescale < m_timestep) m_bankingTimescale = m_timestep;
+
+            //Hover and Buoyancy properties
+            m_VhoverHeight = vd.m_VhoverHeight;
+            m_VhoverEfficiency = vd.m_VhoverEfficiency;
+            m_VhoverTimescale = vd.m_VhoverTimescale;
+            if (m_VhoverTimescale < m_timestep) m_VhoverTimescale = m_timestep;
+
+            m_VehicleBuoyancy = vd.m_VehicleBuoyancy;
+
+            //Attractor properties
+            m_verticalAttractionEfficiency = vd.m_verticalAttractionEfficiency;
+            m_verticalAttractionTimescale = vd.m_verticalAttractionTimescale;
+            if (m_verticalAttractionTimescale < m_timestep) m_verticalAttractionTimescale = m_timestep;
+
+            // Axis
+            m_referenceFrame = vd.m_referenceFrame;
+
+            m_lmEfect = 0;
+            m_lmDecay = (1.0f - 1.0f / m_linearMotorDecayTimescale);
+            m_amEfect = 0;
+            m_ffactor = 1.0f;
+        }
+
+        internal void ProcessFloatVehicleParam(Vehicle pParam, float pValue)
+        {
+            float len;
+
+            switch (pParam)
+            {
+                case Vehicle.ANGULAR_DEFLECTION_EFFICIENCY:
+                    if (pValue < 0f) pValue = 0f;
+                    if (pValue > 1f) pValue = 1f;
+                    m_angularDeflectionEfficiency = pValue;
+                    break;
+                case Vehicle.ANGULAR_DEFLECTION_TIMESCALE:
+                    if (pValue < m_timestep) pValue = m_timestep;
+                    m_angularDeflectionTimescale = pValue;
+                    break;
+                case Vehicle.ANGULAR_MOTOR_DECAY_TIMESCALE:
+                    if (pValue < m_timestep) pValue = m_timestep;
+                    else if (pValue > 120) pValue = 120;
+                    m_angularMotorDecayTimescale = pValue * m_invtimestep;
+                    m_amDecay = 1.0f - 1.0f / m_angularMotorDecayTimescale;
+                    break;
+                case Vehicle.ANGULAR_MOTOR_TIMESCALE:
+                    if (pValue < m_timestep) pValue = m_timestep;
+                    m_angularMotorTimescale = pValue;
+                    break;
+                case Vehicle.BANKING_EFFICIENCY:
+                    if (pValue < -1f) pValue = -1f;
+                    if (pValue > 1f) pValue = 1f;
+                    m_bankingEfficiency = pValue;
+                    break;
+                case Vehicle.BANKING_MIX:
+                    if (pValue < 0f) pValue = 0f;
+                    if (pValue > 1f) pValue = 1f;
+                    m_bankingMix = pValue;
+                    break;
+                case Vehicle.BANKING_TIMESCALE:
+                    if (pValue < m_timestep) pValue = m_timestep;
+                    m_bankingTimescale = pValue;
+                    break;
+                case Vehicle.BUOYANCY:
+                    if (pValue < -1f) pValue = -1f;
+                    if (pValue > 1f) pValue = 1f;
+                    m_VehicleBuoyancy = pValue;
+                    break;
+                case Vehicle.HOVER_EFFICIENCY:
+                    if (pValue < 0f) pValue = 0f;
+                    if (pValue > 1f) pValue = 1f;
+                    m_VhoverEfficiency = pValue;
+                    break;
+                case Vehicle.HOVER_HEIGHT:
+                    m_VhoverHeight = pValue;
+                    break;
+                case Vehicle.HOVER_TIMESCALE:
+                    if (pValue < m_timestep) pValue = m_timestep;
+                    m_VhoverTimescale = pValue;
+                    break;
+                case Vehicle.LINEAR_DEFLECTION_EFFICIENCY:
+                    if (pValue < 0f) pValue = 0f;
+                    if (pValue > 1f) pValue = 1f;
+                    m_linearDeflectionEfficiency = pValue;
+                    break;
+                case Vehicle.LINEAR_DEFLECTION_TIMESCALE:
+                    if (pValue < m_timestep) pValue = m_timestep;
+                    m_linearDeflectionTimescale = pValue;
+                    break;
+                case Vehicle.LINEAR_MOTOR_DECAY_TIMESCALE:
+                    if (pValue < m_timestep) pValue = m_timestep;
+                    else if (pValue > 120) pValue = 120;
+                    m_linearMotorDecayTimescale = (0.2f +pValue) * m_invtimestep;
+                    m_lmDecay = (1.0f - 1.0f / m_linearMotorDecayTimescale);
+                    break;
+                case Vehicle.LINEAR_MOTOR_TIMESCALE:
+                    if (pValue < m_timestep) pValue = m_timestep;
+                    m_linearMotorTimescale = pValue;
+                    break;
+                case Vehicle.VERTICAL_ATTRACTION_EFFICIENCY:
+                    if (pValue < 0f) pValue = 0f;
+                    if (pValue > 1f) pValue = 1f;
+                    m_verticalAttractionEfficiency = pValue;
+                    break;
+                case Vehicle.VERTICAL_ATTRACTION_TIMESCALE:
+                    if (pValue < m_timestep) pValue = m_timestep;
+                    m_verticalAttractionTimescale = pValue;
+                    break;
+
+                // These are vector properties but the engine lets you use a single float value to
+                // set all of the components to the same value
+                case Vehicle.ANGULAR_FRICTION_TIMESCALE:
+                    if (pValue < m_timestep) pValue = m_timestep;
+                    m_angularFrictionTimescale = new Vector3(pValue, pValue, pValue);
+                    break;
+                case Vehicle.ANGULAR_MOTOR_DIRECTION:
+                    m_angularMotorDirection = new Vector3(pValue, pValue, pValue);
+                    len = m_angularMotorDirection.Length();
+                    if (len > 12.566f)
+                        m_angularMotorDirection *= (12.566f / len);
+
+                    m_amEfect = 1.0f ; // turn it on
+                    m_amDecay = 1.0f - 1.0f / m_angularMotorDecayTimescale;
+
+                    if (rootPrim.Body != IntPtr.Zero && !d.BodyIsEnabled(rootPrim.Body)
+                            && !rootPrim.m_isSelected && !rootPrim.m_disabled)
+                        d.BodyEnable(rootPrim.Body);
+                    break;
+                case Vehicle.LINEAR_FRICTION_TIMESCALE:
+                    if (pValue < m_timestep) pValue = m_timestep;
+                    m_linearFrictionTimescale = new Vector3(pValue, pValue, pValue);
+                    break;
+                case Vehicle.LINEAR_MOTOR_DIRECTION:
+                    m_linearMotorDirection = new Vector3(pValue, pValue, pValue);
+                    len = m_linearMotorDirection.Length();
+                    if (len > 100.0f)
+                        m_linearMotorDirection *= (100.0f / len);
+
+                    m_lmDecay = 1.0f - 1.0f / m_linearMotorDecayTimescale;
+                    m_lmEfect = 1.0f; // turn it on
+
+                    m_ffactor = 0.0f;
+                    if (rootPrim.Body != IntPtr.Zero && !d.BodyIsEnabled(rootPrim.Body)
+                            && !rootPrim.m_isSelected && !rootPrim.m_disabled)
+                        d.BodyEnable(rootPrim.Body);
+                    break;
+                case Vehicle.LINEAR_MOTOR_OFFSET:
+                    m_linearMotorOffset = new Vector3(pValue, pValue, pValue);
+                    len = m_linearMotorOffset.Length();
+                    if (len > 100.0f)
+                        m_linearMotorOffset *= (100.0f / len);
+                    break;
+            }
+        }//end ProcessFloatVehicleParam
+
+        internal void ProcessVectorVehicleParam(Vehicle pParam, Vector3 pValue)
+        {
+            float len;
+
+            switch (pParam)
+            {
+                case Vehicle.ANGULAR_FRICTION_TIMESCALE:
+                    if (pValue.X < m_timestep) pValue.X = m_timestep;
+                    if (pValue.Y < m_timestep) pValue.Y = m_timestep;
+                    if (pValue.Z < m_timestep) pValue.Z = m_timestep;
+
+                    m_angularFrictionTimescale = new Vector3(pValue.X, pValue.Y, pValue.Z);
+                    break;
+                case Vehicle.ANGULAR_MOTOR_DIRECTION:
+                    m_angularMotorDirection = new Vector3(pValue.X, pValue.Y, pValue.Z);
+                    // Limit requested angular speed to 2 rps= 4 pi rads/sec
+                    len = m_angularMotorDirection.Length();
+                    if (len > 12.566f)
+                        m_angularMotorDirection *= (12.566f / len);
+
+                    m_amEfect = 1.0f; // turn it on
+                    m_amDecay = 1.0f - 1.0f / m_angularMotorDecayTimescale;
+
+                    if (rootPrim.Body != IntPtr.Zero && !d.BodyIsEnabled(rootPrim.Body)
+                            && !rootPrim.m_isSelected && !rootPrim.m_disabled)
+                        d.BodyEnable(rootPrim.Body);
+                    break;
+                case Vehicle.LINEAR_FRICTION_TIMESCALE:
+                    if (pValue.X < m_timestep) pValue.X = m_timestep;
+                    if (pValue.Y < m_timestep) pValue.Y = m_timestep;
+                    if (pValue.Z < m_timestep) pValue.Z = m_timestep;
+                    m_linearFrictionTimescale = new Vector3(pValue.X, pValue.Y, pValue.Z);
+                    break;
+                case Vehicle.LINEAR_MOTOR_DIRECTION:
+                    m_linearMotorDirection = new Vector3(pValue.X, pValue.Y, pValue.Z);
+                    len = m_linearMotorDirection.Length();
+                    if (len > 100.0f)
+                        m_linearMotorDirection *= (100.0f / len);
+
+                    m_lmEfect = 1.0f; // turn it on
+                    m_lmDecay = 1.0f - 1.0f / m_linearMotorDecayTimescale;
+
+                    m_ffactor = 0.0f;
+                    if (rootPrim.Body != IntPtr.Zero && !d.BodyIsEnabled(rootPrim.Body)
+                            && !rootPrim.m_isSelected && !rootPrim.m_disabled)
+                        d.BodyEnable(rootPrim.Body);
+                    break;
+                case Vehicle.LINEAR_MOTOR_OFFSET:
+                    m_linearMotorOffset = new Vector3(pValue.X, pValue.Y, pValue.Z);
+                    len = m_linearMotorOffset.Length();
+                    if (len > 100.0f)
+                        m_linearMotorOffset *= (100.0f / len);
+                    break;
+                case Vehicle.BLOCK_EXIT:
+                    m_BlockingEndPoint = new Vector3(pValue.X, pValue.Y, pValue.Z);
+                    break;
+            }
+        }//end ProcessVectorVehicleParam
+
+        internal void ProcessRotationVehicleParam(Vehicle pParam, Quaternion pValue)
+        {
+            switch (pParam)
+            {
+                case Vehicle.REFERENCE_FRAME:
+                    //                    m_referenceFrame = Quaternion.Inverse(pValue);
+                    m_referenceFrame = pValue;
+                    break;
+                case Vehicle.ROLL_FRAME:
+                    m_RollreferenceFrame = pValue;
+                    break;
+            }
+        }//end ProcessRotationVehicleParam
+
+        internal void ProcessVehicleFlags(int pParam, bool remove)
+        {
+            if (remove)
+            {
+                m_flags &= ~((VehicleFlag)pParam);
+            }
+            else
+            {
+                m_flags |= (VehicleFlag)pParam;
+            }
+        }//end ProcessVehicleFlags
+
+        internal void ProcessTypeChange(Vehicle pType)
+        {
+            m_lmEfect = 0;
+
+            m_amEfect = 0;
+            m_ffactor = 1f;
+
+            m_linearMotorDirection = Vector3.Zero;
+            m_angularMotorDirection = Vector3.Zero;
+
+            m_BlockingEndPoint = Vector3.Zero;
+            m_RollreferenceFrame = Quaternion.Identity;
+            m_linearMotorOffset = Vector3.Zero;
+
+            m_referenceFrame = Quaternion.Identity;
+
+            // Set Defaults For Type
+            m_type = pType;
+            switch (pType)
+            {
+                case Vehicle.TYPE_NONE:
+                    m_linearFrictionTimescale = new Vector3(1000, 1000, 1000);
+                    m_angularFrictionTimescale = new Vector3(1000, 1000, 1000);
+                    m_linearMotorTimescale = 1000;
+                    m_linearMotorDecayTimescale = 120 * m_invtimestep;
+                    m_angularMotorTimescale = 1000;
+                    m_angularMotorDecayTimescale = 1000  * m_invtimestep;
+                    m_VhoverHeight = 0;
+                    m_VhoverEfficiency = 1;
+                    m_VhoverTimescale = 1000;
+                    m_VehicleBuoyancy = 0;
+                    m_linearDeflectionEfficiency = 0;
+                    m_linearDeflectionTimescale = 1000;
+                    m_angularDeflectionEfficiency = 0;
+                    m_angularDeflectionTimescale = 1000;
+                    m_bankingEfficiency = 0;
+                    m_bankingMix = 1;
+                    m_bankingTimescale = 1000;
+                    m_verticalAttractionEfficiency = 0;
+                    m_verticalAttractionTimescale = 1000;
+
+                    m_flags = (VehicleFlag)0;
+                    break;
+
+                case Vehicle.TYPE_SLED:
+                    m_linearFrictionTimescale = new Vector3(30, 1, 1000);
+                    m_angularFrictionTimescale = new Vector3(1000, 1000, 1000);
+                    m_linearMotorTimescale = 1000;
+                    m_linearMotorDecayTimescale = 120 * m_invtimestep;
+                    m_angularMotorTimescale = 1000;
+                    m_angularMotorDecayTimescale = 120 * m_invtimestep;
+                    m_VhoverHeight = 0;
+                    m_VhoverEfficiency = 1;
+                    m_VhoverTimescale = 10;
+                    m_VehicleBuoyancy = 0;
+                    m_linearDeflectionEfficiency = 1;
+                    m_linearDeflectionTimescale = 1;
+                    m_angularDeflectionEfficiency = 0;
+                    m_angularDeflectionTimescale = 10;
+                    m_verticalAttractionEfficiency = 1;
+                    m_verticalAttractionTimescale = 1000;
+                    m_bankingEfficiency = 0;
+                    m_bankingMix = 1;
+                    m_bankingTimescale = 10;
+                    m_flags &=
+                         ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
+                           VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY);
+                    m_flags |= (VehicleFlag.NO_DEFLECTION_UP |
+                        VehicleFlag.LIMIT_ROLL_ONLY |
+                        VehicleFlag.LIMIT_MOTOR_UP);
+                    break;
+
+                case Vehicle.TYPE_CAR:
+                    m_linearFrictionTimescale = new Vector3(100, 2, 1000);
+                    m_angularFrictionTimescale = new Vector3(1000, 1000, 1000);
+                    m_linearMotorTimescale = 1;
+                    m_linearMotorDecayTimescale = 60 * m_invtimestep;
+                    m_angularMotorTimescale = 1;
+                    m_angularMotorDecayTimescale = 0.8f * m_invtimestep;
+                    m_VhoverHeight = 0;
+                    m_VhoverEfficiency = 0;
+                    m_VhoverTimescale = 1000;
+                    m_VehicleBuoyancy = 0;
+                    m_linearDeflectionEfficiency = 1;
+                    m_linearDeflectionTimescale = 2;
+                    m_angularDeflectionEfficiency = 0;
+                    m_angularDeflectionTimescale = 10;
+                    m_verticalAttractionEfficiency = 1f;
+                    m_verticalAttractionTimescale = 10f;
+                    m_bankingEfficiency = -0.2f;
+                    m_bankingMix = 1;
+                    m_bankingTimescale = 1;
+                    m_flags &= ~(VehicleFlag.HOVER_WATER_ONLY |
+                                VehicleFlag.HOVER_TERRAIN_ONLY |
+                                VehicleFlag.HOVER_GLOBAL_HEIGHT);
+                    m_flags |= (VehicleFlag.NO_DEFLECTION_UP |
+                                VehicleFlag.LIMIT_ROLL_ONLY |
+                                VehicleFlag.LIMIT_MOTOR_UP |
+                                VehicleFlag.HOVER_UP_ONLY);
+                    break;
+                case Vehicle.TYPE_BOAT:
+                    m_linearFrictionTimescale = new Vector3(10, 3, 2);
+                    m_angularFrictionTimescale = new Vector3(10, 10, 10);
+                    m_linearMotorTimescale = 5;
+                    m_linearMotorDecayTimescale = 60 * m_invtimestep;
+                    m_angularMotorTimescale = 4;
+                    m_angularMotorDecayTimescale = 4 * m_invtimestep;
+                    m_VhoverHeight = 0;
+                    m_VhoverEfficiency = 0.5f;
+                    m_VhoverTimescale = 2;
+                    m_VehicleBuoyancy = 1;
+                    m_linearDeflectionEfficiency = 0.5f;
+                    m_linearDeflectionTimescale = 3;
+                    m_angularDeflectionEfficiency = 0.5f;
+                    m_angularDeflectionTimescale = 5;
+                    m_verticalAttractionEfficiency = 0.5f;
+                    m_verticalAttractionTimescale = 5f;
+                    m_bankingEfficiency = -0.3f;
+                    m_bankingMix = 0.8f;
+                    m_bankingTimescale = 1;
+                    m_flags &= ~(VehicleFlag.HOVER_TERRAIN_ONLY |
+                            VehicleFlag.HOVER_GLOBAL_HEIGHT |
+                            VehicleFlag.HOVER_UP_ONLY); // |
+//                            VehicleFlag.LIMIT_ROLL_ONLY);
+                    m_flags |= (VehicleFlag.NO_DEFLECTION_UP |
+                                VehicleFlag.LIMIT_MOTOR_UP |
+                                VehicleFlag.HOVER_UP_ONLY |  // new sl
+                                VehicleFlag.HOVER_WATER_ONLY);
+                    break;
+
+                case Vehicle.TYPE_AIRPLANE:
+                    m_linearFrictionTimescale = new Vector3(200, 10, 5);
+                    m_angularFrictionTimescale = new Vector3(20, 20, 20);
+                    m_linearMotorTimescale = 2;
+                    m_linearMotorDecayTimescale = 60 * m_invtimestep;
+                    m_angularMotorTimescale = 4;
+                    m_angularMotorDecayTimescale = 8 * m_invtimestep;
+                    m_VhoverHeight = 0;
+                    m_VhoverEfficiency = 0.5f;
+                    m_VhoverTimescale = 1000;
+                    m_VehicleBuoyancy = 0;
+                    m_linearDeflectionEfficiency = 0.5f;
+                    m_linearDeflectionTimescale = 0.5f;
+                    m_angularDeflectionEfficiency = 1;
+                    m_angularDeflectionTimescale = 2;
+                    m_verticalAttractionEfficiency = 0.9f;
+                    m_verticalAttractionTimescale = 2f;
+                    m_bankingEfficiency = 1;
+                    m_bankingMix = 0.7f;
+                    m_bankingTimescale = 2;
+                    m_flags &= ~(VehicleFlag.HOVER_WATER_ONLY |
+                        VehicleFlag.HOVER_TERRAIN_ONLY |
+                        VehicleFlag.HOVER_GLOBAL_HEIGHT |
+                        VehicleFlag.HOVER_UP_ONLY |
+                        VehicleFlag.NO_DEFLECTION_UP |
+                        VehicleFlag.LIMIT_MOTOR_UP);
+                    m_flags |= (VehicleFlag.LIMIT_ROLL_ONLY);
+                    break;
+
+                case Vehicle.TYPE_BALLOON:
+                    m_linearFrictionTimescale = new Vector3(5, 5, 5);
+                    m_angularFrictionTimescale = new Vector3(10, 10, 10);
+                    m_linearMotorTimescale = 5;
+                    m_linearMotorDecayTimescale = 60 * m_invtimestep;
+                    m_angularMotorTimescale = 6;
+                    m_angularMotorDecayTimescale = 10 * m_invtimestep;
+                    m_VhoverHeight = 5;
+                    m_VhoverEfficiency = 0.8f;
+                    m_VhoverTimescale = 10;
+                    m_VehicleBuoyancy = 1;
+                    m_linearDeflectionEfficiency = 0;
+                    m_linearDeflectionTimescale = 5 * m_invtimestep;
+                    m_angularDeflectionEfficiency = 0;
+                    m_angularDeflectionTimescale = 5;
+                    m_verticalAttractionEfficiency = 1f;
+                    m_verticalAttractionTimescale = 1000f;
+                    m_bankingEfficiency = 0;
+                    m_bankingMix = 0.7f;
+                    m_bankingTimescale = 5;
+                    m_flags &= ~(VehicleFlag.HOVER_WATER_ONLY |
+                        VehicleFlag.HOVER_TERRAIN_ONLY |
+                        VehicleFlag.HOVER_UP_ONLY |
+                        VehicleFlag.NO_DEFLECTION_UP |
+                        VehicleFlag.LIMIT_MOTOR_UP  | //);
+                        VehicleFlag.LIMIT_ROLL_ONLY | // new sl
+                        VehicleFlag.HOVER_GLOBAL_HEIGHT); // new sl
+
+//                    m_flags |= (VehicleFlag.LIMIT_ROLL_ONLY |
+//                        VehicleFlag.HOVER_GLOBAL_HEIGHT);
+                    break;
+
+            }
+
+            m_lmDecay = (1.0f - 1.0f / m_linearMotorDecayTimescale);
+            m_amDecay = 1.0f - 1.0f / m_angularMotorDecayTimescale;
+
+        }//end SetDefaultsForType
+
+        internal void Stop()
+        {
+            m_lmEfect = 0;
+            m_lmDecay = 0f;
+            m_amEfect = 0;
+            m_amDecay = 0;
+            m_ffactor = 1f;
+        }
+
+        public static Vector3 Xrot(Quaternion rot)
+        {
+            Vector3 vec;
+            rot.Normalize(); // just in case
+            vec.X = 2 * (rot.X * rot.X + rot.W * rot.W) - 1;
+            vec.Y = 2 * (rot.X * rot.Y + rot.Z * rot.W);
+            vec.Z = 2 * (rot.X * rot.Z - rot.Y * rot.W);
+            return vec;
+        }
+
+        public static Vector3 Zrot(Quaternion rot)
+        {
+            Vector3 vec;
+            rot.Normalize(); // just in case
+            vec.X = 2 * (rot.X * rot.Z + rot.Y * rot.W);
+            vec.Y = 2 * (rot.Y * rot.Z - rot.X * rot.W);
+            vec.Z = 2 * (rot.Z * rot.Z + rot.W * rot.W) - 1;
+
+            return vec;
+        }
+
+        private const float pi = (float)Math.PI;
+        private const float halfpi = 0.5f * (float)Math.PI;
+        private const float twopi = 2.0f * pi;
+
+        public static Vector3 ubitRot2Euler(Quaternion rot)
+        {
+            // returns roll in X
+            //         pitch in Y
+            //         yaw in Z
+            Vector3 vec;
+
+            // assuming rot is normalised
+            // rot.Normalize();
+
+            float zX = rot.X * rot.Z + rot.Y * rot.W;
+
+            if (zX < -0.49999f)
+            {
+                vec.X = 0;
+                vec.Y = -halfpi;
+                vec.Z = (float)(-2d * Math.Atan(rot.X / rot.W));
+            }
+            else if (zX > 0.49999f)
+            {
+                vec.X = 0;
+                vec.Y = halfpi;
+                vec.Z = (float)(2d * Math.Atan(rot.X / rot.W));
+            }
+            else
+            {
+                vec.Y = (float)Math.Asin(2 * zX);
+
+                float sqw = rot.W * rot.W;
+
+                float minuszY = rot.X * rot.W - rot.Y * rot.Z;
+                float zZ = rot.Z * rot.Z + sqw - 0.5f;
+
+                vec.X = (float)Math.Atan2(minuszY, zZ);
+
+                float yX = rot.Z * rot.W - rot.X * rot.Y; //( have negative ?)
+                float yY = rot.X * rot.X + sqw - 0.5f;
+                vec.Z = (float)Math.Atan2(yX, yY);
+            }
+            return vec;
+        }
+
+        public static void GetRollPitch(Quaternion rot, out float roll, out float pitch)
+        {
+            // assuming rot is normalised
+            // rot.Normalize();
+
+            float zX = rot.X * rot.Z + rot.Y * rot.W;
+
+            if (zX < -0.49999f)
+            {
+                roll = 0;
+                pitch = -halfpi;
+            }
+            else if (zX > 0.49999f)
+            {
+                roll = 0;
+                pitch = halfpi;
+            }
+            else
+            {
+                pitch = (float)Math.Asin(2 * zX);
+
+                float minuszY = rot.X * rot.W - rot.Y * rot.Z;
+                float zZ = rot.Z * rot.Z + rot.W * rot.W - 0.5f;
+
+                roll = (float)Math.Atan2(minuszY, zZ);
+            }
+            return ;
+        }        
+        
+        internal void Step()
+        {
+            IntPtr Body = rootPrim.Body;
+
+            d.Mass dmass;
+            d.BodyGetMass(Body, out dmass);
+
+            d.Quaternion rot = d.BodyGetQuaternion(Body);
+            Quaternion objrotq = new Quaternion(rot.X, rot.Y, rot.Z, rot.W);    // rotq = rotation of object
+            Quaternion rotq = objrotq;    // rotq = rotation of object
+            rotq *= m_referenceFrame; // rotq is now rotation in vehicle reference frame
+            Quaternion irotq = Quaternion.Inverse(rotq);
+
+            d.Vector3 dvtmp;
+            Vector3 tmpV;
+            Vector3 curVel; // velocity in world
+            Vector3 curAngVel; // angular velocity in world
+            Vector3 force = Vector3.Zero; // actually linear aceleration until mult by mass in world frame
+            Vector3 torque = Vector3.Zero;// actually angular aceleration until mult by Inertia in vehicle frame
+            d.Vector3 dtorque = new d.Vector3();
+
+            dvtmp = d.BodyGetLinearVel(Body);
+            curVel.X = dvtmp.X;
+            curVel.Y = dvtmp.Y;
+            curVel.Z = dvtmp.Z;
+            Vector3 curLocalVel = curVel * irotq; // current velocity in  local
+
+            dvtmp = d.BodyGetAngularVel(Body);
+            curAngVel.X = dvtmp.X;
+            curAngVel.Y = dvtmp.Y;
+            curAngVel.Z = dvtmp.Z;
+            Vector3 curLocalAngVel = curAngVel * irotq; // current angular velocity in  local
+
+            float ldampZ = 0;
+            
+            // linear motor
+            if (m_lmEfect > 0.01 && m_linearMotorTimescale < 1000)
+            {
+                tmpV = m_linearMotorDirection - curLocalVel; // velocity error
+                tmpV *= m_lmEfect / m_linearMotorTimescale; // error to correct in this timestep
+                tmpV *= rotq; // to world
+
+                if ((m_flags & VehicleFlag.LIMIT_MOTOR_UP) != 0)
+                    tmpV.Z = 0;
+
+                if (m_linearMotorOffset.X != 0 || m_linearMotorOffset.Y != 0 || m_linearMotorOffset.Z != 0)
+                {
+                    // have offset, do it now
+                    tmpV *= dmass.mass;
+                    d.BodyAddForceAtRelPos(Body, tmpV.X, tmpV.Y, tmpV.Z, m_linearMotorOffset.X, m_linearMotorOffset.Y, m_linearMotorOffset.Z);
+                }
+                else
+                {
+                    force.X += tmpV.X;
+                    force.Y += tmpV.Y;
+                    force.Z += tmpV.Z;
+                }
+
+                m_lmEfect *= m_lmDecay;
+//                m_ffactor = 0.01f + 1e-4f * curVel.LengthSquared();
+                m_ffactor = 0.0f;
+            }
+            else
+            {
+                m_lmEfect = 0;
+                m_ffactor = 1f;
+            }
+
+            // hover
+            if (m_VhoverTimescale < 300 && rootPrim.prim_geom != IntPtr.Zero)
+            {
+                //                d.Vector3 pos = d.BodyGetPosition(Body);
+                d.Vector3 pos = d.GeomGetPosition(rootPrim.prim_geom);
+                pos.Z -= 0.21f; // minor offset that seems to be always there in sl
+
+                float t = _pParentScene.GetTerrainHeightAtXY(pos.X, pos.Y);
+                float perr;
+
+                // default to global but don't go underground
+                perr = m_VhoverHeight - pos.Z;
+
+                if ((m_flags & VehicleFlag.HOVER_GLOBAL_HEIGHT) == 0)
+                {
+                    if ((m_flags & VehicleFlag.HOVER_WATER_ONLY) != 0)
+                    {
+                        perr += _pParentScene.GetWaterLevel();
+                    }
+                    else if ((m_flags & VehicleFlag.HOVER_TERRAIN_ONLY) != 0)
+                    {
+                        perr += t;
+                    }
+                    else
+                    {
+                        float w = _pParentScene.GetWaterLevel();
+                        if (t > w)
+                            perr += t;
+                        else
+                            perr += w;
+                    }
+                }
+                else if (t > m_VhoverHeight)
+                        perr = t - pos.Z; ;
+
+                if ((m_flags & VehicleFlag.HOVER_UP_ONLY) == 0 || perr > -0.1)
+                {
+                    ldampZ = m_VhoverEfficiency * m_invtimestep;
+
+                    perr *= (1.0f + ldampZ) / m_VhoverTimescale;
+
+                    //                    force.Z += perr - curVel.Z * tmp;
+                    force.Z += perr;
+                    ldampZ *= -curVel.Z;
+
+                    force.Z += _pParentScene.gravityz * (1f - m_VehicleBuoyancy);
+                }
+                else // no buoyancy
+                    force.Z += _pParentScene.gravityz;
+            }
+            else
+            {
+                // default gravity and Buoyancy
+                force.Z += _pParentScene.gravityz * (1f - m_VehicleBuoyancy);
+            }
+
+            // linear deflection
+            if (m_linearDeflectionEfficiency > 0)
+            {
+                float len = curVel.Length();
+                if (len > 0.01) // if moving
+                {
+                    Vector3 atAxis;
+                    atAxis = Xrot(rotq); // where are we pointing to
+                    atAxis *= len; // make it same size as world velocity vector
+
+                    tmpV = -atAxis; // oposite direction
+                    atAxis -= curVel; // error to one direction
+                    len = atAxis.LengthSquared();
+
+                    tmpV -= curVel; // error to oposite
+                    float lens = tmpV.LengthSquared();
+
+                    if (len > 0.01 || lens > 0.01) // do nothing if close enougth
+                    {
+                        if (len < lens)
+                            tmpV = atAxis;
+
+                        tmpV *= (m_linearDeflectionEfficiency / m_linearDeflectionTimescale); // error to correct in this timestep
+                        force.X += tmpV.X;
+                        force.Y += tmpV.Y;
+                        if ((m_flags & VehicleFlag.NO_DEFLECTION_UP) == 0)
+                            force.Z += tmpV.Z;
+                    }
+                }
+            }
+
+            // linear friction/damping
+            if (curLocalVel.X != 0 || curLocalVel.Y != 0 || curLocalVel.Z != 0)
+            {
+                tmpV.X = -curLocalVel.X / m_linearFrictionTimescale.X;
+                tmpV.Y = -curLocalVel.Y / m_linearFrictionTimescale.Y;
+                tmpV.Z = -curLocalVel.Z / m_linearFrictionTimescale.Z;
+                tmpV *= rotq; // to world
+
+                if(ldampZ != 0 && Math.Abs(ldampZ) > Math.Abs(tmpV.Z))
+                    tmpV.Z = ldampZ;
+                force.X += tmpV.X;
+                force.Y += tmpV.Y;
+                force.Z += tmpV.Z;
+            }
+
+            // vertical atractor
+            if (m_verticalAttractionTimescale < 300)
+            {
+                float roll;
+                float pitch;
+
+
+
+                float ftmp = m_invtimestep / m_verticalAttractionTimescale / m_verticalAttractionTimescale;
+
+                float ftmp2;
+                ftmp2 = 0.5f * m_verticalAttractionEfficiency * m_invtimestep;
+                m_amdampX = ftmp2;
+
+                m_ampwr = 1.0f - 0.8f * m_verticalAttractionEfficiency;
+
+                GetRollPitch(irotq, out roll, out pitch);
+
+                if (roll > halfpi)
+                    roll = pi - roll;
+                else if (roll < -halfpi)
+                    roll = -pi - roll;
+
+                float effroll = pitch / halfpi;
+                effroll *= effroll;
+                effroll = 1 - effroll;
+                effroll *= roll;
+
+
+                torque.X += effroll * ftmp;
+
+                if ((m_flags & VehicleFlag.LIMIT_ROLL_ONLY) == 0)
+                {
+                    float effpitch = roll / halfpi;
+                    effpitch *= effpitch;
+                    effpitch = 1 - effpitch;
+                    effpitch *= pitch;
+
+                    torque.Y += effpitch * ftmp;
+                }
+
+                if (m_bankingEfficiency != 0 && Math.Abs(effroll) > 0.01)
+                {
+
+                    float broll = effroll;
+                    /*
+                                        if (broll > halfpi)
+                                            broll = pi - broll;
+                                        else if (broll < -halfpi)
+                                            broll = -pi - broll;                           
+                    */
+                    broll *= m_bankingEfficiency;
+                    if (m_bankingMix != 0)
+                    {
+                        float vfact = Math.Abs(curLocalVel.X) / 10.0f;
+                        if (vfact > 1.0f) vfact = 1.0f;
+
+                        if (curLocalVel.X >= 0)
+                            broll *= (1 + (vfact - 1) * m_bankingMix);
+                        else
+                            broll *= -(1 + (vfact - 1) * m_bankingMix);
+                    }
+                    // make z rot be in world Z not local as seems to be in sl
+
+                    broll = broll / m_bankingTimescale;
+
+
+                    tmpV = Zrot(irotq);
+                    tmpV *= broll;
+
+                    torque.X += tmpV.X;
+                    torque.Y += tmpV.Y;
+                    torque.Z += tmpV.Z;
+
+                    m_amdampZ = Math.Abs(m_bankingEfficiency) / m_bankingTimescale;
+                    m_amdampY = m_amdampZ;
+
+                }
+                else
+                {
+                    m_amdampZ = 1 / m_angularFrictionTimescale.Z;
+                    m_amdampY = m_amdampX;
+                }
+            }
+            else
+            {
+                m_ampwr = 1.0f;
+                m_amdampX = 1 / m_angularFrictionTimescale.X;
+                m_amdampY = 1 / m_angularFrictionTimescale.Y;
+                m_amdampZ = 1 / m_angularFrictionTimescale.Z;
+            }
+
+            // angular motor
+            if (m_amEfect > 0.01 && m_angularMotorTimescale < 1000)
+            {
+                tmpV = m_angularMotorDirection - curLocalAngVel; // velocity error
+                tmpV *= m_amEfect / m_angularMotorTimescale; // error to correct in this timestep
+                torque.X += tmpV.X * m_ampwr;
+                torque.Y += tmpV.Y * m_ampwr;
+                torque.Z += tmpV.Z;
+
+                m_amEfect *= m_amDecay;
+            }
+            else
+                m_amEfect = 0;
+
+            // angular deflection
+            if (m_angularDeflectionEfficiency > 0)
+            {
+                Vector3 dirv;
+                
+                if (curLocalVel.X > 0.01f)
+                    dirv = curLocalVel;
+                else if (curLocalVel.X < -0.01f)
+                    // use oposite 
+                    dirv = -curLocalVel;
+                else
+                {
+                    // make it fall into small positive x case
+                    dirv.X = 0.01f;
+                    dirv.Y = curLocalVel.Y;
+                    dirv.Z = curLocalVel.Z;
+                }
+
+                float ftmp = m_angularDeflectionEfficiency / m_angularDeflectionTimescale;
+
+                if (Math.Abs(dirv.Z) > 0.01)
+                {
+                    torque.Y += - (float)Math.Atan2(dirv.Z, dirv.X) * ftmp;
+                }
+
+                if (Math.Abs(dirv.Y) > 0.01)
+                {
+                    torque.Z += (float)Math.Atan2(dirv.Y, dirv.X) * ftmp;
+                }
+            }
+
+            // angular friction
+            if (curLocalAngVel.X != 0 || curLocalAngVel.Y != 0 || curLocalAngVel.Z != 0)
+            {
+                torque.X -= curLocalAngVel.X * m_amdampX;
+                torque.Y -= curLocalAngVel.Y * m_amdampY;
+                torque.Z -= curLocalAngVel.Z * m_amdampZ;
+            }
+
+            
+
+            if (force.X != 0 || force.Y != 0 || force.Z != 0)
+            {
+                force *= dmass.mass;
+                d.BodyAddForce(Body, force.X, force.Y, force.Z);
+            }
+
+            if (torque.X != 0 || torque.Y != 0 || torque.Z != 0)
+            {
+                torque *= m_referenceFrame; // to object frame
+                dtorque.X = torque.X ;
+                dtorque.Y = torque.Y;
+                dtorque.Z = torque.Z;
+
+                d.MultiplyM3V3(out dvtmp, ref dmass.I, ref dtorque);
+                d.BodyAddRelTorque(Body, dvtmp.X, dvtmp.Y, dvtmp.Z); // add torque in object frame
+            }
+        }
+    }
+}
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs
new file mode 100644
index 0000000..0df71eb
--- /dev/null
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs
@@ -0,0 +1,932 @@
+/*
+ * AJLDuarte 2012
+ */
+
+using System;
+using System.Threading;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Text;
+using OpenSim.Framework;
+using OpenSim.Region.Physics.Manager;
+using OdeAPI;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
+
+namespace OpenSim.Region.Physics.OdePlugin
+{
+    public enum MeshState : byte
+    {
+        noNeed = 0,
+
+        loadingAsset = 1,
+
+        AssetOK = 0x0f,     // 00001111
+
+        NeedMask = 0x30,    // 00110000
+        needMesh = 0x10,    // 00010000 
+        needAsset = 0x20,   // 00100000
+
+        FailMask = 0xC0,    // 11000000
+        AssetFailed = 0x40, // 01000000
+        MeshFailed = 0x80,   // 10000000
+
+        MeshNoColide = FailMask | needAsset
+    }
+
+    public enum meshWorkerCmnds : byte
+    {
+        nop = 0,
+        addnew,
+        changefull,
+        changesize,
+        changeshapetype,
+        getmesh,
+    }
+
+    public class ODEPhysRepData
+    {
+        public PhysicsActor actor;
+        public PrimitiveBaseShape pbs;
+        public IMesh mesh;
+
+        public Vector3 size;
+        public Vector3 OBB;
+        public Vector3 OBBOffset;
+
+        public float volume;
+
+        public byte shapetype;
+        public bool hasOBB;
+        public bool hasMeshVolume;
+        public MeshState meshState;
+        public UUID? assetID;
+        public meshWorkerCmnds comand;
+    }
+
+    public class ODEMeshWorker
+    {
+
+        private ILog m_log;
+        private OdeScene m_scene;
+        private IMesher m_mesher;
+
+        public bool meshSculptedPrim = true;
+        public bool forceSimplePrimMeshing = false;
+        public float meshSculptLOD = 32;
+        public float MeshSculptphysicalLOD = 32;
+
+
+        private OpenSim.Framework.BlockingQueue<ODEPhysRepData> createqueue = new OpenSim.Framework.BlockingQueue<ODEPhysRepData>();
+        private bool m_running;
+
+        private Thread m_thread;
+
+        public ODEMeshWorker(OdeScene pScene, ILog pLog, IMesher pMesher, IConfig pConfig)
+        {
+            m_scene = pScene;
+            m_log = pLog;
+            m_mesher = pMesher;
+
+            if (pConfig != null)
+            {
+                forceSimplePrimMeshing = pConfig.GetBoolean("force_simple_prim_meshing", forceSimplePrimMeshing);
+                meshSculptedPrim = pConfig.GetBoolean("mesh_sculpted_prim", meshSculptedPrim);
+                meshSculptLOD = pConfig.GetFloat("mesh_lod", meshSculptLOD);
+                MeshSculptphysicalLOD = pConfig.GetFloat("mesh_physical_lod", MeshSculptphysicalLOD);
+            }
+            m_running = true;
+            m_thread = new Thread(DoWork);
+            m_thread.Start();
+        }
+
+        private void DoWork()
+        {
+            m_mesher.ExpireFileCache();
+
+            while(m_running)
+            {
+                 ODEPhysRepData nextRep = createqueue.Dequeue();
+                if(!m_running)
+                    return;
+                if (nextRep == null)
+                    continue;
+                if (m_scene.haveActor(nextRep.actor))
+                {
+                    switch (nextRep.comand)
+                    {
+                        case meshWorkerCmnds.changefull:
+                        case meshWorkerCmnds.changeshapetype:
+                        case meshWorkerCmnds.changesize:
+                            GetMesh(nextRep);
+                            if (CreateActorPhysRep(nextRep) && m_scene.haveActor(nextRep.actor))
+                                m_scene.AddChange(nextRep.actor, changes.PhysRepData, nextRep);
+                            break;
+                        case meshWorkerCmnds.getmesh:
+                            DoRepDataGetMesh(nextRep);
+                            break;
+                    }
+                }
+            }
+        }
+
+        public void Stop()
+        {
+            try
+            {
+                m_thread.Abort();
+                createqueue.Clear();
+            }
+            catch
+            {
+            }
+        }
+
+        public void ChangeActorPhysRep(PhysicsActor actor, PrimitiveBaseShape pbs,
+                                        Vector3 size, byte shapetype)
+        {
+            ODEPhysRepData repData = new ODEPhysRepData();
+            repData.actor = actor;
+            repData.pbs = pbs;
+            repData.size = size;
+            repData.shapetype = shapetype;
+
+            CheckMesh(repData);
+            CalcVolumeData(repData);
+            m_scene.AddChange(actor, changes.PhysRepData, repData);
+            return;
+        }
+
+        public ODEPhysRepData NewActorPhysRep(PhysicsActor actor, PrimitiveBaseShape pbs,
+                                        Vector3 size, byte shapetype)
+        {
+            ODEPhysRepData repData = new ODEPhysRepData();
+            repData.actor = actor;
+            repData.pbs = pbs;
+            repData.size = size;
+            repData.shapetype = shapetype;
+
+            CheckMesh(repData);
+            CalcVolumeData(repData);
+            m_scene.AddChange(actor, changes.AddPhysRep, repData);
+            return repData;
+        }
+
+        public void RequestMesh(ODEPhysRepData repData)
+        {
+            repData.mesh = null;
+
+            if (repData.meshState == MeshState.needAsset)
+            {
+                PrimitiveBaseShape pbs = repData.pbs;
+
+                // check if we got outdated
+
+                if (!pbs.SculptEntry || pbs.SculptTexture == UUID.Zero)
+                {
+                    repData.meshState = MeshState.noNeed;
+                    return;
+                }
+
+                repData.assetID = pbs.SculptTexture;
+                repData.meshState = MeshState.loadingAsset;
+
+                repData.comand = meshWorkerCmnds.getmesh;
+                createqueue.Enqueue(repData);
+            }
+        }
+
+        // creates and prepares a mesh to use and calls parameters estimation
+        public bool CreateActorPhysRep(ODEPhysRepData repData)
+        {
+            IMesh mesh = repData.mesh;
+
+            if (mesh != null)
+            {
+                IntPtr vertices, indices;
+                int vertexCount, indexCount;
+                int vertexStride, triStride;
+
+                mesh.getVertexListAsPtrToFloatArray(out vertices, out vertexStride, out vertexCount);
+                mesh.getIndexListAsPtrToIntArray(out indices, out triStride, out indexCount);
+
+                if (vertexCount == 0 || indexCount == 0)
+                {
+                    m_log.WarnFormat("[PHYSICS]: Invalid mesh data on prim {0} mesh UUID {1}",
+                        repData.actor.Name, repData.pbs.SculptTexture.ToString());
+                    repData.meshState = MeshState.MeshFailed;
+                    repData.hasOBB = false;
+                    repData.mesh = null;
+                    m_scene.mesher.ReleaseMesh(mesh);
+                }
+                else
+                {
+                    repData.OBBOffset = mesh.GetCentroid();
+                    repData.OBB = mesh.GetOBB();
+                    repData.hasOBB = true;
+                    mesh.releaseSourceMeshData();
+                }
+            }
+            CalcVolumeData(repData);
+            return true;
+        }
+
+        public void AssetLoaded(ODEPhysRepData repData)
+        {
+            if (m_scene.haveActor(repData.actor))
+            {
+                if (needsMeshing(repData.pbs)) // no need for pbs now?
+                {
+                    repData.comand = meshWorkerCmnds.changefull;
+                    createqueue.Enqueue(repData);
+                }
+            }
+            else
+                repData.pbs.SculptData = Utils.EmptyBytes;
+        }
+
+        public void DoRepDataGetMesh(ODEPhysRepData repData)
+        {
+            if (!repData.pbs.SculptEntry)
+                return;
+
+            if (repData.meshState != MeshState.loadingAsset)
+                return;
+
+            if (repData.assetID == null || repData.assetID == UUID.Zero)
+                return;
+
+            if (repData.assetID != repData.pbs.SculptTexture)
+                return;
+
+            // check if it is in cache
+            GetMesh(repData);
+            if (repData.meshState != MeshState.needAsset)
+            {
+                CreateActorPhysRep(repData);
+                m_scene.AddChange(repData.actor, changes.PhysRepData, repData);
+                return;
+            }
+
+            RequestAssetDelegate assetProvider = m_scene.RequestAssetMethod;
+            if (assetProvider == null)
+                return;
+            ODEAssetRequest asr = new ODEAssetRequest(this, assetProvider, repData, m_log);
+        }
+
+
+        /// <summary>
+        /// Routine to figure out if we need to mesh this prim with our mesher
+        /// </summary>
+        /// <param name="pbs"></param>
+        /// <returns></returns>
+        public bool needsMeshing(PrimitiveBaseShape pbs)
+        {
+            // check sculpts or meshs 
+            if (pbs.SculptEntry)
+            {
+                if (meshSculptedPrim)
+                    return true;
+
+                if (pbs.SculptType == (byte)SculptType.Mesh) // always do meshs
+                    return true;
+
+                return false;
+            }
+
+            if (forceSimplePrimMeshing)
+                return true;
+
+            // if it's a standard box or sphere with no cuts, hollows, twist or top shear, return false since ODE can use an internal representation for the prim
+
+            if ((pbs.ProfileShape == ProfileShape.Square && pbs.PathCurve == (byte)Extrusion.Straight)
+                    || (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte)Extrusion.Curve1
+                    && pbs.Scale.X == pbs.Scale.Y && pbs.Scale.Y == pbs.Scale.Z))
+            {
+
+                if (pbs.ProfileBegin == 0 && pbs.ProfileEnd == 0
+                    && pbs.ProfileHollow == 0
+                    && pbs.PathTwist == 0 && pbs.PathTwistBegin == 0
+                    && pbs.PathBegin == 0 && pbs.PathEnd == 0
+                    && pbs.PathTaperX == 0 && pbs.PathTaperY == 0
+                    && pbs.PathScaleX == 100 && pbs.PathScaleY == 100
+                    && pbs.PathShearX == 0 && pbs.PathShearY == 0)
+                {
+                    return false;
+                }
+            }
+
+            //  following code doesn't give meshs to boxes and spheres ever
+            // and it's odd..  so for now just return true if asked to force meshs
+            // hopefully mesher will fail if doesn't suport so things still get basic boxes
+
+            int iPropertiesNotSupportedDefault = 0;
+
+            if (pbs.ProfileHollow != 0)
+                iPropertiesNotSupportedDefault++;
+
+            if ((pbs.PathBegin != 0) || pbs.PathEnd != 0)
+                iPropertiesNotSupportedDefault++;
+
+            if ((pbs.PathTwistBegin != 0) || (pbs.PathTwist != 0))
+                iPropertiesNotSupportedDefault++;
+
+            if ((pbs.ProfileBegin != 0) || pbs.ProfileEnd != 0)
+                iPropertiesNotSupportedDefault++;
+
+            if ((pbs.PathScaleX != 100) || (pbs.PathScaleY != 100))
+                iPropertiesNotSupportedDefault++;
+
+            if ((pbs.PathShearX != 0) || (pbs.PathShearY != 0))
+                iPropertiesNotSupportedDefault++;
+
+            if (pbs.ProfileShape == ProfileShape.Circle && pbs.PathCurve == (byte)Extrusion.Straight)
+                iPropertiesNotSupportedDefault++;
+
+            if (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte)Extrusion.Curve1 && (pbs.Scale.X != pbs.Scale.Y || pbs.Scale.Y != pbs.Scale.Z || pbs.Scale.Z != pbs.Scale.X))
+                iPropertiesNotSupportedDefault++;
+
+            if (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte)Extrusion.Curve1)
+                iPropertiesNotSupportedDefault++;
+
+            // test for torus
+            if ((pbs.ProfileCurve & 0x07) == (byte)ProfileShape.Square)
+            {
+                if (pbs.PathCurve == (byte)Extrusion.Curve1)
+                {
+                    iPropertiesNotSupportedDefault++;
+                }
+            }
+            else if ((pbs.ProfileCurve & 0x07) == (byte)ProfileShape.Circle)
+            {
+                if (pbs.PathCurve == (byte)Extrusion.Straight)
+                {
+                    iPropertiesNotSupportedDefault++;
+                }
+
+                // ProfileCurve seems to combine hole shape and profile curve so we need to only compare against the lower 3 bits
+                else if (pbs.PathCurve == (byte)Extrusion.Curve1)
+                {
+                    iPropertiesNotSupportedDefault++;
+                }
+            }
+            else if ((pbs.ProfileCurve & 0x07) == (byte)ProfileShape.HalfCircle)
+            {
+                if (pbs.PathCurve == (byte)Extrusion.Curve1 || pbs.PathCurve == (byte)Extrusion.Curve2)
+                {
+                    iPropertiesNotSupportedDefault++;
+                }
+            }
+            else if ((pbs.ProfileCurve & 0x07) == (byte)ProfileShape.EquilateralTriangle)
+            {
+                if (pbs.PathCurve == (byte)Extrusion.Straight)
+                {
+                    iPropertiesNotSupportedDefault++;
+                }
+                else if (pbs.PathCurve == (byte)Extrusion.Curve1)
+                {
+                    iPropertiesNotSupportedDefault++;
+                }
+            }
+
+            if (iPropertiesNotSupportedDefault == 0)
+            {
+                return false;
+            }
+            return true;
+        }
+
+        // see if we need a mesh and if so if we have a cached one
+        // called with a new repData
+        public void CheckMesh(ODEPhysRepData repData)
+        {
+            PhysicsActor actor = repData.actor;
+            PrimitiveBaseShape pbs = repData.pbs;
+
+            if (!needsMeshing(pbs))
+            {
+                repData.meshState = MeshState.noNeed;
+                return;
+            }
+
+            IMesh mesh = null;
+
+            Vector3 size = repData.size;
+            byte shapetype = repData.shapetype;
+
+            bool convex;
+
+            int clod = (int)LevelOfDetail.High;
+            if (shapetype == 0)
+                convex = false;
+            else
+            {
+                convex = true;
+                if (pbs.SculptType != (byte)SculptType.Mesh)
+                    clod = (int)LevelOfDetail.Low;
+            }
+
+            mesh = m_mesher.GetMesh(actor.Name, pbs, size, clod, true, convex);
+
+            if (mesh == null)
+            {
+                if (pbs.SculptEntry)
+                {
+                    if (pbs.SculptTexture != null && pbs.SculptTexture != UUID.Zero)
+                    {
+                        repData.assetID = pbs.SculptTexture;
+                        repData.meshState = MeshState.needAsset;
+                    }
+                    else
+                        repData.meshState = MeshState.MeshFailed;
+
+                    return;
+                }
+                else
+                {
+                    repData.meshState = MeshState.needMesh;
+                    mesh = m_mesher.CreateMesh(actor.Name, pbs, size, clod, true, false, convex, true);
+                    if (mesh == null)
+                    {
+                        repData.meshState = MeshState.MeshFailed;
+                        return;
+                    }
+                }               
+            }
+
+            repData.meshState = MeshState.AssetOK;
+            repData.mesh = mesh;
+
+            if (pbs.SculptEntry)
+            {
+                repData.assetID = pbs.SculptTexture;
+            }
+
+            pbs.SculptData = Utils.EmptyBytes;
+            return ;
+        }
+
+        public void GetMesh(ODEPhysRepData repData)
+        {
+            PhysicsActor actor = repData.actor;
+
+            PrimitiveBaseShape pbs = repData.pbs;
+
+            repData.mesh = null;
+            repData.hasOBB = false;
+
+            if (!needsMeshing(pbs))
+            {
+                repData.meshState = MeshState.noNeed;
+                return;
+            }
+
+            if (repData.meshState == MeshState.MeshFailed)
+                return;
+
+            if (pbs.SculptEntry)
+            {
+                if (repData.meshState == MeshState.AssetFailed)
+                {
+                    if (pbs.SculptTexture == repData.assetID)
+                        return;
+                }
+            }
+
+            repData.meshState = MeshState.noNeed;
+
+            IMesh mesh = null;
+            Vector3 size = repData.size;
+            byte shapetype = repData.shapetype;
+
+            bool convex;
+            int clod = (int)LevelOfDetail.High;
+            if (shapetype == 0)
+                convex = false;
+            else
+            {
+                convex = true;
+                if (pbs.SculptType != (byte)SculptType.Mesh)
+                    clod = (int)LevelOfDetail.Low;
+            }
+
+            mesh = m_mesher.CreateMesh(actor.Name, pbs, size, clod, true, false, convex, true);
+   
+            if (mesh == null)
+            {
+                if (pbs.SculptEntry)
+                {
+                    if (pbs.SculptTexture == UUID.Zero)
+                        return;
+
+                    repData.assetID = pbs.SculptTexture;
+
+                    if (pbs.SculptData == null || pbs.SculptData.Length == 0)
+                    {
+                        repData.meshState = MeshState.needAsset;
+                        return;
+                    }
+                }
+            }
+
+            repData.mesh = mesh;
+            repData.pbs.SculptData = Utils.EmptyBytes;
+
+            if (mesh == null)
+            {
+                if (pbs.SculptEntry)
+                    repData.meshState = MeshState.AssetFailed;
+                else
+                    repData.meshState = MeshState.MeshFailed;
+
+                return;
+            }
+
+            repData.meshState = MeshState.AssetOK;
+
+            return;
+        }
+
+        private void CalculateBasicPrimVolume(ODEPhysRepData repData)
+        {
+            PrimitiveBaseShape _pbs = repData.pbs;
+            Vector3 _size = repData.size;
+
+            float volume = _size.X * _size.Y * _size.Z; // default
+            float tmp;
+
+            float hollowAmount = (float)_pbs.ProfileHollow * 2.0e-5f;
+            float hollowVolume = hollowAmount * hollowAmount;
+
+            switch (_pbs.ProfileShape)
+            {
+                case ProfileShape.Square:
+                    // default box
+
+                    if (_pbs.PathCurve == (byte)Extrusion.Straight)
+                    {
+                        if (hollowAmount > 0.0)
+                        {
+                            switch (_pbs.HollowShape)
+                            {
+                                case HollowShape.Square:
+                                case HollowShape.Same:
+                                    break;
+
+                                case HollowShape.Circle:
+
+                                    hollowVolume *= 0.78539816339f;
+                                    break;
+
+                                case HollowShape.Triangle:
+
+                                    hollowVolume *= (0.5f * .5f);
+                                    break;
+
+                                default:
+                                    hollowVolume = 0;
+                                    break;
+                            }
+                            volume *= (1.0f - hollowVolume);
+                        }
+                    }
+
+                    else if (_pbs.PathCurve == (byte)Extrusion.Curve1)
+                    {
+                        //a tube 
+
+                        volume *= 0.78539816339e-2f * (float)(200 - _pbs.PathScaleX);
+                        tmp = 1.0f - 2.0e-2f * (float)(200 - _pbs.PathScaleY);
+                        volume -= volume * tmp * tmp;
+
+                        if (hollowAmount > 0.0)
+                        {
+                            hollowVolume *= hollowAmount;
+
+                            switch (_pbs.HollowShape)
+                            {
+                                case HollowShape.Square:
+                                case HollowShape.Same:
+                                    break;
+
+                                case HollowShape.Circle:
+                                    hollowVolume *= 0.78539816339f;
+                                    break;
+
+                                case HollowShape.Triangle:
+                                    hollowVolume *= 0.5f * 0.5f;
+                                    break;
+                                default:
+                                    hollowVolume = 0;
+                                    break;
+                            }
+                            volume *= (1.0f - hollowVolume);
+                        }
+                    }
+
+                    break;
+
+                case ProfileShape.Circle:
+
+                    if (_pbs.PathCurve == (byte)Extrusion.Straight)
+                    {
+                        volume *= 0.78539816339f; // elipse base
+
+                        if (hollowAmount > 0.0)
+                        {
+                            switch (_pbs.HollowShape)
+                            {
+                                case HollowShape.Same:
+                                case HollowShape.Circle:
+                                    break;
+
+                                case HollowShape.Square:
+                                    hollowVolume *= 0.5f * 2.5984480504799f;
+                                    break;
+
+                                case HollowShape.Triangle:
+                                    hollowVolume *= .5f * 1.27323954473516f;
+                                    break;
+
+                                default:
+                                    hollowVolume = 0;
+                                    break;
+                            }
+                            volume *= (1.0f - hollowVolume);
+                        }
+                    }
+
+                    else if (_pbs.PathCurve == (byte)Extrusion.Curve1)
+                    {
+                        volume *= 0.61685027506808491367715568749226e-2f * (float)(200 - _pbs.PathScaleX);
+                        tmp = 1.0f - .02f * (float)(200 - _pbs.PathScaleY);
+                        volume *= (1.0f - tmp * tmp);
+
+                        if (hollowAmount > 0.0)
+                        {
+
+                            // calculate the hollow volume by it's shape compared to the prim shape
+                            hollowVolume *= hollowAmount;
+
+                            switch (_pbs.HollowShape)
+                            {
+                                case HollowShape.Same:
+                                case HollowShape.Circle:
+                                    break;
+
+                                case HollowShape.Square:
+                                    hollowVolume *= 0.5f * 2.5984480504799f;
+                                    break;
+
+                                case HollowShape.Triangle:
+                                    hollowVolume *= .5f * 1.27323954473516f;
+                                    break;
+
+                                default:
+                                    hollowVolume = 0;
+                                    break;
+                            }
+                            volume *= (1.0f - hollowVolume);
+                        }
+                    }
+                    break;
+
+                case ProfileShape.HalfCircle:
+                    if (_pbs.PathCurve == (byte)Extrusion.Curve1)
+                    {
+                        volume *= 0.5236f;
+
+                        if (hollowAmount > 0.0)
+                        {
+                            hollowVolume *= hollowAmount;
+
+                            switch (_pbs.HollowShape)
+                            {
+                                case HollowShape.Circle:
+                                case HollowShape.Triangle:  // diference in sl is minor and odd
+                                case HollowShape.Same:
+                                    break;
+
+                                case HollowShape.Square:
+                                    hollowVolume *= 0.909f;
+                                    break;
+
+                                //                                case HollowShape.Triangle:
+                                //                                    hollowVolume *= .827f;
+                                //                                    break;
+                                default:
+                                    hollowVolume = 0;
+                                    break;
+                            }
+                            volume *= (1.0f - hollowVolume);
+                        }
+
+                    }
+                    break;
+
+                case ProfileShape.EquilateralTriangle:
+
+                    if (_pbs.PathCurve == (byte)Extrusion.Straight)
+                    {
+                        volume *= 0.32475953f;
+
+                        if (hollowAmount > 0.0)
+                        {
+
+                            // calculate the hollow volume by it's shape compared to the prim shape
+                            switch (_pbs.HollowShape)
+                            {
+                                case HollowShape.Same:
+                                case HollowShape.Triangle:
+                                    hollowVolume *= .25f;
+                                    break;
+
+                                case HollowShape.Square:
+                                    hollowVolume *= 0.499849f * 3.07920140172638f;
+                                    break;
+
+                                case HollowShape.Circle:
+                                    // Hollow shape is a perfect cyllinder in respect to the cube's scale
+                                    // Cyllinder hollow volume calculation
+
+                                    hollowVolume *= 0.1963495f * 3.07920140172638f;
+                                    break;
+
+                                default:
+                                    hollowVolume = 0;
+                                    break;
+                            }
+                            volume *= (1.0f - hollowVolume);
+                        }
+                    }
+                    else if (_pbs.PathCurve == (byte)Extrusion.Curve1)
+                    {
+                        volume *= 0.32475953f;
+                        volume *= 0.01f * (float)(200 - _pbs.PathScaleX);
+                        tmp = 1.0f - .02f * (float)(200 - _pbs.PathScaleY);
+                        volume *= (1.0f - tmp * tmp);
+
+                        if (hollowAmount > 0.0)
+                        {
+
+                            hollowVolume *= hollowAmount;
+
+                            switch (_pbs.HollowShape)
+                            {
+                                case HollowShape.Same:
+                                case HollowShape.Triangle:
+                                    hollowVolume *= .25f;
+                                    break;
+
+                                case HollowShape.Square:
+                                    hollowVolume *= 0.499849f * 3.07920140172638f;
+                                    break;
+
+                                case HollowShape.Circle:
+
+                                    hollowVolume *= 0.1963495f * 3.07920140172638f;
+                                    break;
+
+                                default:
+                                    hollowVolume = 0;
+                                    break;
+                            }
+                            volume *= (1.0f - hollowVolume);
+                        }
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+
+            float taperX1;
+            float taperY1;
+            float taperX;
+            float taperY;
+            float pathBegin;
+            float pathEnd;
+            float profileBegin;
+            float profileEnd;
+
+            if (_pbs.PathCurve == (byte)Extrusion.Straight || _pbs.PathCurve == (byte)Extrusion.Flexible)
+            {
+                taperX1 = _pbs.PathScaleX * 0.01f;
+                if (taperX1 > 1.0f)
+                    taperX1 = 2.0f - taperX1;
+                taperX = 1.0f - taperX1;
+
+                taperY1 = _pbs.PathScaleY * 0.01f;
+                if (taperY1 > 1.0f)
+                    taperY1 = 2.0f - taperY1;
+                taperY = 1.0f - taperY1;
+            }
+            else
+            {
+                taperX = _pbs.PathTaperX * 0.01f;
+                if (taperX < 0.0f)
+                    taperX = -taperX;
+                taperX1 = 1.0f - taperX;
+
+                taperY = _pbs.PathTaperY * 0.01f;
+                if (taperY < 0.0f)
+                    taperY = -taperY;
+                taperY1 = 1.0f - taperY;
+            }
+
+            volume *= (taperX1 * taperY1 + 0.5f * (taperX1 * taperY + taperX * taperY1) + 0.3333333333f * taperX * taperY);
+
+            pathBegin = (float)_pbs.PathBegin * 2.0e-5f;
+            pathEnd = 1.0f - (float)_pbs.PathEnd * 2.0e-5f;
+            volume *= (pathEnd - pathBegin);
+
+            // this is crude aproximation
+            profileBegin = (float)_pbs.ProfileBegin * 2.0e-5f;
+            profileEnd = 1.0f - (float)_pbs.ProfileEnd * 2.0e-5f;
+            volume *= (profileEnd - profileBegin);           
+
+            repData.volume = volume;
+        }
+
+        private void CalcVolumeData(ODEPhysRepData repData)
+        {
+            if (repData.hasOBB)
+            {
+                Vector3 OBB = repData.OBB;
+            }
+            else
+            {
+                Vector3 OBB = repData.size;
+                OBB.X *= 0.5f;
+                OBB.Y *= 0.5f;
+                OBB.Z *= 0.5f;
+
+                repData.OBB = OBB;
+                repData.OBBOffset = Vector3.Zero;
+            }
+
+            CalculateBasicPrimVolume(repData);
+        }
+    }
+
+    public class ODEAssetRequest
+    {
+        ODEMeshWorker m_worker;
+        private ILog m_log;
+        ODEPhysRepData repData;
+
+        public ODEAssetRequest(ODEMeshWorker pWorker, RequestAssetDelegate provider,
+            ODEPhysRepData pRepData, ILog plog)
+        {
+            m_worker = pWorker;
+            m_log = plog;
+            repData = pRepData;
+
+            repData.meshState = MeshState.AssetFailed;
+            if (provider == null)
+                return;
+
+            if (repData.assetID == null)
+                return;
+
+            UUID assetID = (UUID) repData.assetID;
+            if (assetID == UUID.Zero)
+                return;
+
+            repData.meshState = MeshState.loadingAsset;
+            provider(assetID, ODEassetReceived);
+        }
+
+        void ODEassetReceived(AssetBase asset)
+        {
+            repData.meshState = MeshState.AssetFailed;
+            if (asset != null)
+            {
+                if (asset.Data != null && asset.Data.Length > 0)
+                {
+                    repData.meshState = MeshState.noNeed;
+
+                    if (!repData.pbs.SculptEntry)
+                        return;
+                    if (repData.pbs.SculptTexture != repData.assetID)
+                        return;
+
+//                    repData.pbs.SculptData = new byte[asset.Data.Length];
+//                    asset.Data.CopyTo(repData.pbs.SculptData,0);
+                    repData.pbs.SculptData = asset.Data;
+                    repData.meshState = MeshState.AssetOK;
+                    m_worker.AssetLoaded(repData);
+                }
+                else
+                    m_log.WarnFormat("[PHYSICS]: asset provider returned invalid mesh data for prim {0} asset UUID {1}.",
+                        repData.actor.Name, asset.ID.ToString());
+            }
+            else
+                m_log.WarnFormat("[PHYSICS]: asset provider returned null asset fo mesh of prim {0}.",
+                    repData.actor.Name);
+        }
+    }
+}
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
new file mode 100644
index 0000000..faa9488
--- /dev/null
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
@@ -0,0 +1,3844 @@
+/*

+ * 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.

+ */

+

+/* Revision 2011/12 by Ubit Umarov

+ *

+ * 

+ */

+

+/*

+ * Revised August 26 2009 by Kitto Flora. ODEDynamics.cs replaces

+ * ODEVehicleSettings.cs. It and ODEPrim.cs are re-organised:

+ * ODEPrim.cs contains methods dealing with Prim editing, Prim

+ * characteristics and Kinetic motion.

+ * ODEDynamics.cs contains methods dealing with Prim Physical motion

+ * (dynamics) and the associated settings. Old Linear and angular

+ * motors for dynamic motion have been replace with  MoveLinear()

+ * and MoveAngular(); 'Physical' is used only to switch ODE dynamic 

+ * simualtion on/off; VEHICAL_TYPE_NONE/VEHICAL_TYPE_<other> is to

+ * switch between 'VEHICLE' parameter use and general dynamics

+ * settings use.

+ */

+

+//#define SPAM

+

+using System;

+using System.Collections.Generic;

+using System.Reflection;

+using System.Runtime.InteropServices;

+using System.Threading;

+using log4net;

+using OpenMetaverse;

+using OdeAPI;

+using OpenSim.Framework;

+using OpenSim.Region.Physics.Manager;

+

+namespace OpenSim.Region.Physics.OdePlugin

+{

+    public class OdePrim : PhysicsActor

+    {

+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

+

+        private bool m_isphysical;

+        private bool m_fakeisphysical;

+        private bool m_isphantom;

+        private bool m_fakeisphantom;

+        internal bool m_isVolumeDetect; // If true, this prim only detects collisions but doesn't collide actively

+        private bool m_fakeisVolumeDetect; // If true, this prim only detects collisions but doesn't collide actively

+

+        protected bool m_building;

+        protected bool m_forcePosOrRotation;

+        private bool m_iscolliding;

+

+        internal bool m_isSelected;

+        private bool m_delaySelect;

+        private bool m_lastdoneSelected;

+        internal bool m_outbounds;

+

+        private Quaternion m_lastorientation;

+        private Quaternion _orientation;

+

+        private Vector3 _position;

+        private Vector3 _velocity;

+        private Vector3 m_torque;

+        private Vector3 m_lastVelocity;

+        private Vector3 m_lastposition;

+        private Vector3 m_rotationalVelocity;

+        private Vector3 _size;

+        private Vector3 _acceleration;

+        private Vector3 m_angularlock = Vector3.One;

+        private IntPtr Amotor;

+

+        private Vector3 m_force;

+        private Vector3 m_forceacc;

+        private Vector3 m_angularForceacc;

+

+        private float m_invTimeStep;

+        private float m_timeStep;

+

+        private Vector3 m_PIDTarget;

+        private float m_PIDTau;

+        private bool m_usePID;

+

+        private float m_PIDHoverHeight;

+        private float m_PIDHoverTau;

+        private bool m_useHoverPID;

+        private PIDHoverType m_PIDHoverType;

+        private float m_targetHoverHeight;

+        private float m_groundHeight;

+        private float m_waterHeight;

+        private float m_buoyancy;                //KF: m_buoyancy should be set by llSetBuoyancy() for non-vehicle. 

+

+        private int body_autodisable_frames;

+        public int bodydisablecontrol;

+

+

+        // Default we're a Geometry

+        private CollisionCategories m_collisionCategories = (CollisionCategories.Geom);

+        // Default colide nonphysical don't try to colide with anything

+        private const CollisionCategories m_default_collisionFlagsNotPhysical = 0;

+

+        private const CollisionCategories m_default_collisionFlagsPhysical = (CollisionCategories.Geom |

+                                        CollisionCategories.Character |

+                                        CollisionCategories.Land |

+                                        CollisionCategories.VolumeDtc);

+

+//        private bool m_collidesLand = true;

+        private bool m_collidesWater;

+//        public bool m_returnCollisions;

+

+        private bool m_NoColide;  // for now only for internal use for bad meshs

+

+

+        // Default, Collide with Other Geometries, spaces and Bodies

+        private CollisionCategories m_collisionFlags = m_default_collisionFlagsNotPhysical;

+

+        public bool m_disabled;

+

+        private uint m_localID;

+

+        private IMesh m_mesh;

+        private object m_meshlock = new object();

+        private PrimitiveBaseShape _pbs;

+

+        private UUID? m_assetID;

+        private MeshState m_meshState;

+        

+        public OdeScene _parent_scene;

+

+        /// <summary>

+        /// The physics space which contains prim geometry

+        /// </summary>

+        public IntPtr m_targetSpace;

+

+        public IntPtr prim_geom;

+        public IntPtr _triMeshData;

+

+        private PhysicsActor _parent;

+

+        private List<OdePrim> childrenPrim = new List<OdePrim>();

+

+        public float m_collisionscore;

+        private int m_colliderfilter = 0;

+

+        public IntPtr collide_geom; // for objects: geom if single prim space it linkset

+

+        private float m_density;

+        private byte m_shapetype;

+        public bool _zeroFlag;

+        private bool m_lastUpdateSent;

+

+        public IntPtr Body;

+

+        private Vector3 _target_velocity;

+

+        public Vector3 m_OBBOffset;

+        public Vector3 m_OBB;

+        public float primOOBradiusSQ;

+

+        private bool m_hasOBB = true;

+

+        private float m_physCost;

+        private float m_streamCost;

+

+        public d.Mass primdMass; // prim inertia information on it's own referencial

+        float primMass; // prim own mass

+        float primVolume; // prim own volume;

+        float _mass; // object mass acording to case

+

+        public int givefakepos;

+        private Vector3 fakepos;

+        public int givefakeori;

+        private Quaternion fakeori;

+

+        private int m_eventsubscription;

+        private int m_cureventsubscription;

+        private CollisionEventUpdate CollisionEventsThisFrame = null;

+        private bool SentEmptyCollisionsEvent;

+

+        public volatile bool childPrim;

+

+        public ODEDynamics m_vehicle;

+

+        internal int m_material = (int)Material.Wood;

+        private float mu;

+        private float bounce;

+

+        /// <summary>

+        /// Is this prim subject to physics?  Even if not, it's still solid for collision purposes.

+        /// </summary>

+        public override bool IsPhysical  // this is not reliable for internal use

+        {

+            get { return m_fakeisphysical; }

+            set

+            {

+                m_fakeisphysical = value; // we show imediatly to outside that we changed physical

+                // and also to stop imediatly some updates

+                // but real change will only happen in taintprocessing

+

+                if (!value) // Zero the remembered last velocity

+                    m_lastVelocity = Vector3.Zero;

+                AddChange(changes.Physical, value);

+            }

+        }

+

+        public override bool IsVolumeDtc

+        {

+            get { return m_fakeisVolumeDetect; }

+            set

+            {

+                m_fakeisVolumeDetect = value;

+                AddChange(changes.VolumeDtc, value);

+            }

+        }

+

+        public override bool Phantom  // this is not reliable for internal use

+        {

+            get { return m_fakeisphantom; }

+            set

+            {

+                m_fakeisphantom = value;

+                AddChange(changes.Phantom, value);

+            }

+        }

+

+        public override bool Building  // this is not reliable for internal use

+        {

+            get { return m_building; }

+            set

+            {

+                if (value)

+                    m_building = true;

+                AddChange(changes.building, value);

+            }

+        }

+

+        public override void getContactData(ref ContactData cdata)

+        {

+            cdata.mu = mu;

+            cdata.bounce = bounce;

+

+            //            cdata.softcolide = m_softcolide;

+            cdata.softcolide = false;

+

+            if (m_isphysical)

+            {

+                ODEDynamics veh;

+                if (_parent != null)

+                    veh = ((OdePrim)_parent).m_vehicle;

+                else

+                    veh = m_vehicle;

+

+                if (veh != null && veh.Type != Vehicle.TYPE_NONE)

+                    cdata.mu *= veh.FrictionFactor;

+//                    cdata.mu *= 0;

+            }

+        }

+

+        public override float PhysicsCost

+        {

+            get

+            {

+                return m_physCost;

+            }

+        }

+

+        public override float StreamCost

+        {

+            get

+            {

+                return m_streamCost;

+            }

+        }

+

+        public override int PhysicsActorType

+        {

+            get { return (int)ActorTypes.Prim; }

+            set { return; }

+        }

+

+        public override bool SetAlwaysRun

+        {

+            get { return false; }

+            set { return; }

+        }

+

+        public override uint LocalID

+        {

+            get { return m_localID; }

+            set { m_localID = value; }

+        }

+

+        public override PhysicsActor ParentActor

+        {

+            get

+            {

+                if (childPrim)

+                    return _parent;

+                else

+                    return (PhysicsActor)this;

+            }

+        }

+

+        public override bool Grabbed

+        {

+            set { return; }

+        }

+

+        public override bool Selected

+        {

+            set

+            {

+                if (value)

+                    m_isSelected = value; // if true set imediatly to stop moves etc

+                AddChange(changes.Selected, value);

+            }

+        }

+

+        public override bool Flying

+        {

+            // no flying prims for you

+            get { return false; }

+            set { }

+        }

+

+        public override bool IsColliding

+        {

+            get { return m_iscolliding; }

+            set

+            {

+                if (value)

+                {

+                    m_colliderfilter += 2;

+                    if (m_colliderfilter > 2)

+                        m_colliderfilter = 2;

+                }

+                else

+                {

+                    m_colliderfilter--;

+                    if (m_colliderfilter < 0)

+                        m_colliderfilter = 0;

+                }

+

+                if (m_colliderfilter == 0)

+                    m_iscolliding = false;

+                else

+                    m_iscolliding = true;

+            }

+        }

+

+        public override bool CollidingGround

+        {

+            get { return false; }

+            set { return; }

+        }

+

+        public override bool CollidingObj

+        {

+            get { return false; }

+            set { return; }

+        }

+

+

+        public override bool ThrottleUpdates {get;set;}

+

+        public override bool Stopped

+        {

+            get { return _zeroFlag; }

+        }

+

+        public override Vector3 Position

+        {

+            get

+            {

+                if (givefakepos > 0)

+                    return fakepos;

+                else

+                    return _position;

+            }

+

+            set

+            {

+                fakepos = value;

+                givefakepos++;

+                AddChange(changes.Position, value);

+            }

+        }

+

+        public override Vector3 Size

+        {

+            get { return _size; }

+            set

+            {

+                if (value.IsFinite())

+                {

+                     _parent_scene.m_meshWorker.ChangeActorPhysRep(this, _pbs, value, m_shapetype);

+                }

+                else

+                {

+                    m_log.WarnFormat("[PHYSICS]: Got NaN Size on object {0}", Name);

+                }

+            }

+        }

+

+        public override float Mass

+        {

+            get { return primMass; }

+        }

+

+        public override Vector3 Force

+        {

+            get { return m_force; }

+            set

+            {

+                if (value.IsFinite())

+                {

+                    AddChange(changes.Force, value);

+                }

+                else

+                {

+                    m_log.WarnFormat("[PHYSICS]: NaN in Force Applied to an Object {0}", Name);

+                }

+            }

+        }

+

+        public override void SetVolumeDetect(int param)

+        {

+            m_fakeisVolumeDetect = (param != 0);

+            AddChange(changes.VolumeDtc, m_fakeisVolumeDetect);

+        }

+

+        public override Vector3 GeometricCenter

+        {

+            // this is not real geometric center but a average of positions relative to root prim acording to

+            // http://wiki.secondlife.com/wiki/llGetGeometricCenter

+            // ignoring tortured prims details since sl also seems to ignore

+            // so no real use in doing it on physics

+            get

+            {

+                return Vector3.Zero;

+            }

+        }

+

+        public override Vector3 CenterOfMass

+        {

+            get

+            {

+                lock (_parent_scene.OdeLock)

+                {

+                    d.Vector3 dtmp;

+                    if (!childPrim && Body != IntPtr.Zero)

+                    {

+                        dtmp = d.BodyGetPosition(Body);

+                        return new Vector3(dtmp.X, dtmp.Y, dtmp.Z);

+                    }

+                    else if (prim_geom != IntPtr.Zero)

+                    {

+                        d.Quaternion dq;

+                        d.GeomCopyQuaternion(prim_geom, out dq);

+                        Quaternion q;

+                        q.X = dq.X;

+                        q.Y = dq.Y;

+                        q.Z = dq.Z;

+                        q.W = dq.W;

+

+                        Vector3 Ptot = m_OBBOffset * q;

+                        dtmp = d.GeomGetPosition(prim_geom);

+                        Ptot.X += dtmp.X;

+                        Ptot.Y += dtmp.Y;

+                        Ptot.Z += dtmp.Z;

+

+                        //                    if(childPrim)  we only know about physical linksets

+                        return Ptot;

+/*

+                        float tmass = _mass;

+                        Ptot *= tmass;

+

+                        float m;

+

+                        foreach (OdePrim prm in childrenPrim)

+                        {

+                            m = prm._mass;

+                            Ptot += prm.CenterOfMass * m;

+                            tmass += m;

+                        }

+

+                        if (tmass == 0)

+                            tmass = 0;

+                        else

+                            tmass = 1.0f / tmass;

+

+                        Ptot *= tmass;

+                        return Ptot;

+*/

+                    }

+                    else

+                        return _position;

+                }

+            }

+        }

+

+        public override Vector3 OOBsize

+            {

+            get

+                {

+                return m_OBB;

+                }

+            }

+

+        public override Vector3 OOBoffset

+            {

+            get

+                {

+                return m_OBBOffset;

+                }

+            }

+

+        public override float OOBRadiusSQ

+            {

+            get

+                {

+                return primOOBradiusSQ;

+                }

+            }

+

+        public override PrimitiveBaseShape Shape

+        {

+            set

+            {

+//                AddChange(changes.Shape, value);

+                _parent_scene.m_meshWorker.ChangeActorPhysRep(this, value, _size, m_shapetype);

+            }

+        }

+

+        public override byte PhysicsShapeType

+        {

+            get

+            {

+                return m_shapetype;

+            }

+            set

+            {

+                m_shapetype = value;

+               _parent_scene.m_meshWorker.ChangeActorPhysRep(this, _pbs, _size, value);

+            }

+        }

+

+        public override Vector3 Velocity

+        {

+            get

+            {

+                if (_zeroFlag)

+                    return Vector3.Zero;

+                return _velocity;

+            }

+            set

+            {

+                if (value.IsFinite())

+                {

+                    AddChange(changes.Velocity, value);

+                }

+                else

+                {

+                    m_log.WarnFormat("[PHYSICS]: Got NaN Velocity in Object {0}", Name);

+                }

+

+            }

+        }

+

+        public override Vector3 Torque

+        {

+            get

+            {

+                if (!IsPhysical || Body == IntPtr.Zero)

+                    return Vector3.Zero;

+

+                return m_torque;

+            }

+

+            set

+            {

+                if (value.IsFinite())

+                {

+                    AddChange(changes.Torque, value);

+                }

+                else

+                {

+                    m_log.WarnFormat("[PHYSICS]: Got NaN Torque in Object {0}", Name);

+                }

+            }

+        }

+

+        public override float CollisionScore

+        {

+            get { return m_collisionscore; }

+            set { m_collisionscore = value; }

+        }

+

+        public override bool Kinematic

+        {

+            get { return false; }

+            set { }

+        }

+

+        public override Quaternion Orientation

+        {

+            get

+            {

+                if (givefakeori > 0)

+                    return fakeori;

+                else

+

+                    return _orientation;

+            }

+            set

+            {

+                if (QuaternionIsFinite(value))

+                {

+                    fakeori = value;

+                    givefakeori++;

+

+                    value.Normalize();

+

+                    AddChange(changes.Orientation, value);

+                }

+                else

+                    m_log.WarnFormat("[PHYSICS]: Got NaN quaternion Orientation from Scene in Object {0}", Name);

+

+            }

+        }

+

+        public override Vector3 Acceleration

+        {

+            get { return _acceleration; }

+            set { }

+        }

+

+        public override Vector3 RotationalVelocity

+        {

+            get

+            {

+                Vector3 pv = Vector3.Zero;

+                if (_zeroFlag)

+                    return pv;

+

+                if (m_rotationalVelocity.ApproxEquals(pv, 0.0001f))

+                    return pv;

+

+                return m_rotationalVelocity;

+            }

+            set

+            {

+                if (value.IsFinite())

+                {

+                    AddChange(changes.AngVelocity, value);

+                }

+                else

+                {

+                    m_log.WarnFormat("[PHYSICS]: Got NaN RotationalVelocity in Object {0}", Name);

+                }

+            }

+        }

+

+        public override float Buoyancy

+        {

+            get { return m_buoyancy; }

+            set

+            {

+                 AddChange(changes.Buoyancy,value);

+            }

+        }

+

+        public override bool FloatOnWater

+        {

+            set

+            {

+                AddChange(changes.CollidesWater, value);

+            }

+        }

+

+        public override Vector3 PIDTarget

+        {

+            set

+            {

+                if (value.IsFinite())

+                {

+                    AddChange(changes.PIDTarget,value);

+                }

+                else

+                    m_log.WarnFormat("[PHYSICS]: Got NaN PIDTarget from Scene on Object {0}", Name);

+            }

+        }

+

+        public override bool PIDActive

+        {

+            set

+            {

+                AddChange(changes.PIDActive,value);

+            }

+        }

+

+        public override float PIDTau

+        {

+            set

+            {

+                float tmp = 0;

+                if (value > 0)

+                {

+                    float mint = (0.05f > m_timeStep ? 0.05f : m_timeStep);

+                    if (value < mint)

+                        tmp = mint;

+                    else

+                        tmp = value;

+                }

+                AddChange(changes.PIDTau,tmp);

+            }

+        }

+

+        public override float PIDHoverHeight

+        {

+            set

+            {

+                AddChange(changes.PIDHoverHeight,value);

+            }

+        }

+        public override bool PIDHoverActive

+        {

+            set

+            {

+                AddChange(changes.PIDHoverActive, value);

+            }

+        }

+

+        public override PIDHoverType PIDHoverType

+        {

+            set

+            {

+                AddChange(changes.PIDHoverType,value);

+            }

+        }

+

+        public override float PIDHoverTau

+        {

+            set

+            {

+                float tmp =0;

+                if (value > 0)

+                {

+                    float mint = (0.05f > m_timeStep ? 0.05f : m_timeStep);

+                    if (value < mint)

+                        tmp = mint;

+                    else

+                        tmp = value;

+                }

+                AddChange(changes.PIDHoverTau, tmp);

+            }

+        }

+

+        public override Quaternion APIDTarget { set { return; } }

+

+        public override bool APIDActive { set { return; } }

+

+        public override float APIDStrength { set { return; } }

+

+        public override float APIDDamping { set { return; } }

+

+        public override int VehicleType

+        {

+            // we may need to put a fake on this

+            get

+            {

+                if (m_vehicle == null)

+                    return (int)Vehicle.TYPE_NONE;

+                else

+                    return (int)m_vehicle.Type;

+            }

+            set

+            {

+                AddChange(changes.VehicleType, value);

+            }

+        }

+

+        public override void VehicleFloatParam(int param, float value)

+        {

+            strVehicleFloatParam fp = new strVehicleFloatParam();

+            fp.param = param;

+            fp.value = value;

+            AddChange(changes.VehicleFloatParam, fp);

+        }

+

+        public override void VehicleVectorParam(int param, Vector3 value)

+        {

+            strVehicleVectorParam fp = new strVehicleVectorParam();

+            fp.param = param;

+            fp.value = value;

+            AddChange(changes.VehicleVectorParam, fp);

+        }

+

+        public override void VehicleRotationParam(int param, Quaternion value)

+        {

+            strVehicleQuatParam fp = new strVehicleQuatParam();

+            fp.param = param;

+            fp.value = value;

+            AddChange(changes.VehicleRotationParam, fp);

+        }

+

+        public override void VehicleFlags(int param, bool value)

+        {

+            strVehicleBoolParam bp = new strVehicleBoolParam();

+            bp.param = param;

+            bp.value = value;

+            AddChange(changes.VehicleFlags, bp);

+        }

+

+        public override void SetVehicle(object vdata)

+        {

+            AddChange(changes.SetVehicle, vdata);

+        }

+        public void SetAcceleration(Vector3 accel)

+        {

+            _acceleration = accel;

+        }

+

+        public override void AddForce(Vector3 force, bool pushforce)

+        {

+            if (force.IsFinite())

+            {

+                if(pushforce)

+                    AddChange(changes.AddForce, force);

+                else // a impulse

+                    AddChange(changes.AddForce, force * m_invTimeStep);

+            }

+            else

+            {

+                m_log.WarnFormat("[PHYSICS]: Got Invalid linear force vector from Scene in Object {0}", Name);

+            }

+            //m_log.Info("[PHYSICS]: Added Force:" + force.ToString() +  " to prim at " + Position.ToString());

+        }

+

+        public override void AddAngularForce(Vector3 force, bool pushforce)

+        {

+            if (force.IsFinite())

+            {

+//                if(pushforce)  for now applyrotationimpulse seems more happy applied as a force

+                    AddChange(changes.AddAngForce, force);

+//                else // a impulse

+//                    AddChange(changes.AddAngForce, force * m_invTimeStep);

+            }

+            else

+            {

+                m_log.WarnFormat("[PHYSICS]: Got Invalid Angular force vector from Scene in Object {0}", Name);

+            }

+        }

+

+        public override void CrossingFailure()

+        {

+            if (m_outbounds)

+            {

+                _position.X = Util.Clip(_position.X, 0.5f, _parent_scene.WorldExtents.X - 0.5f);

+                _position.Y = Util.Clip(_position.Y, 0.5f, _parent_scene.WorldExtents.Y - 0.5f);

+                _position.Z = Util.Clip(_position.Z + 0.2f, -100f, 50000f);

+

+                m_lastposition = _position;

+                _velocity.X = 0;

+                _velocity.Y = 0;

+                _velocity.Z = 0;

+

+                m_lastVelocity = _velocity;

+                if (m_vehicle != null && m_vehicle.Type != Vehicle.TYPE_NONE)

+                    m_vehicle.Stop();

+

+                if(Body != IntPtr.Zero)

+                    d.BodySetLinearVel(Body, 0, 0, 0); // stop it

+                if (prim_geom != IntPtr.Zero)

+                    d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);

+

+                m_outbounds = false;

+                changeDisable(false);

+                base.RequestPhysicsterseUpdate();

+            }

+        }

+

+        public override void SetMomentum(Vector3 momentum)

+        {

+        }

+

+        public override void SetMaterial(int pMaterial)

+        {

+            m_material = pMaterial;

+            mu = _parent_scene.m_materialContactsData[pMaterial].mu;

+            bounce = _parent_scene.m_materialContactsData[pMaterial].bounce;

+        }

+

+        public void setPrimForRemoval()

+        {

+            AddChange(changes.Remove, null);

+        }

+

+        public override void link(PhysicsActor obj)

+        {

+            AddChange(changes.Link, obj);

+        }

+

+        public override void delink()

+        {

+            AddChange(changes.DeLink, null);

+        }

+

+        public override void LockAngularMotion(Vector3 axis)

+        {

+            // reverse the zero/non zero values for ODE.

+            if (axis.IsFinite())

+            {

+                axis.X = (axis.X > 0) ? 1f : 0f;

+                axis.Y = (axis.Y > 0) ? 1f : 0f;

+                axis.Z = (axis.Z > 0) ? 1f : 0f;

+//                m_log.DebugFormat("[axislock]: <{0},{1},{2}>", axis.X, axis.Y, axis.Z);

+                AddChange(changes.AngLock, axis);

+            }

+            else

+            {

+                m_log.WarnFormat("[PHYSICS]: Got NaN locking axis from Scene on Object {0}", Name);

+            }

+        }

+

+        public override void SubscribeEvents(int ms)

+        {

+            m_eventsubscription = ms;

+            m_cureventsubscription = 0;

+            if (CollisionEventsThisFrame == null)

+                CollisionEventsThisFrame = new CollisionEventUpdate();

+            SentEmptyCollisionsEvent = false;

+        }

+

+        public override void UnSubscribeEvents()

+        {

+            if (CollisionEventsThisFrame != null)

+            {

+                CollisionEventsThisFrame.Clear();

+                CollisionEventsThisFrame = null;

+            }

+            m_eventsubscription = 0;

+           _parent_scene.RemoveCollisionEventReporting(this);

+        }

+

+        public override void AddCollisionEvent(uint CollidedWith, ContactPoint contact)

+        {

+            if (CollisionEventsThisFrame == null)

+                CollisionEventsThisFrame = new CollisionEventUpdate();

+//            if(CollisionEventsThisFrame.Count < 32)

+                CollisionEventsThisFrame.AddCollider(CollidedWith, contact);

+        }

+

+        public void SendCollisions()

+        {

+            if (CollisionEventsThisFrame == null)

+                return;

+

+            if (m_cureventsubscription < m_eventsubscription)

+                return;

+

+            m_cureventsubscription = 0;

+

+            int ncolisions = CollisionEventsThisFrame.m_objCollisionList.Count;

+

+            if (!SentEmptyCollisionsEvent || ncolisions > 0)

+            {

+                base.SendCollisionUpdate(CollisionEventsThisFrame);

+

+                if (ncolisions == 0)

+                {

+                    SentEmptyCollisionsEvent = true;

+                    _parent_scene.RemoveCollisionEventReporting(this);

+                }

+                else

+                {

+                    SentEmptyCollisionsEvent = false;

+                    CollisionEventsThisFrame.Clear();

+                }

+            }           

+        }

+

+        internal void AddCollisionFrameTime(int t)

+        {

+            if (m_cureventsubscription < 50000)

+                m_cureventsubscription += t;

+        }

+

+        public override bool SubscribedEvents()

+        {

+            if (m_eventsubscription > 0)

+                return true;

+            return false;

+        }

+

+        public OdePrim(String primName, OdeScene parent_scene, Vector3 pos, Vector3 size,

+                       Quaternion rotation, PrimitiveBaseShape pbs, bool pisPhysical,bool pisPhantom,byte _shapeType,uint plocalID)

+        {

+            Name = primName;

+            LocalID = plocalID;

+

+            m_vehicle = null;

+

+            if (!pos.IsFinite())

+            {

+                pos = new Vector3(((float)Constants.RegionSize * 0.5f), ((float)Constants.RegionSize * 0.5f),

+                    parent_scene.GetTerrainHeightAtXY(((float)Constants.RegionSize * 0.5f), ((float)Constants.RegionSize * 0.5f)) + 0.5f);

+                m_log.WarnFormat("[PHYSICS]: Got nonFinite Object create Position for {0}", Name);

+            }

+            _position = pos;

+            givefakepos = 0;

+

+            m_timeStep = parent_scene.ODE_STEPSIZE;

+            m_invTimeStep = 1f / m_timeStep;

+

+            m_density = parent_scene.geomDefaultDensity;

+            body_autodisable_frames = parent_scene.bodyFramesAutoDisable;

+

+            prim_geom = IntPtr.Zero;

+            collide_geom = IntPtr.Zero;

+            Body = IntPtr.Zero;

+

+            if (!size.IsFinite())

+            {

+                size = new Vector3(0.5f, 0.5f, 0.5f);

+                m_log.WarnFormat("[PHYSICS]: Got nonFinite Object create Size for {0}", Name);

+            }

+

+            if (size.X <= 0) size.X = 0.01f;

+            if (size.Y <= 0) size.Y = 0.01f;

+            if (size.Z <= 0) size.Z = 0.01f;

+

+            _size = size;

+

+            if (!QuaternionIsFinite(rotation))

+            {

+                rotation = Quaternion.Identity;

+                m_log.WarnFormat("[PHYSICS]: Got nonFinite Object create Rotation for {0}", Name);

+            }

+

+            _orientation = rotation;

+            givefakeori = 0;

+

+            _pbs = pbs;

+

+            _parent_scene = parent_scene;

+            m_targetSpace = IntPtr.Zero;

+

+            if (pos.Z < 0)

+            {

+                m_isphysical = false;

+            }

+            else

+            {

+                m_isphysical = pisPhysical;

+            }

+            m_fakeisphysical = m_isphysical;

+

+            m_isVolumeDetect = false;

+            m_fakeisVolumeDetect = false;

+

+            m_force = Vector3.Zero;

+

+            m_iscolliding = false;

+            m_colliderfilter = 0;

+            m_NoColide = false;

+

+            _triMeshData = IntPtr.Zero;

+

+            m_shapetype = _shapeType;

+

+            m_lastdoneSelected = false;

+            m_isSelected = false;

+            m_delaySelect = false;

+

+            m_isphantom = pisPhantom;

+            m_fakeisphantom = pisPhantom;

+

+            mu = parent_scene.m_materialContactsData[(int)Material.Wood].mu;

+            bounce = parent_scene.m_materialContactsData[(int)Material.Wood].bounce;

+

+            m_building = true; // control must set this to false when done

+

+            // get basic mass parameters

+            ODEPhysRepData repData = _parent_scene.m_meshWorker.NewActorPhysRep(this, _pbs, _size, m_shapetype);

+

+            primVolume = repData.volume;

+            m_OBB = repData.OBB;

+            m_OBBOffset = repData.OBBOffset;

+

+            UpdatePrimBodyData();

+        }

+

+        private void resetCollisionAccounting()

+        {

+            m_collisionscore = 0;

+        }

+

+        private void UpdateCollisionCatFlags()

+        {

+            if(m_isphysical && m_disabled)

+            {

+                m_collisionCategories = 0;

+                m_collisionFlags = 0;

+            }

+

+            else if (m_isSelected)

+            {

+                m_collisionCategories = CollisionCategories.Selected;

+                m_collisionFlags = 0;

+            }

+

+            else if (m_isVolumeDetect)

+            {

+                m_collisionCategories = CollisionCategories.VolumeDtc;

+                if (m_isphysical)

+                    m_collisionFlags = CollisionCategories.Geom | CollisionCategories.Character;

+                else

+                    m_collisionFlags = 0;

+            }

+            else if (m_isphantom)

+            {

+                m_collisionCategories = CollisionCategories.Phantom;

+                if (m_isphysical)

+                    m_collisionFlags = CollisionCategories.Land;

+                else

+                    m_collisionFlags = 0;

+            }

+            else

+            {

+                m_collisionCategories = CollisionCategories.Geom;

+                if (m_isphysical)

+                    m_collisionFlags = m_default_collisionFlagsPhysical;

+                else

+                    m_collisionFlags = m_default_collisionFlagsNotPhysical;

+            }

+        }

+

+        private void ApplyCollisionCatFlags()

+        {

+            if (prim_geom != IntPtr.Zero)

+            {

+                if (!childPrim && childrenPrim.Count > 0)

+                {

+                    foreach (OdePrim prm in childrenPrim)

+                    {

+                        if (m_isphysical && m_disabled)

+                        {

+                            prm.m_collisionCategories = 0;

+                            prm.m_collisionFlags = 0;

+                        }

+                        else

+                        {

+                            // preserve some

+                            if (prm.m_isSelected)

+                            {

+                                prm.m_collisionCategories = CollisionCategories.Selected;

+                                prm.m_collisionFlags = 0;

+                            }

+                            else if (prm.m_isVolumeDetect)

+                            {

+                                prm.m_collisionCategories = CollisionCategories.VolumeDtc;

+                                if (m_isphysical)

+                                    prm.m_collisionFlags = CollisionCategories.Geom | CollisionCategories.Character;

+                                else

+                                    prm.m_collisionFlags = 0;

+                            }

+                            else if (prm.m_isphantom)

+                            {

+                                prm.m_collisionCategories = CollisionCategories.Phantom;

+                                if (m_isphysical)

+                                    prm.m_collisionFlags = CollisionCategories.Land;

+                                else

+                                    prm.m_collisionFlags = 0;

+                            }

+                            else

+                            {

+                                prm.m_collisionCategories = m_collisionCategories;

+                                prm.m_collisionFlags = m_collisionFlags;

+                            }

+                        }

+

+                        if (prm.prim_geom != IntPtr.Zero)

+                        {

+                            if (prm.m_NoColide)

+                            {

+                                d.GeomSetCategoryBits(prm.prim_geom, 0);

+                                if (m_isphysical)

+                                    d.GeomSetCollideBits(prm.prim_geom, (int)CollisionCategories.Land);

+                                else

+                                    d.GeomSetCollideBits(prm.prim_geom, 0);

+                            }

+                            else

+                            {

+                                d.GeomSetCategoryBits(prm.prim_geom, (uint)prm.m_collisionCategories);

+                                d.GeomSetCollideBits(prm.prim_geom, (uint)prm.m_collisionFlags);

+                            }

+                        }

+                    }

+                }

+

+                if (m_NoColide)

+                {

+                    d.GeomSetCategoryBits(prim_geom, 0);

+                    d.GeomSetCollideBits(prim_geom, (uint)CollisionCategories.Land);

+                    if (collide_geom != prim_geom && collide_geom != IntPtr.Zero)

+                    {

+                        d.GeomSetCategoryBits(collide_geom, 0);

+                        d.GeomSetCollideBits(collide_geom, (uint)CollisionCategories.Land);

+                    }

+                }

+                else

+                {

+                    d.GeomSetCategoryBits(prim_geom, (uint)m_collisionCategories);

+                    d.GeomSetCollideBits(prim_geom, (uint)m_collisionFlags);

+                    if (collide_geom != prim_geom && collide_geom != IntPtr.Zero)

+                    {

+                        d.GeomSetCategoryBits(collide_geom, (uint)m_collisionCategories);

+                        d.GeomSetCollideBits(collide_geom, (uint)m_collisionFlags);

+                    }

+                }

+            }

+        }

+

+        private void createAMotor(Vector3 axis)

+        {

+            if (Body == IntPtr.Zero)

+                return;

+

+            if (Amotor != IntPtr.Zero)

+            {

+                d.JointDestroy(Amotor);

+                Amotor = IntPtr.Zero;

+            }

+

+            int axisnum = 3 - (int)(axis.X + axis.Y + axis.Z);

+

+            if (axisnum <= 0)

+                return;

+

+            // stop it

+            d.BodySetTorque(Body, 0, 0, 0);

+            d.BodySetAngularVel(Body, 0, 0, 0);

+

+            Amotor = d.JointCreateAMotor(_parent_scene.world, IntPtr.Zero);

+            d.JointAttach(Amotor, Body, IntPtr.Zero);

+

+            d.JointSetAMotorMode(Amotor, 0);

+

+            d.JointSetAMotorNumAxes(Amotor, axisnum);

+

+            // get current orientation to lock

+

+            d.Quaternion dcur = d.BodyGetQuaternion(Body);

+            Quaternion curr; // crap convertion between identical things

+            curr.X = dcur.X;

+            curr.Y = dcur.Y;

+            curr.Z = dcur.Z;

+            curr.W = dcur.W;

+            Vector3 ax;

+

+            int i = 0;

+            int j = 0;

+            if (axis.X == 0)

+            {

+                ax = (new Vector3(1, 0, 0)) * curr; // rotate world X to current local X

+                // ODE should do this  with axis relative to body 1 but seems to fail

+                d.JointSetAMotorAxis(Amotor, 0, 0, ax.X, ax.Y, ax.Z);

+                d.JointSetAMotorAngle(Amotor, 0, 0);

+                d.JointSetAMotorParam(Amotor, (int)d.JointParam.LoStop, -0.000001f);

+                d.JointSetAMotorParam(Amotor, (int)d.JointParam.HiStop, 0.000001f);

+                d.JointSetAMotorParam(Amotor, (int)d.JointParam.Vel, 0);

+                d.JointSetAMotorParam(Amotor, (int)d.JointParam.FudgeFactor, 0.0001f);

+                d.JointSetAMotorParam(Amotor, (int)d.JointParam.Bounce, 0f);

+                d.JointSetAMotorParam(Amotor, (int)d.JointParam.FMax, 5e8f);

+                d.JointSetAMotorParam(Amotor, (int)d.JointParam.StopCFM, 0f);

+                d.JointSetAMotorParam(Amotor, (int)d.JointParam.StopERP, 0.8f);

+                i++;

+                j = 256; // move to next axis set

+            }

+

+            if (axis.Y == 0)

+            {

+                ax = (new Vector3(0, 1, 0)) * curr;

+                d.JointSetAMotorAxis(Amotor, i, 0, ax.X, ax.Y, ax.Z);

+                d.JointSetAMotorAngle(Amotor, i, 0);

+                d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.LoStop, -0.000001f);

+                d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.HiStop, 0.000001f);

+                d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.Vel, 0);

+                d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.FudgeFactor, 0.0001f);

+                d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.Bounce, 0f);

+                d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.FMax, 5e8f);

+                d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.StopCFM, 0f);

+                d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.StopERP, 0.8f);

+                i++;

+                j += 256;

+            }

+

+            if (axis.Z == 0)

+            {

+                ax = (new Vector3(0, 0, 1)) * curr;

+                d.JointSetAMotorAxis(Amotor, i, 0, ax.X, ax.Y, ax.Z);

+                d.JointSetAMotorAngle(Amotor, i, 0);

+                d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.LoStop, -0.000001f);

+                d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.HiStop, 0.000001f);

+                d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.Vel, 0);

+                d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.FudgeFactor, 0.0001f);

+                d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.Bounce, 0f);

+                d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.FMax, 5e8f);

+                d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.StopCFM, 0f);

+                d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.StopERP, 0.8f);

+            }

+        }

+

+

+        private void SetGeom(IntPtr geom)

+        {

+            prim_geom = geom;

+            //Console.WriteLine("SetGeom to " + prim_geom + " for " + Name);

+            if (prim_geom != IntPtr.Zero)

+            {

+

+                if (m_NoColide)

+                {

+                    d.GeomSetCategoryBits(prim_geom, 0);

+                    if (m_isphysical)

+                    {

+                        d.GeomSetCollideBits(prim_geom, (uint)CollisionCategories.Land);

+                    }

+                    else

+                    {

+                        d.GeomSetCollideBits(prim_geom, 0);

+                        d.GeomDisable(prim_geom);

+                    }

+                }

+                else

+                {

+                    d.GeomSetCategoryBits(prim_geom, (uint)m_collisionCategories);

+                    d.GeomSetCollideBits(prim_geom, (uint)m_collisionFlags);

+                }

+

+                UpdatePrimBodyData();

+                _parent_scene.actor_name_map[prim_geom] = this;

+

+/*

+// debug

+                d.AABB aabb;

+                d.GeomGetAABB(prim_geom, out aabb);

+                float x = aabb.MaxX - aabb.MinX;

+                float y = aabb.MaxY - aabb.MinY;

+                float z = aabb.MaxZ - aabb.MinZ;

+                if( x > 60.0f || y > 60.0f || z > 60.0f)

+                    m_log.WarnFormat("[PHYSICS]: large prim geo {0},size {1}, AABBsize <{2},{3},{4}, mesh {5} at {6}",

+                        Name, _size.ToString(), x, y, z, _pbs.SculptEntry ? _pbs.SculptTexture.ToString() : "primMesh", _position.ToString());

+                else if (x < 0.001f || y < 0.001f || z < 0.001f)

+                    m_log.WarnFormat("[PHYSICS]: small prim geo {0},size {1}, AABBsize <{2},{3},{4}, mesh {5} at {6}",

+                        Name, _size.ToString(), x, y, z, _pbs.SculptEntry ? _pbs.SculptTexture.ToString() : "primMesh", _position.ToString());

+

+//

+*/

+

+            }

+            else

+                m_log.Warn("Setting bad Geom");

+        }

+

+        private bool GetMeshGeom()

+        {

+            IntPtr vertices, indices;

+            int vertexCount, indexCount;

+            int vertexStride, triStride;

+            

+            IMesh mesh = m_mesh;

+

+            if (mesh == null)

+                return false;

+

+            mesh.getVertexListAsPtrToFloatArray(out vertices, out vertexStride, out vertexCount);

+            mesh.getIndexListAsPtrToIntArray(out indices, out triStride, out indexCount);

+

+            if (vertexCount == 0 || indexCount == 0)

+            {

+                m_log.WarnFormat("[PHYSICS]: Invalid mesh data on OdePrim {0}, mesh {1} at {2}",

+                    Name, _pbs.SculptEntry ? _pbs.SculptTexture.ToString() : "primMesh",_position.ToString());

+

+                m_hasOBB = false;

+                m_OBBOffset = Vector3.Zero;

+                m_OBB = _size * 0.5f;

+

+                m_physCost = 0.1f;

+                m_streamCost = 1.0f;

+

+                _parent_scene.mesher.ReleaseMesh(mesh);

+                m_meshState = MeshState.MeshFailed;

+                m_mesh = null;

+                return false;

+            }

+

+            IntPtr geo = IntPtr.Zero;

+

+            try

+            {

+                _triMeshData = d.GeomTriMeshDataCreate();

+

+                d.GeomTriMeshDataBuildSimple(_triMeshData, vertices, vertexStride, vertexCount, indices, indexCount, triStride);

+                d.GeomTriMeshDataPreprocess(_triMeshData);

+

+                geo = d.CreateTriMesh(m_targetSpace, _triMeshData, null, null, null);

+            }

+

+            catch (Exception e)

+            {

+                m_log.ErrorFormat("[PHYSICS]: SetGeom Mesh failed for {0} exception: {1}", Name, e);

+                if (_triMeshData != IntPtr.Zero)

+                {

+                    try

+                    {

+                        d.GeomTriMeshDataDestroy(_triMeshData);

+                    }

+                    catch

+                    {

+                    }

+                }

+                _triMeshData = IntPtr.Zero;

+

+                m_hasOBB = false;

+                m_OBBOffset = Vector3.Zero;

+                m_OBB = _size * 0.5f;

+                m_physCost = 0.1f;

+                m_streamCost = 1.0f;

+              

+                _parent_scene.mesher.ReleaseMesh(mesh);

+                m_meshState = MeshState.MeshFailed;

+                m_mesh = null;

+                return false;

+            }

+

+            m_physCost = 0.0013f * (float)indexCount;

+            // todo

+            m_streamCost = 1.0f;

+

+            SetGeom(geo);

+

+            return true;

+        }

+

+        private void CreateGeom()

+        {

+            bool hasMesh = false;

+

+            m_NoColide = false;

+

+            if ((m_meshState & MeshState.MeshNoColide) != 0)

+                m_NoColide = true;

+

+            else if(m_mesh != null)

+            {

+                if (GetMeshGeom())

+                    hasMesh = true;

+                else

+                    m_NoColide = true;

+            }

+

+

+            if (!hasMesh)

+            {

+                IntPtr geo = IntPtr.Zero;

+

+                if (_pbs.ProfileShape == ProfileShape.HalfCircle && _pbs.PathCurve == (byte)Extrusion.Curve1

+                    && _size.X == _size.Y && _size.Y == _size.Z)

+                { // it's a sphere

+                    try

+                    {

+                        geo = d.CreateSphere(m_targetSpace, _size.X * 0.5f);

+                    }

+                    catch (Exception e)

+                    {

+                        m_log.WarnFormat("[PHYSICS]: Create sphere failed: {0}", e);

+                        return;

+                    }

+                }

+                else

+                {// do it as a box

+                    try

+                    {

+                        geo = d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z);

+                    }

+                    catch (Exception e)

+                    {

+                        m_log.Warn("[PHYSICS]: Create box failed: {0}", e);

+                        return;

+                    }

+                }

+                m_physCost = 0.1f;

+                m_streamCost = 1.0f;

+                SetGeom(geo);

+            }

+        }

+

+        private void RemoveGeom()

+        {

+            if (prim_geom != IntPtr.Zero)

+            {

+                _parent_scene.actor_name_map.Remove(prim_geom);

+

+                try

+                {

+                    d.GeomDestroy(prim_geom);

+                    if (_triMeshData != IntPtr.Zero)

+                    {

+                        d.GeomTriMeshDataDestroy(_triMeshData);

+                        _triMeshData = IntPtr.Zero;

+                    }

+                }

+                catch (Exception e)

+                {

+                    m_log.ErrorFormat("[PHYSICS]: PrimGeom destruction failed for {0} exception {1}", Name, e);

+                }

+

+                prim_geom = IntPtr.Zero;

+                collide_geom = IntPtr.Zero;

+                m_targetSpace = IntPtr.Zero;

+            }

+            else

+            {

+                m_log.ErrorFormat("[PHYSICS]: PrimGeom destruction BAD {0}", Name);

+            }

+

+            lock (m_meshlock)

+            {

+                if (m_mesh != null)

+                {

+                    _parent_scene.mesher.ReleaseMesh(m_mesh);

+                    m_mesh = null;

+                }

+            }

+

+            Body = IntPtr.Zero;

+            m_hasOBB = false;

+        }

+

+        //sets non physical prim m_targetSpace to right space in spaces grid for static prims

+        // should only be called for non physical prims unless they are becoming non physical

+        private void SetInStaticSpace(OdePrim prim)

+        {

+            IntPtr targetSpace = _parent_scene.MoveGeomToStaticSpace(prim.prim_geom, prim._position, prim.m_targetSpace);

+            prim.m_targetSpace = targetSpace;

+            collide_geom = IntPtr.Zero;

+        }

+

+        public void enableBodySoft()

+        {

+            m_disabled = false;

+            if (!childPrim && !m_isSelected)

+            {

+                if (m_isphysical && Body != IntPtr.Zero)

+                {

+                    UpdateCollisionCatFlags();

+                    ApplyCollisionCatFlags();

+

+                    d.BodyEnable(Body);

+                }

+            }

+            resetCollisionAccounting();

+        }

+

+        private void disableBodySoft()

+        {

+            m_disabled = true;

+            if (!childPrim)

+            {

+                if (m_isphysical && Body != IntPtr.Zero)

+                {

+                    if (m_isSelected)

+                        m_collisionFlags = CollisionCategories.Selected;

+                    else

+                        m_collisionCategories = 0;

+                    m_collisionFlags = 0;

+                    ApplyCollisionCatFlags();

+                    d.BodyDisable(Body);

+                }

+            }

+        }

+

+        private void MakeBody()

+        {

+            if (!m_isphysical) // only physical get bodies

+                return;

+

+            if (childPrim)  // child prims don't get bodies;

+                return;

+

+            if (m_building)

+                return;

+

+            if (prim_geom == IntPtr.Zero)

+            {

+                m_log.Warn("[PHYSICS]: Unable to link the linkset.  Root has no geom yet");

+                return;

+            }

+

+            if (Body != IntPtr.Zero)

+            {

+                DestroyBody();

+                m_log.Warn("[PHYSICS]: MakeBody called having a body");

+            }

+

+            if (d.GeomGetBody(prim_geom) != IntPtr.Zero)

+            {

+                d.GeomSetBody(prim_geom, IntPtr.Zero);

+                m_log.Warn("[PHYSICS]: MakeBody root geom already had a body");

+            }

+

+            d.Matrix3 mymat = new d.Matrix3();

+            d.Quaternion myrot = new d.Quaternion();

+            d.Mass objdmass = new d.Mass { };

+

+            Body = d.BodyCreate(_parent_scene.world);

+

+            objdmass = primdMass;

+

+            // rotate inertia

+            myrot.X = _orientation.X;

+            myrot.Y = _orientation.Y;

+            myrot.Z = _orientation.Z;

+            myrot.W = _orientation.W;

+

+            d.RfromQ(out mymat, ref myrot);

+            d.MassRotate(ref objdmass, ref mymat);

+

+            // set the body rotation

+            d.BodySetRotation(Body, ref mymat);

+

+            // recompute full object inertia if needed

+            if (childrenPrim.Count > 0)

+            {

+                d.Matrix3 mat = new d.Matrix3();

+                d.Quaternion quat = new d.Quaternion();

+                d.Mass tmpdmass = new d.Mass { };

+                Vector3 rcm;

+

+                rcm.X = _position.X;

+                rcm.Y = _position.Y;

+                rcm.Z = _position.Z;

+

+                lock (childrenPrim)

+                {

+                    foreach (OdePrim prm in childrenPrim)

+                    {

+                        if (prm.prim_geom == IntPtr.Zero)

+                        {

+                            m_log.Warn("[PHYSICS]: Unable to link one of the linkset elements, skipping it.  No geom yet");

+                            continue;

+                        }

+

+                        tmpdmass = prm.primdMass;

+

+                        // apply prim current rotation to inertia

+                        quat.X = prm._orientation.X;

+                        quat.Y = prm._orientation.Y;

+                        quat.Z = prm._orientation.Z;

+                        quat.W = prm._orientation.W;

+                        d.RfromQ(out mat, ref quat);

+                        d.MassRotate(ref tmpdmass, ref mat);

+

+                        Vector3 ppos = prm._position;

+                        ppos.X -= rcm.X;

+                        ppos.Y -= rcm.Y;

+                        ppos.Z -= rcm.Z;

+                        // refer inertia to root prim center of mass position

+                        d.MassTranslate(ref tmpdmass,

+                            ppos.X,

+                            ppos.Y,

+                            ppos.Z);

+

+                        d.MassAdd(ref objdmass, ref tmpdmass); // add to total object inertia

+                        // fix prim colision cats

+

+                        if (d.GeomGetBody(prm.prim_geom) != IntPtr.Zero)

+                        {

+                            d.GeomSetBody(prm.prim_geom, IntPtr.Zero);

+                            m_log.Warn("[PHYSICS]: MakeBody child geom already had a body");

+                        }

+

+                        d.GeomClearOffset(prm.prim_geom);

+                        d.GeomSetBody(prm.prim_geom, Body);

+                        prm.Body = Body;

+                        d.GeomSetOffsetWorldRotation(prm.prim_geom, ref mat); // set relative rotation

+                    }

+                }

+            }

+

+            d.GeomClearOffset(prim_geom); // make sure we don't have a hidden offset

+            // associate root geom with body

+            d.GeomSetBody(prim_geom, Body);

+

+            d.BodySetPosition(Body, _position.X + objdmass.c.X, _position.Y + objdmass.c.Y, _position.Z + objdmass.c.Z);

+            d.GeomSetOffsetWorldPosition(prim_geom, _position.X, _position.Y, _position.Z);

+

+            d.MassTranslate(ref objdmass, -objdmass.c.X, -objdmass.c.Y, -objdmass.c.Z); // ode wants inertia at center of body

+            myrot.X = -myrot.X;

+            myrot.Y = -myrot.Y;

+            myrot.Z = -myrot.Z;

+

+            d.RfromQ(out mymat, ref myrot);

+            d.MassRotate(ref objdmass, ref mymat);

+

+            d.BodySetMass(Body, ref objdmass);

+            _mass = objdmass.mass;

+

+            // disconnect from world gravity so we can apply buoyancy

+            d.BodySetGravityMode(Body, false);

+

+            d.BodySetAutoDisableFlag(Body, true);

+            d.BodySetAutoDisableSteps(Body, body_autodisable_frames);

+            d.BodySetDamping(Body, .005f, .005f);

+

+            if (m_targetSpace != IntPtr.Zero)

+            {

+                _parent_scene.waitForSpaceUnlock(m_targetSpace);

+                if (d.SpaceQuery(m_targetSpace, prim_geom))

+                    d.SpaceRemove(m_targetSpace, prim_geom);

+            }

+

+            if (childrenPrim.Count == 0)

+            {

+                collide_geom = prim_geom;

+                m_targetSpace = _parent_scene.ActiveSpace;               

+            }

+            else

+            {

+                m_targetSpace = d.HashSpaceCreate(_parent_scene.ActiveSpace);

+                d.HashSpaceSetLevels(m_targetSpace, -2, 8);

+                d.SpaceSetSublevel(m_targetSpace, 3);

+                d.SpaceSetCleanup(m_targetSpace, false);

+

+                d.GeomSetCategoryBits(m_targetSpace, (uint)(CollisionCategories.Space |

+                                                            CollisionCategories.Geom |

+                                                            CollisionCategories.Phantom |

+                                                            CollisionCategories.VolumeDtc

+                                                            ));

+                d.GeomSetCollideBits(m_targetSpace, 0);

+                collide_geom = m_targetSpace;

+            }

+

+            d.SpaceAdd(m_targetSpace, prim_geom);

+

+            if (m_delaySelect)

+            {

+                m_isSelected = true;

+                m_delaySelect = false;

+            }

+

+            m_collisionscore = 0;

+

+            UpdateCollisionCatFlags();

+            ApplyCollisionCatFlags();

+

+            _parent_scene.addActivePrim(this);

+

+            lock (childrenPrim)

+            {

+                foreach (OdePrim prm in childrenPrim)

+                {

+                    if (prm.prim_geom == IntPtr.Zero)

+                        continue;

+

+                    Vector3 ppos = prm._position;

+                    d.GeomSetOffsetWorldPosition(prm.prim_geom, ppos.X, ppos.Y, ppos.Z); // set relative position

+

+                    if (prm.m_targetSpace != m_targetSpace)

+                    {

+                        if (prm.m_targetSpace != IntPtr.Zero)

+                        {

+                            _parent_scene.waitForSpaceUnlock(prm.m_targetSpace);

+                            if (d.SpaceQuery(prm.m_targetSpace, prm.prim_geom))

+                                d.SpaceRemove(prm.m_targetSpace, prm.prim_geom);

+                        }

+                        prm.m_targetSpace = m_targetSpace;

+                        d.SpaceAdd(m_targetSpace, prm.prim_geom);

+                    }

+

+                    prm.m_collisionscore = 0;

+

+                    if(!m_disabled)

+                        prm.m_disabled = false;

+

+                    _parent_scene.addActivePrim(prm);

+                }

+            }

+

+            // The body doesn't already have a finite rotation mode set here

+            if ((!m_angularlock.ApproxEquals(Vector3.One, 0.0f)) && _parent == null)

+            {

+                createAMotor(m_angularlock);

+            }

+

+

+            if (m_isSelected || m_disabled)

+            {

+                d.BodyDisable(Body);

+            }

+            else

+            {

+                d.BodySetAngularVel(Body, m_rotationalVelocity.X, m_rotationalVelocity.Y, m_rotationalVelocity.Z);

+                d.BodySetLinearVel(Body, _velocity.X, _velocity.Y, _velocity.Z);

+            }               

+            _parent_scene.addActiveGroups(this);

+        }

+

+        private void DestroyBody()

+        {

+            if (Body != IntPtr.Zero)

+            {

+                _parent_scene.remActivePrim(this);

+

+                collide_geom = IntPtr.Zero;

+

+                if (m_disabled)

+                    m_collisionCategories = 0;

+                else if (m_isSelected)

+                    m_collisionCategories = CollisionCategories.Selected;

+                else if (m_isVolumeDetect)

+                    m_collisionCategories = CollisionCategories.VolumeDtc;

+                else if (m_isphantom)

+                    m_collisionCategories = CollisionCategories.Phantom;

+                else

+                    m_collisionCategories = CollisionCategories.Geom;

+

+                m_collisionFlags = 0;

+

+                if (prim_geom != IntPtr.Zero)

+                {

+                    if (m_NoColide)

+                    {

+                        d.GeomSetCategoryBits(prim_geom, 0);

+                        d.GeomSetCollideBits(prim_geom, 0);

+                    }

+                    else

+                    {

+                        d.GeomSetCategoryBits(prim_geom, (uint)m_collisionCategories);

+                        d.GeomSetCollideBits(prim_geom, (uint)m_collisionFlags);

+                    }

+                    UpdateDataFromGeom();

+                    d.GeomSetBody(prim_geom, IntPtr.Zero);

+                    SetInStaticSpace(this);

+                }

+

+                if (!childPrim)

+                {

+                    lock (childrenPrim)

+                    {

+                        foreach (OdePrim prm in childrenPrim)

+                        {

+                            _parent_scene.remActivePrim(prm);

+

+                            if (prm.m_isSelected)

+                                prm.m_collisionCategories = CollisionCategories.Selected;

+                            else if (prm.m_isVolumeDetect)

+                                prm.m_collisionCategories = CollisionCategories.VolumeDtc;

+                            else if (prm.m_isphantom)

+                                prm.m_collisionCategories = CollisionCategories.Phantom;

+                            else

+                                prm.m_collisionCategories = CollisionCategories.Geom;

+

+                            prm.m_collisionFlags = 0;

+

+                            if (prm.prim_geom != IntPtr.Zero)

+                            {

+                                if (prm.m_NoColide)

+                                {

+                                    d.GeomSetCategoryBits(prm.prim_geom, 0);

+                                    d.GeomSetCollideBits(prm.prim_geom, 0);

+                                }

+                                else

+                                {

+                                    d.GeomSetCategoryBits(prm.prim_geom, (uint)prm.m_collisionCategories);

+                                    d.GeomSetCollideBits(prm.prim_geom, (uint)prm.m_collisionFlags);

+                                }

+                                prm.UpdateDataFromGeom();

+                                SetInStaticSpace(prm);

+                            }

+                            prm.Body = IntPtr.Zero;

+                            prm._mass = prm.primMass;

+                            prm.m_collisionscore = 0;

+                        }

+                    }

+                    if (Amotor != IntPtr.Zero)

+                    {

+                        d.JointDestroy(Amotor);

+                        Amotor = IntPtr.Zero;

+                    }

+                    _parent_scene.remActiveGroup(this);

+                    d.BodyDestroy(Body);

+                }

+                Body = IntPtr.Zero;

+            }

+            _mass = primMass;

+            m_collisionscore = 0;

+        }

+

+        private void FixInertia(Vector3 NewPos,Quaternion newrot)

+        {

+            d.Matrix3 mat = new d.Matrix3();

+            d.Quaternion quat = new d.Quaternion();

+

+            d.Mass tmpdmass = new d.Mass { };         

+            d.Mass objdmass = new d.Mass { };

+

+            d.BodyGetMass(Body, out tmpdmass);

+            objdmass = tmpdmass;

+

+            d.Vector3 dobjpos;

+            d.Vector3 thispos;

+

+            // get current object position and rotation

+            dobjpos = d.BodyGetPosition(Body);

+

+            // get prim own inertia in its local frame

+            tmpdmass = primdMass;

+

+            // transform to object frame

+            mat = d.GeomGetOffsetRotation(prim_geom);

+            d.MassRotate(ref tmpdmass, ref mat);

+

+            thispos = d.GeomGetOffsetPosition(prim_geom);

+            d.MassTranslate(ref tmpdmass,

+                            thispos.X,

+                            thispos.Y,

+                            thispos.Z);

+

+            // subtract current prim inertia from object

+            DMassSubPartFromObj(ref tmpdmass, ref objdmass);

+

+            // back prim own inertia 

+            tmpdmass = primdMass;

+

+            // update to new position and orientation

+            _position = NewPos;

+            d.GeomSetOffsetWorldPosition(prim_geom, NewPos.X, NewPos.Y, NewPos.Z);

+            _orientation = newrot;

+            quat.X = newrot.X;

+            quat.Y = newrot.Y;

+            quat.Z = newrot.Z;

+            quat.W = newrot.W;

+            d.GeomSetOffsetWorldQuaternion(prim_geom, ref quat);

+

+            mat = d.GeomGetOffsetRotation(prim_geom);

+            d.MassRotate(ref tmpdmass, ref mat);

+

+            thispos = d.GeomGetOffsetPosition(prim_geom);

+            d.MassTranslate(ref tmpdmass,

+                            thispos.X,

+                            thispos.Y,

+                            thispos.Z);

+

+            d.MassAdd(ref objdmass, ref tmpdmass);

+

+            // fix all positions

+            IntPtr g = d.BodyGetFirstGeom(Body);

+            while (g != IntPtr.Zero)

+            {

+                thispos = d.GeomGetOffsetPosition(g);

+                thispos.X -= objdmass.c.X;

+                thispos.Y -= objdmass.c.Y;

+                thispos.Z -= objdmass.c.Z;

+                d.GeomSetOffsetPosition(g, thispos.X, thispos.Y, thispos.Z);

+                g = d.dBodyGetNextGeom(g);

+            }

+            d.BodyVectorToWorld(Body,objdmass.c.X, objdmass.c.Y, objdmass.c.Z,out thispos);

+

+            d.BodySetPosition(Body, dobjpos.X + thispos.X, dobjpos.Y + thispos.Y, dobjpos.Z + thispos.Z);

+            d.MassTranslate(ref objdmass, -objdmass.c.X, -objdmass.c.Y, -objdmass.c.Z); // ode wants inertia at center of body

+            d.BodySetMass(Body, ref objdmass);

+            _mass = objdmass.mass;

+        }

+

+

+

+        private void FixInertia(Vector3 NewPos)

+        {

+            d.Matrix3 primmat = new d.Matrix3();

+            d.Mass tmpdmass = new d.Mass { };

+            d.Mass objdmass = new d.Mass { };

+            d.Mass primmass = new d.Mass { };

+

+            d.Vector3 dobjpos;

+            d.Vector3 thispos;

+

+            d.BodyGetMass(Body, out objdmass);

+

+            // get prim own inertia in its local frame

+            primmass = primdMass;

+            // transform to object frame

+            primmat = d.GeomGetOffsetRotation(prim_geom);

+            d.MassRotate(ref primmass, ref primmat);

+

+            tmpdmass = primmass;

+

+            thispos = d.GeomGetOffsetPosition(prim_geom);

+            d.MassTranslate(ref tmpdmass,

+                            thispos.X,

+                            thispos.Y,

+                            thispos.Z);

+

+            // subtract current prim inertia from object

+            DMassSubPartFromObj(ref tmpdmass, ref objdmass);

+

+            // update to new position

+            _position = NewPos;

+            d.GeomSetOffsetWorldPosition(prim_geom, NewPos.X, NewPos.Y, NewPos.Z);

+

+            thispos = d.GeomGetOffsetPosition(prim_geom);

+            d.MassTranslate(ref primmass,

+                            thispos.X,

+                            thispos.Y,

+                            thispos.Z);

+

+            d.MassAdd(ref objdmass, ref primmass);

+

+            // fix all positions

+            IntPtr g = d.BodyGetFirstGeom(Body);

+            while (g != IntPtr.Zero)

+            {

+                thispos = d.GeomGetOffsetPosition(g);

+                thispos.X -= objdmass.c.X;

+                thispos.Y -= objdmass.c.Y;

+                thispos.Z -= objdmass.c.Z;

+                d.GeomSetOffsetPosition(g, thispos.X, thispos.Y, thispos.Z);

+                g = d.dBodyGetNextGeom(g);

+            }

+

+            d.BodyVectorToWorld(Body, objdmass.c.X, objdmass.c.Y, objdmass.c.Z, out thispos);

+

+            // get current object position and rotation

+            dobjpos = d.BodyGetPosition(Body);

+

+            d.BodySetPosition(Body, dobjpos.X + thispos.X, dobjpos.Y + thispos.Y, dobjpos.Z + thispos.Z);

+            d.MassTranslate(ref objdmass, -objdmass.c.X, -objdmass.c.Y, -objdmass.c.Z); // ode wants inertia at center of body

+            d.BodySetMass(Body, ref objdmass);

+            _mass = objdmass.mass;

+        }

+

+        private void FixInertia(Quaternion newrot)

+        {

+            d.Matrix3 mat = new d.Matrix3();

+            d.Quaternion quat = new d.Quaternion();

+

+            d.Mass tmpdmass = new d.Mass { };

+            d.Mass objdmass = new d.Mass { };

+            d.Vector3 dobjpos;

+            d.Vector3 thispos;

+

+            d.BodyGetMass(Body, out objdmass);

+

+            // get prim own inertia in its local frame

+            tmpdmass = primdMass;

+            mat = d.GeomGetOffsetRotation(prim_geom);

+            d.MassRotate(ref tmpdmass, ref mat);

+            // transform to object frame

+            thispos = d.GeomGetOffsetPosition(prim_geom);

+            d.MassTranslate(ref tmpdmass,

+                            thispos.X,

+                            thispos.Y,

+                            thispos.Z);

+

+            // subtract current prim inertia from object

+            DMassSubPartFromObj(ref tmpdmass, ref objdmass);

+

+            // update to new orientation

+            _orientation = newrot;

+            quat.X = newrot.X;

+            quat.Y = newrot.Y;

+            quat.Z = newrot.Z;

+            quat.W = newrot.W;

+            d.GeomSetOffsetWorldQuaternion(prim_geom, ref quat);

+

+            tmpdmass = primdMass;

+            mat = d.GeomGetOffsetRotation(prim_geom);

+            d.MassRotate(ref tmpdmass, ref mat);

+            d.MassTranslate(ref tmpdmass,

+                            thispos.X,

+                            thispos.Y,

+                            thispos.Z);

+

+            d.MassAdd(ref objdmass, ref tmpdmass);

+

+            // fix all positions

+            IntPtr g = d.BodyGetFirstGeom(Body);

+            while (g != IntPtr.Zero)

+            {

+                thispos = d.GeomGetOffsetPosition(g);

+                thispos.X -= objdmass.c.X;

+                thispos.Y -= objdmass.c.Y;

+                thispos.Z -= objdmass.c.Z;

+                d.GeomSetOffsetPosition(g, thispos.X, thispos.Y, thispos.Z);

+                g = d.dBodyGetNextGeom(g);

+            }

+

+            d.BodyVectorToWorld(Body, objdmass.c.X, objdmass.c.Y, objdmass.c.Z, out thispos);

+            // get current object position and rotation

+            dobjpos = d.BodyGetPosition(Body);

+

+            d.BodySetPosition(Body, dobjpos.X + thispos.X, dobjpos.Y + thispos.Y, dobjpos.Z + thispos.Z);

+            d.MassTranslate(ref objdmass, -objdmass.c.X, -objdmass.c.Y, -objdmass.c.Z); // ode wants inertia at center of body

+            d.BodySetMass(Body, ref objdmass);

+            _mass = objdmass.mass;

+        }

+

+

+        #region Mass Calculation

+

+        private void UpdatePrimBodyData()

+        {

+            primMass = m_density * primVolume;

+

+            if (primMass <= 0)

+                primMass = 0.0001f;//ckrinke: Mass must be greater then zero.

+            if (primMass > _parent_scene.maximumMassObject)

+                primMass = _parent_scene.maximumMassObject;

+

+            _mass = primMass; // just in case

+

+            d.MassSetBoxTotal(out primdMass, primMass, m_OBB.X, m_OBB.Y, m_OBB.Z);

+

+            d.MassTranslate(ref primdMass,

+                                m_OBBOffset.X,

+                                m_OBBOffset.Y,

+                                m_OBBOffset.Z);

+

+            primOOBradiusSQ = m_OBB.LengthSquared();

+

+            if (_triMeshData != IntPtr.Zero)

+            {

+                float pc = m_physCost;

+                float psf = primOOBradiusSQ;

+                psf *= 1.33f * .2f;

+                pc *= psf;

+                if (pc < 0.1f)

+                    pc = 0.1f;

+

+                m_physCost = pc;

+            }

+            else

+                m_physCost = 0.1f;

+

+            m_streamCost = 1.0f;

+        }

+

+        #endregion

+

+

+        /// <summary>

+        /// Add a child prim to this parent prim.

+        /// </summary>

+        /// <param name="prim">Child prim</param>

+        // I'm the parent

+        // prim is the child

+        public void ParentPrim(OdePrim prim)

+        {

+            //Console.WriteLine("ParentPrim  " + m_primName);

+            if (this.m_localID != prim.m_localID)

+            {

+                DestroyBody();  // for now we need to rebuil entire object on link change

+

+                lock (childrenPrim)

+                {

+                    // adopt the prim

+                    if (!childrenPrim.Contains(prim))

+                        childrenPrim.Add(prim);

+

+                    // see if this prim has kids and adopt them also

+                    // should not happen for now

+                    foreach (OdePrim prm in prim.childrenPrim)

+                    {

+                        if (!childrenPrim.Contains(prm))

+                        {

+                            if (prm.Body != IntPtr.Zero)

+                            {

+                                if (prm.prim_geom != IntPtr.Zero)

+                                    d.GeomSetBody(prm.prim_geom, IntPtr.Zero);

+                                if (prm.Body != prim.Body)

+                                    prm.DestroyBody(); // don't loose bodies around

+                                prm.Body = IntPtr.Zero;

+                            }

+

+                            childrenPrim.Add(prm);

+                            prm._parent = this;

+                        }

+                    }

+                }

+                //Remove old children from the prim

+                prim.childrenPrim.Clear();

+

+                if (prim.Body != IntPtr.Zero)

+                {

+                    if (prim.prim_geom != IntPtr.Zero)

+                        d.GeomSetBody(prim.prim_geom, IntPtr.Zero);

+                    prim.DestroyBody(); // don't loose bodies around

+                    prim.Body = IntPtr.Zero;

+                }

+

+                prim.childPrim = true;

+                prim._parent = this;

+

+                MakeBody(); // full nasty reconstruction

+            }

+        }

+

+        private void UpdateChildsfromgeom()

+        {

+            if (childrenPrim.Count > 0)

+            {

+                foreach (OdePrim prm in childrenPrim)

+                    prm.UpdateDataFromGeom();

+            }

+        }

+

+        private void UpdateDataFromGeom()

+        {

+            if (prim_geom != IntPtr.Zero)

+            {

+                d.Quaternion qtmp;

+                d.GeomCopyQuaternion(prim_geom, out qtmp);

+                _orientation.X = qtmp.X;

+                _orientation.Y = qtmp.Y;

+                _orientation.Z = qtmp.Z;

+                _orientation.W = qtmp.W;

+/*

+// Debug

+                float qlen = _orientation.Length();

+                if (qlen > 1.01f || qlen < 0.99)

+                    m_log.WarnFormat("[PHYSICS]: Got nonnorm quaternion from geom in Object {0} norm {1}", Name, qlen);

+//

+*/

+                _orientation.Normalize();

+

+                d.Vector3 lpos = d.GeomGetPosition(prim_geom);

+                _position.X = lpos.X;

+                _position.Y = lpos.Y;

+                _position.Z = lpos.Z;

+            }

+        }

+

+        private void ChildDelink(OdePrim odePrim, bool remakebodies)

+        {

+            // Okay, we have a delinked child.. destroy all body and remake

+            if (odePrim != this && !childrenPrim.Contains(odePrim))

+                return;

+

+            DestroyBody();

+

+            if (odePrim == this) // delinking the root prim

+            {

+                OdePrim newroot = null;

+                lock (childrenPrim)

+                {

+                    if (childrenPrim.Count > 0)

+                    {

+                        newroot = childrenPrim[0];

+                        childrenPrim.RemoveAt(0);

+                        foreach (OdePrim prm in childrenPrim)

+                        {

+                            newroot.childrenPrim.Add(prm);

+                        }

+                        childrenPrim.Clear();

+                    }

+                    if (newroot != null)

+                    {

+                        newroot.childPrim = false;

+                        newroot._parent = null;

+                        if (remakebodies)

+                            newroot.MakeBody();

+                    }

+                }

+            }

+

+            else

+            {

+                lock (childrenPrim)

+                {

+                    childrenPrim.Remove(odePrim);

+                    odePrim.childPrim = false;

+                    odePrim._parent = null;

+                    //                    odePrim.UpdateDataFromGeom();

+                    if (remakebodies)

+                        odePrim.MakeBody();

+                }

+            }

+            if (remakebodies)

+                MakeBody();

+        }

+

+        protected void ChildRemove(OdePrim odePrim, bool reMakeBody)

+        {

+            // Okay, we have a delinked child.. destroy all body and remake

+            if (odePrim != this && !childrenPrim.Contains(odePrim))

+                return;

+

+            DestroyBody();

+

+            if (odePrim == this)

+            {

+                OdePrim newroot = null;

+                lock (childrenPrim)

+                {

+                    if (childrenPrim.Count > 0)

+                    {

+                        newroot = childrenPrim[0];

+                        childrenPrim.RemoveAt(0);

+                        foreach (OdePrim prm in childrenPrim)

+                        {

+                            newroot.childrenPrim.Add(prm);

+                        }

+                        childrenPrim.Clear();

+                    }

+                    if (newroot != null)

+                    {

+                        newroot.childPrim = false;

+                        newroot._parent = null;

+                        newroot.MakeBody();

+                    }

+                }

+                if (reMakeBody)

+                    MakeBody();

+                return;

+            }

+            else

+            {

+                lock (childrenPrim)

+                {

+                    childrenPrim.Remove(odePrim);

+                    odePrim.childPrim = false;

+                    odePrim._parent = null;

+                    if (reMakeBody)

+                        odePrim.MakeBody();

+                }

+            }

+            MakeBody();

+        }

+

+        #region changes

+

+        private void changeadd()

+        {

+        }

+

+        private void changeAngularLock(Vector3 newLock)

+        {

+            // do we have a Physical object?

+            if (Body != IntPtr.Zero)

+            {

+                //Check that we have a Parent

+                //If we have a parent then we're not authorative here

+                if (_parent == null)

+                {

+                    if (!newLock.ApproxEquals(Vector3.One, 0f))

+                    {

+                        createAMotor(newLock);

+                    }

+                    else

+                    {

+                        if (Amotor != IntPtr.Zero)

+                        {

+                            d.JointDestroy(Amotor);

+                            Amotor = IntPtr.Zero;

+                        }

+                    }

+                }

+            }

+            // Store this for later in case we get turned into a separate body

+            m_angularlock = newLock;

+        }

+

+        private void changeLink(OdePrim NewParent)

+        {

+            if (_parent == null && NewParent != null)

+            {

+                NewParent.ParentPrim(this);

+            }

+            else if (_parent != null)

+            {

+                if (_parent is OdePrim)

+                {

+                    if (NewParent != _parent)

+                    {

+                        (_parent as OdePrim).ChildDelink(this, false); // for now...

+                        childPrim = false;

+

+                        if (NewParent != null)

+                        {

+                            NewParent.ParentPrim(this);

+                        }

+                    }

+                }

+            }

+            _parent = NewParent;

+        }

+

+

+        private void Stop()

+        {

+            if (!childPrim)

+            {

+//                m_force = Vector3.Zero;

+                m_forceacc = Vector3.Zero;

+                m_angularForceacc = Vector3.Zero;

+//                m_torque = Vector3.Zero;

+                _velocity = Vector3.Zero;

+                _acceleration = Vector3.Zero;

+                m_rotationalVelocity = Vector3.Zero;

+                _target_velocity = Vector3.Zero;

+                if (m_vehicle != null && m_vehicle.Type != Vehicle.TYPE_NONE)

+                    m_vehicle.Stop();

+

+                _zeroFlag = false;

+                base.RequestPhysicsterseUpdate();

+            }

+

+            if (Body != IntPtr.Zero)

+            {

+                d.BodySetForce(Body, 0f, 0f, 0f);

+                d.BodySetTorque(Body, 0f, 0f, 0f);

+                d.BodySetLinearVel(Body, 0f, 0f, 0f);

+                d.BodySetAngularVel(Body, 0f, 0f, 0f);

+            }

+        }

+

+        private void changePhantomStatus(bool newval)

+        {

+            m_isphantom = newval;

+

+            UpdateCollisionCatFlags();

+            ApplyCollisionCatFlags();

+        }

+

+/* not in use

+        internal void ChildSelectedChange(bool childSelect)

+        {

+            if(childPrim)

+                return;

+

+            if (childSelect == m_isSelected)

+                return;

+

+            if (childSelect)

+            {

+                DoSelectedStatus(true);

+            }

+

+            else

+            {

+                foreach (OdePrim prm in childrenPrim)

+                {

+                    if (prm.m_isSelected)

+                        return;

+                }

+                DoSelectedStatus(false);

+            }

+        }

+*/

+        private void changeSelectedStatus(bool newval)

+        {

+            if (m_lastdoneSelected == newval)

+                return;

+

+            m_lastdoneSelected = newval;

+            DoSelectedStatus(newval);

+        }

+

+        private void CheckDelaySelect()

+        {

+            if (m_delaySelect)

+            {

+                DoSelectedStatus(m_isSelected);

+            }

+        }

+

+        private void DoSelectedStatus(bool newval)

+        {

+            m_isSelected = newval;

+            Stop();

+

+            if (newval)

+            {

+                if (!childPrim && Body != IntPtr.Zero)

+                    d.BodyDisable(Body);

+

+                if (m_delaySelect || m_isphysical)

+                {

+                    m_collisionCategories = CollisionCategories.Selected;

+                    m_collisionFlags = 0;

+

+                    if (!childPrim)

+                    {

+                        foreach (OdePrim prm in childrenPrim)

+                        {

+                            prm.m_collisionCategories = m_collisionCategories;

+                            prm.m_collisionFlags = m_collisionFlags;

+

+                            if (prm.prim_geom != IntPtr.Zero)

+                            {

+

+                                if (prm.m_NoColide)

+                                {

+                                    d.GeomSetCategoryBits(prm.prim_geom, 0);

+                                    d.GeomSetCollideBits(prm.prim_geom, 0);

+                                }

+                                else

+                                {

+                                    d.GeomSetCategoryBits(prm.prim_geom, (uint)m_collisionCategories);

+                                    d.GeomSetCollideBits(prm.prim_geom, (uint)m_collisionFlags);

+                                }

+                            }

+                            prm.m_delaySelect = false;

+                        }

+                    }

+//                    else if (_parent != null)

+//                        ((OdePrim)_parent).ChildSelectedChange(true);

+

+

+                    if (prim_geom != IntPtr.Zero)

+                    {

+                        if (m_NoColide)

+                        {

+                            d.GeomSetCategoryBits(prim_geom, 0);

+                            d.GeomSetCollideBits(prim_geom, 0);

+                            if (collide_geom != prim_geom && collide_geom != IntPtr.Zero)

+                            {

+                                d.GeomSetCategoryBits(collide_geom, 0);

+                                d.GeomSetCollideBits(collide_geom, 0);

+                            }

+

+                        }

+                        else

+                        {

+                            d.GeomSetCategoryBits(prim_geom, (uint)m_collisionCategories);

+                            d.GeomSetCollideBits(prim_geom, (uint)m_collisionFlags);

+                            if (collide_geom != prim_geom && collide_geom != IntPtr.Zero)

+                            {

+                                d.GeomSetCategoryBits(collide_geom, (uint)m_collisionCategories);

+                                d.GeomSetCollideBits(collide_geom, (uint)m_collisionFlags);

+                            }

+                        }

+                    }

+

+                    m_delaySelect = false;

+                }

+                else if(!m_isphysical)

+                {

+                    m_delaySelect = true;

+                }

+            }

+            else

+            {

+                if (!childPrim)

+                {

+                    if (Body != IntPtr.Zero && !m_disabled)

+                        d.BodyEnable(Body);

+                }

+//                else if (_parent != null)

+//                    ((OdePrim)_parent).ChildSelectedChange(false);

+

+                UpdateCollisionCatFlags();

+                ApplyCollisionCatFlags();

+

+                m_delaySelect = false;

+            }

+

+            resetCollisionAccounting();

+        }

+

+        private void changePosition(Vector3 newPos)

+        {

+            CheckDelaySelect();

+            if (m_isphysical)

+            {

+                if (childPrim)  // inertia is messed, must rebuild

+                {

+                    if (m_building)

+                    {

+                        _position = newPos;

+                    }

+

+                    else if (m_forcePosOrRotation && _position != newPos && Body != IntPtr.Zero)

+                    {

+                        FixInertia(newPos);

+                        if (!d.BodyIsEnabled(Body))

+                            d.BodyEnable(Body);

+                    }

+                }

+                else

+                {

+                    if (_position != newPos)

+                    {

+                        d.GeomSetPosition(prim_geom, newPos.X, newPos.Y, newPos.Z);

+                        _position = newPos;

+                    }

+                    if (Body != IntPtr.Zero && !d.BodyIsEnabled(Body))

+                        d.BodyEnable(Body);

+                }

+            }

+            else

+            {

+                if (prim_geom != IntPtr.Zero)

+                {

+                    if (newPos != _position)

+                    {

+                        d.GeomSetPosition(prim_geom, newPos.X, newPos.Y, newPos.Z);

+                        _position = newPos;

+

+                        m_targetSpace = _parent_scene.MoveGeomToStaticSpace(prim_geom, _position, m_targetSpace);

+                    }

+                }

+            }

+            givefakepos--;

+            if (givefakepos < 0)

+                givefakepos = 0;

+//            changeSelectedStatus();

+            resetCollisionAccounting();

+        }

+

+        private void changeOrientation(Quaternion newOri)

+        {

+            CheckDelaySelect();

+            if (m_isphysical)

+            {

+                if (childPrim)  // inertia is messed, must rebuild

+                {

+                    if (m_building)

+                    {

+                        _orientation = newOri;

+                    }

+/*

+                    else if (m_forcePosOrRotation && _orientation != newOri && Body != IntPtr.Zero)

+                    {

+                        FixInertia(_position, newOri);

+                        if (!d.BodyIsEnabled(Body))

+                            d.BodyEnable(Body);

+                    }

+*/

+                }

+                else

+                {

+                    if (newOri != _orientation)

+                    {

+                        d.Quaternion myrot = new d.Quaternion();

+                        myrot.X = newOri.X;

+                        myrot.Y = newOri.Y;

+                        myrot.Z = newOri.Z;

+                        myrot.W = newOri.W;

+                        d.GeomSetQuaternion(prim_geom, ref myrot);

+                        _orientation = newOri;

+                        if (Body != IntPtr.Zero && !m_angularlock.ApproxEquals(Vector3.One, 0f))

+                            createAMotor(m_angularlock);

+                    }

+                    if (Body != IntPtr.Zero && !d.BodyIsEnabled(Body))

+                        d.BodyEnable(Body);

+                }

+            }

+            else

+            {

+                if (prim_geom != IntPtr.Zero)

+                {

+                    if (newOri != _orientation)

+                    {

+                        d.Quaternion myrot = new d.Quaternion();

+                        myrot.X = newOri.X;

+                        myrot.Y = newOri.Y;

+                        myrot.Z = newOri.Z;

+                        myrot.W = newOri.W;

+                        d.GeomSetQuaternion(prim_geom, ref myrot);

+                        _orientation = newOri;

+                    }

+                }

+            }

+            givefakeori--;

+            if (givefakeori < 0)

+                givefakeori = 0;

+            resetCollisionAccounting();

+        }

+

+        private void changePositionAndOrientation(Vector3 newPos, Quaternion newOri)

+        {

+            CheckDelaySelect();

+            if (m_isphysical)

+            {

+                if (childPrim && m_building)  // inertia is messed, must rebuild

+                {

+                    _position = newPos;

+                    _orientation = newOri;

+                }

+                else

+                {

+                    if (newOri != _orientation)

+                    {

+                        d.Quaternion myrot = new d.Quaternion();

+                        myrot.X = newOri.X;

+                        myrot.Y = newOri.Y;

+                        myrot.Z = newOri.Z;

+                        myrot.W = newOri.W;

+                        d.GeomSetQuaternion(prim_geom, ref myrot);

+                        _orientation = newOri;

+                        if (Body != IntPtr.Zero && !m_angularlock.ApproxEquals(Vector3.One, 0f))

+                            createAMotor(m_angularlock);

+                    }

+                    if (_position != newPos)

+                    {

+                        d.GeomSetPosition(prim_geom, newPos.X, newPos.Y, newPos.Z);

+                        _position = newPos;

+                    }

+                    if (Body != IntPtr.Zero && !d.BodyIsEnabled(Body))

+                        d.BodyEnable(Body);

+                }

+            }

+            else

+            {

+                // string primScenAvatarIn = _parent_scene.whichspaceamIin(_position);

+                // int[] arrayitem = _parent_scene.calculateSpaceArrayItemFromPos(_position);

+

+                if (prim_geom != IntPtr.Zero)

+                {

+                    if (newOri != _orientation)

+                    {

+                        d.Quaternion myrot = new d.Quaternion();

+                        myrot.X = newOri.X;

+                        myrot.Y = newOri.Y;

+                        myrot.Z = newOri.Z;

+                        myrot.W = newOri.W;

+                        d.GeomSetQuaternion(prim_geom, ref myrot);

+                        _orientation = newOri;

+                    }

+

+                    if (newPos != _position)

+                    {

+                        d.GeomSetPosition(prim_geom, newPos.X, newPos.Y, newPos.Z);

+                        _position = newPos;

+

+                        m_targetSpace = _parent_scene.MoveGeomToStaticSpace(prim_geom, _position, m_targetSpace);

+                    }

+                }

+            }

+            givefakepos--;

+            if (givefakepos < 0)

+                givefakepos = 0;

+            givefakeori--;

+            if (givefakeori < 0)

+                givefakeori = 0;

+            resetCollisionAccounting();

+        }

+

+        private void changeDisable(bool disable)

+        {

+            if (disable)

+            {

+                if (!m_disabled)

+                    disableBodySoft();

+            }

+            else

+            {

+                if (m_disabled)

+                    enableBodySoft();

+            }

+        }

+

+        private void changePhysicsStatus(bool NewStatus)

+        {

+            CheckDelaySelect();

+

+            m_isphysical = NewStatus;

+

+            if (!childPrim)

+            {

+                if (NewStatus)

+                {

+                    if (Body == IntPtr.Zero)

+                        MakeBody();

+                }

+                else

+                {

+                    if (Body != IntPtr.Zero)

+                    {

+                        DestroyBody();

+                    }

+                    Stop();

+                }

+            }

+

+            resetCollisionAccounting();

+        }

+

+        private void changeSize(Vector3 newSize)

+        {

+        }

+

+        private void changeShape(PrimitiveBaseShape newShape)

+        {

+        }

+

+        private void changeAddPhysRep(ODEPhysRepData repData)

+        {

+            _size = repData.size; //??

+            _pbs = repData.pbs;

+            m_shapetype = repData.shapetype;

+

+            m_mesh = repData.mesh;

+

+            m_assetID = repData.assetID;

+            m_meshState = repData.meshState;

+

+            m_hasOBB = repData.hasOBB;

+            m_OBBOffset = repData.OBBOffset;

+            m_OBB = repData.OBB;

+

+            primVolume = repData.volume;

+

+            CreateGeom();

+

+            if (prim_geom != IntPtr.Zero)

+            {

+                d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);

+                d.Quaternion myrot = new d.Quaternion();

+                myrot.X = _orientation.X;

+                myrot.Y = _orientation.Y;

+                myrot.Z = _orientation.Z;

+                myrot.W = _orientation.W;

+                d.GeomSetQuaternion(prim_geom, ref myrot);

+            }

+

+            if (!m_isphysical)

+            {

+                SetInStaticSpace(this);

+                UpdateCollisionCatFlags();

+                ApplyCollisionCatFlags();

+            }

+            else

+                MakeBody();

+

+            if ((m_meshState & MeshState.NeedMask) != 0)

+            {

+                repData.size = _size;

+                repData.pbs = _pbs;

+                repData.shapetype = m_shapetype;

+                _parent_scene.m_meshWorker.RequestMesh(repData);

+            }

+        }

+

+        private void changePhysRepData(ODEPhysRepData repData)

+        {

+            CheckDelaySelect();

+

+            OdePrim parent = (OdePrim)_parent;

+

+            bool chp = childPrim;

+

+            if (chp)

+            {

+                if (parent != null)

+                {

+                    parent.DestroyBody();

+                }

+            }

+            else

+            {

+                DestroyBody();

+            }

+

+            RemoveGeom();

+

+            _size = repData.size;

+            _pbs = repData.pbs;

+            m_shapetype = repData.shapetype;

+

+            m_mesh = repData.mesh;

+

+            m_assetID = repData.assetID;

+            m_meshState = repData.meshState;

+

+            m_hasOBB = repData.hasOBB;

+            m_OBBOffset = repData.OBBOffset;

+            m_OBB = repData.OBB;

+

+            primVolume = repData.volume;

+

+            CreateGeom();          

+

+            if (prim_geom != IntPtr.Zero)

+            {

+                d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);

+                d.Quaternion myrot = new d.Quaternion();

+                myrot.X = _orientation.X;

+                myrot.Y = _orientation.Y;

+                myrot.Z = _orientation.Z;

+                myrot.W = _orientation.W;

+                d.GeomSetQuaternion(prim_geom, ref myrot);

+            }

+

+            if (m_isphysical)

+            {

+                if (chp)

+                {

+                    if (parent != null)

+                    {

+                        parent.MakeBody();

+                    }

+                }

+                else

+                    MakeBody();

+            }

+            else

+            {

+                SetInStaticSpace(this);

+                UpdateCollisionCatFlags();

+                ApplyCollisionCatFlags();

+            }

+

+            resetCollisionAccounting();

+

+            if ((m_meshState & MeshState.NeedMask) != 0)

+            {

+                repData.size = _size;

+                repData.pbs = _pbs;

+                repData.shapetype = m_shapetype;

+                _parent_scene.m_meshWorker.RequestMesh(repData);

+            }

+        }

+

+        private void changeFloatOnWater(bool newval)

+        {

+            m_collidesWater = newval;

+

+            UpdateCollisionCatFlags();

+            ApplyCollisionCatFlags();

+        }

+

+        private void changeSetTorque(Vector3 newtorque)

+        {

+            if (!m_isSelected)

+            {

+                if (m_isphysical && Body != IntPtr.Zero)

+                {

+                    if (m_disabled)

+                        enableBodySoft();

+                    else if (!d.BodyIsEnabled(Body))

+                        d.BodyEnable(Body);

+

+                }

+                m_torque = newtorque;

+            }

+        }

+

+        private void changeForce(Vector3 force)

+        {

+            m_force = force;

+            if (Body != IntPtr.Zero && !d.BodyIsEnabled(Body))

+                d.BodyEnable(Body);

+        }

+

+        private void changeAddForce(Vector3 theforce)

+        {

+            m_forceacc += theforce;

+            if (!m_isSelected)

+            {

+                lock (this)

+                {

+                    //m_log.Info("[PHYSICS]: dequeing forcelist");

+                    if (m_isphysical && Body != IntPtr.Zero)

+                    {

+                        if (m_disabled)

+                            enableBodySoft();

+                        else if (!d.BodyIsEnabled(Body))

+                            d.BodyEnable(Body);

+                    }

+                }

+                m_collisionscore = 0;

+            }

+        }

+

+        // actually angular impulse

+        private void changeAddAngularImpulse(Vector3 aimpulse)

+        {

+            m_angularForceacc += aimpulse * m_invTimeStep;

+            if (!m_isSelected)

+            {

+                lock (this)

+                {

+                    if (m_isphysical && Body != IntPtr.Zero)

+                    {

+                        if (m_disabled)

+                            enableBodySoft();

+                        else if (!d.BodyIsEnabled(Body))

+                            d.BodyEnable(Body);

+                    }

+                }

+                m_collisionscore = 0;

+            }

+        }

+

+        private void changevelocity(Vector3 newVel)

+        {

+            float len = newVel.LengthSquared();

+            if (len > 100000.0f) // limit to 100m/s

+            {

+                len = 100.0f / (float)Math.Sqrt(len);

+                newVel *= len;

+            }

+

+            if (!m_isSelected)

+            {

+                if (Body != IntPtr.Zero)

+                {

+                    if (m_disabled)

+                        enableBodySoft();

+                    else if (!d.BodyIsEnabled(Body))

+                        d.BodyEnable(Body);

+

+                    d.BodySetLinearVel(Body, newVel.X, newVel.Y, newVel.Z);

+                }

+                //resetCollisionAccounting();           

+            }

+            _velocity = newVel;

+        }

+

+        private void changeangvelocity(Vector3 newAngVel)

+        {

+            float len = newAngVel.LengthSquared();

+            if (len > 144.0f) // limit to 12rad/s

+            {

+                len = 12.0f / (float)Math.Sqrt(len);

+                newAngVel *= len;

+            }

+

+            if (!m_isSelected)

+            {

+                if (Body != IntPtr.Zero)

+                {

+                    if (m_disabled)

+                        enableBodySoft();

+                    else if (!d.BodyIsEnabled(Body))

+                        d.BodyEnable(Body);

+

+

+                    d.BodySetAngularVel(Body, newAngVel.X, newAngVel.Y, newAngVel.Z);

+                }

+                //resetCollisionAccounting();           

+            }

+            m_rotationalVelocity = newAngVel;

+        }

+

+        private void changeVolumedetetion(bool newVolDtc)

+        {

+            m_isVolumeDetect = newVolDtc;

+            m_fakeisVolumeDetect = newVolDtc;

+            UpdateCollisionCatFlags();

+            ApplyCollisionCatFlags();

+        }

+

+        protected void changeBuilding(bool newbuilding)

+        {

+            // Check if we need to do anything

+            if (newbuilding == m_building)

+                return;

+

+            if ((bool)newbuilding)

+            {

+                m_building = true;

+                if (!childPrim)

+                    DestroyBody();

+            }

+            else

+            {

+                m_building = false;

+                CheckDelaySelect();

+                if (!childPrim)

+                    MakeBody();

+            }

+            if (!childPrim && childrenPrim.Count > 0)

+            {

+                foreach (OdePrim prm in childrenPrim)

+                    prm.changeBuilding(m_building); // call directly

+            }

+        }

+

+       public void changeSetVehicle(VehicleData vdata)

+        {

+            if (m_vehicle == null)

+                m_vehicle = new ODEDynamics(this);

+            m_vehicle.DoSetVehicle(vdata);

+        }

+

+        private void changeVehicleType(int value)

+        {

+            if (value == (int)Vehicle.TYPE_NONE)

+            {

+                if (m_vehicle != null)

+                    m_vehicle = null;

+            }

+            else

+            {

+                if (m_vehicle == null)

+                    m_vehicle = new ODEDynamics(this);

+

+                m_vehicle.ProcessTypeChange((Vehicle)value);

+            }

+        }

+

+        private void changeVehicleFloatParam(strVehicleFloatParam fp)

+        {

+            if (m_vehicle == null)

+                return;

+

+            m_vehicle.ProcessFloatVehicleParam((Vehicle)fp.param, fp.value);

+        }

+

+        private void changeVehicleVectorParam(strVehicleVectorParam vp)

+        {

+            if (m_vehicle == null)

+                return;

+            m_vehicle.ProcessVectorVehicleParam((Vehicle)vp.param, vp.value);

+        }

+

+        private void changeVehicleRotationParam(strVehicleQuatParam qp)

+        {

+            if (m_vehicle == null)

+                return;

+            m_vehicle.ProcessRotationVehicleParam((Vehicle)qp.param, qp.value);

+        }

+

+        private void changeVehicleFlags(strVehicleBoolParam bp)

+        {

+            if (m_vehicle == null)

+                return;

+            m_vehicle.ProcessVehicleFlags(bp.param, bp.value);

+        }

+

+        private void changeBuoyancy(float b)

+        {

+            m_buoyancy = b;

+        }

+

+        private void changePIDTarget(Vector3 trg)

+        {

+            m_PIDTarget = trg;

+        }

+

+        private void changePIDTau(float tau)

+        {

+            m_PIDTau = tau;

+        }

+

+        private void changePIDActive(bool val)

+        {

+            m_usePID = val;

+        }

+

+        private void changePIDHoverHeight(float val)

+        {

+          m_PIDHoverHeight = val;

+          if (val == 0)

+            m_useHoverPID = false;

+        }

+

+        private void changePIDHoverType(PIDHoverType type)

+        {

+            m_PIDHoverType = type;

+        }

+

+        private void changePIDHoverTau(float tau)

+        {

+            m_PIDHoverTau = tau;

+        }

+

+        private void changePIDHoverActive(bool active)

+        {

+            m_useHoverPID = active;

+        }

+

+        #endregion

+

+        public void Move()

+        {

+            if (!childPrim && m_isphysical && Body != IntPtr.Zero &&

+                !m_disabled && !m_isSelected && !m_building && !m_outbounds)

+            {

+                if (!d.BodyIsEnabled(Body))

+                {

+                    // let vehicles sleep

+                    if (m_vehicle != null && m_vehicle.Type != Vehicle.TYPE_NONE)

+                        return;

+

+                    if (++bodydisablecontrol < 20)

+                        return;

+

+                    

+                    d.BodyEnable(Body);

+                }

+

+                bodydisablecontrol = 0;

+

+                d.Vector3 lpos = d.GeomGetPosition(prim_geom); // root position that is seem by rest of simulator

+

+                if (m_vehicle != null && m_vehicle.Type != Vehicle.TYPE_NONE)

+                {

+                    // 'VEHICLES' are dealt with in ODEDynamics.cs

+                    m_vehicle.Step();

+                    return;

+                }

+

+                float fx = 0;

+                float fy = 0;

+                float fz = 0;

+

+                float m_mass = _mass;

+

+                if (m_usePID && m_PIDTau > 0)

+                {

+                    // for now position error

+                    _target_velocity =

+                        new Vector3(

+                            (m_PIDTarget.X - lpos.X),

+                            (m_PIDTarget.Y - lpos.Y),

+                            (m_PIDTarget.Z - lpos.Z)

+                            );

+

+                    if (_target_velocity.ApproxEquals(Vector3.Zero, 0.02f))

+                    {

+                        d.BodySetPosition(Body, m_PIDTarget.X, m_PIDTarget.Y, m_PIDTarget.Z);

+                        d.BodySetLinearVel(Body, 0, 0, 0);

+                        return;

+                    }

+                    else

+                    {

+                        _zeroFlag = false;

+

+                        float tmp = 1 / m_PIDTau;

+                        _target_velocity *= tmp;

+

+                        // apply limits

+                        tmp = _target_velocity.Length();

+                        if (tmp > 50.0f)

+                        {

+                            tmp = 50 / tmp;

+                            _target_velocity *= tmp;

+                        }

+                        else if (tmp < 0.05f)

+                        {

+                            tmp = 0.05f / tmp;

+                            _target_velocity *= tmp;

+                        }

+

+                        d.Vector3 vel = d.BodyGetLinearVel(Body);

+                        fx = (_target_velocity.X - vel.X) * m_invTimeStep;

+                        fy = (_target_velocity.Y - vel.Y) * m_invTimeStep;

+                        fz = (_target_velocity.Z - vel.Z) * m_invTimeStep;

+//                        d.BodySetLinearVel(Body, _target_velocity.X, _target_velocity.Y, _target_velocity.Z);

+                    }

+                }        // end if (m_usePID)

+

+                // Hover PID Controller needs to be mutually exlusive to MoveTo PID controller

+                else if (m_useHoverPID && m_PIDHoverTau != 0 && m_PIDHoverHeight != 0)

+                {

+

+                    //    Non-Vehicles have a limited set of Hover options.

+                    // determine what our target height really is based on HoverType

+

+                    m_groundHeight = _parent_scene.GetTerrainHeightAtXY(lpos.X, lpos.Y);

+

+                    switch (m_PIDHoverType)

+                    {

+                        case PIDHoverType.Ground:

+                            m_targetHoverHeight = m_groundHeight + m_PIDHoverHeight;

+                            break;

+

+                        case PIDHoverType.GroundAndWater:

+                            m_waterHeight = _parent_scene.GetWaterLevel();

+                            if (m_groundHeight > m_waterHeight)

+                                m_targetHoverHeight = m_groundHeight + m_PIDHoverHeight;

+                            else

+                                m_targetHoverHeight = m_waterHeight + m_PIDHoverHeight;

+                            break;

+                    }     // end switch (m_PIDHoverType)

+

+                    // don't go underground unless volumedetector 

+

+                    if (m_targetHoverHeight > m_groundHeight || m_isVolumeDetect)

+                    {

+                        d.Vector3 vel = d.BodyGetLinearVel(Body);

+

+                        fz = (m_targetHoverHeight - lpos.Z);

+

+                        //  if error is zero, use position control; otherwise, velocity control

+                        if (Math.Abs(fz) < 0.01f)

+                        {

+                            d.BodySetPosition(Body, lpos.X, lpos.Y, m_targetHoverHeight);

+                            d.BodySetLinearVel(Body, vel.X, vel.Y, 0);

+                        }

+                        else

+                        {

+                            _zeroFlag = false;

+                            fz /= m_PIDHoverTau;

+

+                            float tmp = Math.Abs(fz);

+                            if (tmp > 50)

+                                fz = 50 * Math.Sign(fz);

+                            else if (tmp < 0.1)

+                                fz = 0.1f * Math.Sign(fz);

+

+                            fz = ((fz - vel.Z) * m_invTimeStep);

+                        }

+                    }

+                }

+                else

+                {

+                    float b = (1.0f - m_buoyancy);

+                    fx = _parent_scene.gravityx * b;

+                    fy = _parent_scene.gravityy * b;

+                    fz = _parent_scene.gravityz * b;

+                }

+

+                fx *= m_mass;

+                fy *= m_mass;

+                fz *= m_mass;

+

+                // constant force

+                fx += m_force.X;

+                fy += m_force.Y;

+                fz += m_force.Z;

+

+                fx += m_forceacc.X;

+                fy += m_forceacc.Y;

+                fz += m_forceacc.Z;

+

+                m_forceacc = Vector3.Zero;

+

+                //m_log.Info("[OBJPID]: X:" + fx.ToString() + " Y:" + fy.ToString() + " Z:" + fz.ToString());

+                if (fx != 0 || fy != 0 || fz != 0)

+                {

+                    d.BodyAddForce(Body, fx, fy, fz);

+                    //Console.WriteLine("AddForce " + fx + "," + fy + "," + fz);

+                }

+

+                Vector3 trq;

+

+                trq = m_torque;

+                trq += m_angularForceacc;

+                m_angularForceacc = Vector3.Zero;

+                if (trq.X != 0 || trq.Y != 0 || trq.Z != 0)

+                {

+                    d.BodyAddTorque(Body, trq.X, trq.Y, trq.Z);

+                }

+            }

+            else

+            {    // is not physical, or is not a body or is selected

+                //  _zeroPosition = d.BodyGetPosition(Body);

+                return;

+                //Console.WriteLine("Nothing " +  Name);

+

+            }

+        }

+

+        public void UpdatePositionAndVelocity()

+        {

+            if (_parent == null && !m_disabled && !m_building && !m_outbounds && Body != IntPtr.Zero)

+            {

+                if (d.BodyIsEnabled(Body) || !_zeroFlag)

+                {

+                    bool lastZeroFlag = _zeroFlag;

+

+                    d.Vector3 lpos = d.GeomGetPosition(prim_geom);

+

+                    // check outside region

+                    if (lpos.Z < -100 || lpos.Z > 100000f)

+                    {

+                        m_outbounds = true;

+

+                        lpos.Z = Util.Clip(lpos.Z, -100f, 100000f);

+                        _acceleration.X = 0;

+                        _acceleration.Y = 0;

+                        _acceleration.Z = 0;

+

+                        _velocity.X = 0;

+                        _velocity.Y = 0;

+                        _velocity.Z = 0;

+                        m_rotationalVelocity.X = 0;

+                        m_rotationalVelocity.Y = 0;

+                        m_rotationalVelocity.Z = 0;

+

+                        d.BodySetLinearVel(Body, 0, 0, 0); // stop it

+                        d.BodySetAngularVel(Body, 0, 0, 0); // stop it

+                        d.BodySetPosition(Body, lpos.X, lpos.Y, lpos.Z); // put it somewhere 

+                        m_lastposition = _position;

+                        m_lastorientation = _orientation;

+

+                        base.RequestPhysicsterseUpdate();

+

+//                        throttleCounter = 0;

+                        _zeroFlag = true;

+

+                        disableBodySoft(); // disable it and colisions

+                        base.RaiseOutOfBounds(_position);

+                        return;

+                    }

+

+                    if (lpos.X < 0f)

+                    {

+                        _position.X = Util.Clip(lpos.X, -2f, -0.1f);

+                        m_outbounds = true;

+                    }

+                    else if (lpos.X > _parent_scene.WorldExtents.X)

+                    {

+                        _position.X = Util.Clip(lpos.X, _parent_scene.WorldExtents.X + 0.1f, _parent_scene.WorldExtents.X + 2f);

+                        m_outbounds = true;

+                    }

+                    if (lpos.Y < 0f)

+                    {

+                        _position.Y = Util.Clip(lpos.Y, -2f, -0.1f);

+                        m_outbounds = true;

+                    }

+                    else if (lpos.Y > _parent_scene.WorldExtents.Y)

+                    {

+                        _position.Y = Util.Clip(lpos.Y, _parent_scene.WorldExtents.Y + 0.1f, _parent_scene.WorldExtents.Y + 2f);

+                        m_outbounds = true;

+                    }

+

+                    if (m_outbounds)

+                    {

+                        m_lastposition = _position;

+                        m_lastorientation = _orientation;

+

+                        d.Vector3 dtmp = d.BodyGetAngularVel(Body);

+                        m_rotationalVelocity.X = dtmp.X;

+                        m_rotationalVelocity.Y = dtmp.Y;

+                        m_rotationalVelocity.Z = dtmp.Z;

+

+                        dtmp = d.BodyGetLinearVel(Body);

+                        _velocity.X = dtmp.X;

+                        _velocity.Y = dtmp.Y;

+                        _velocity.Z = dtmp.Z;

+

+                        d.BodySetLinearVel(Body, 0, 0, 0); // stop it

+                        d.BodySetAngularVel(Body, 0, 0, 0);

+                        d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);

+                        disableBodySoft(); // stop collisions

+                        UnSubscribeEvents();

+

+                        base.RequestPhysicsterseUpdate();

+                        return;

+                    }

+

+                    d.Quaternion ori;

+                    d.GeomCopyQuaternion(prim_geom, out ori);

+

+                    // decide if moving

+                    // use positions since this are integrated quantities

+                    // tolerance values depende a lot on simulation noise...

+                    // use simple math.abs since we dont need to be exact

+

+                    if (

+                        (Math.Abs(_position.X - lpos.X) < 0.001f)

+                        && (Math.Abs(_position.Y - lpos.Y) < 0.001f)

+                        && (Math.Abs(_position.Z - lpos.Z) < 0.001f)

+                        && (Math.Abs(_orientation.X - ori.X) < 0.0001f)

+                        && (Math.Abs(_orientation.Y - ori.Y) < 0.0001f)

+                        && (Math.Abs(_orientation.Z - ori.Z) < 0.0001f)  // ignore W

+                        )

+                    {

+                        _zeroFlag = true;

+                    }

+                    else

+                        _zeroFlag = false;

+

+                    // update velocities and aceleration

+                    if (!(_zeroFlag && lastZeroFlag))

+                    {

+                        d.Vector3 vel = d.BodyGetLinearVel(Body);

+

+                        _acceleration = _velocity;

+

+                        if ((Math.Abs(vel.X) < 0.001f) &&

+                            (Math.Abs(vel.Y) < 0.001f) &&

+                            (Math.Abs(vel.Z) < 0.001f))

+                        {

+                            _velocity = Vector3.Zero;

+                            float t = -m_invTimeStep;

+                            _acceleration = _acceleration * t;

+                        }

+                        else

+                        {

+                            _velocity.X = vel.X;

+                            _velocity.Y = vel.Y;

+                            _velocity.Z = vel.Z;

+                            _acceleration = (_velocity - _acceleration) * m_invTimeStep;

+                        }

+

+                        if ((Math.Abs(_acceleration.X) < 0.01f) &&

+                            (Math.Abs(_acceleration.Y) < 0.01f) &&

+                            (Math.Abs(_acceleration.Z) < 0.01f))

+                        {

+                            _acceleration = Vector3.Zero;

+                        }

+

+                        if ((Math.Abs(_orientation.X - ori.X) < 0.0001) &&

+                           (Math.Abs(_orientation.Y - ori.Y) < 0.0001) &&

+                           (Math.Abs(_orientation.Z - ori.Z) < 0.0001)

+                           )

+                        {

+                            m_rotationalVelocity = Vector3.Zero;

+                        }

+                        else

+                        {

+                            vel = d.BodyGetAngularVel(Body);

+                            m_rotationalVelocity.X = vel.X;

+                            m_rotationalVelocity.Y = vel.Y;

+                            m_rotationalVelocity.Z = vel.Z;

+                        }

+                    }

+

+                    if (_zeroFlag)

+                    {

+                        if (lastZeroFlag)

+                        {

+                            _velocity = Vector3.Zero;

+                            _acceleration = Vector3.Zero;

+                            m_rotationalVelocity = Vector3.Zero;

+                        }

+

+                        if (!m_lastUpdateSent)

+                        {

+                            base.RequestPhysicsterseUpdate();

+                            if (lastZeroFlag)

+                                m_lastUpdateSent = true;

+                        }

+                        return;

+                    }

+

+                    _position.X = lpos.X;

+                    _position.Y = lpos.Y;

+                    _position.Z = lpos.Z;

+

+                    _orientation.X = ori.X;

+                    _orientation.Y = ori.Y;

+                    _orientation.Z = ori.Z;

+                    _orientation.W = ori.W;

+                    base.RequestPhysicsterseUpdate();

+                    m_lastUpdateSent = false;

+                }

+            }

+        }

+

+        internal static bool QuaternionIsFinite(Quaternion q)

+        {

+            if (Single.IsNaN(q.X) || Single.IsInfinity(q.X))

+                return false;

+            if (Single.IsNaN(q.Y) || Single.IsInfinity(q.Y))

+                return false;

+            if (Single.IsNaN(q.Z) || Single.IsInfinity(q.Z))

+                return false;

+            if (Single.IsNaN(q.W) || Single.IsInfinity(q.W))

+                return false;

+            return true;

+        }

+

+        internal static void DMassSubPartFromObj(ref d.Mass part, ref d.Mass theobj)

+        {

+            // assumes object center of mass is zero

+            float smass = part.mass;

+            theobj.mass -= smass;

+

+            smass *= 1.0f / (theobj.mass); ;

+

+            theobj.c.X -= part.c.X * smass;

+            theobj.c.Y -= part.c.Y * smass;

+            theobj.c.Z -= part.c.Z * smass;

+

+            theobj.I.M00 -= part.I.M00;

+            theobj.I.M01 -= part.I.M01;

+            theobj.I.M02 -= part.I.M02;

+            theobj.I.M10 -= part.I.M10;

+            theobj.I.M11 -= part.I.M11;

+            theobj.I.M12 -= part.I.M12;

+            theobj.I.M20 -= part.I.M20;

+            theobj.I.M21 -= part.I.M21;

+            theobj.I.M22 -= part.I.M22;

+        }

+

+        private void donullchange()

+        {

+        }

+

+        public bool DoAChange(changes what, object arg)

+        {

+            if (prim_geom == IntPtr.Zero && what != changes.Add && what != changes.AddPhysRep && what != changes.Remove)

+            {

+                return false;

+            }

+

+            // nasty switch

+            switch (what)

+            {

+                case changes.Add:

+                    changeadd();

+                    break;

+

+                case changes.AddPhysRep:

+                    changeAddPhysRep((ODEPhysRepData)arg);

+                    break;

+

+                case changes.Remove:

+                    //If its being removed, we don't want to rebuild the physical rep at all, so ignore this stuff...

+                    //When we return true, it destroys all of the prims in the linkset anyway

+                    if (_parent != null)

+                    {

+                        OdePrim parent = (OdePrim)_parent;

+                        parent.ChildRemove(this, false);

+                    }

+                    else

+                        ChildRemove(this, false);

+

+                    m_vehicle = null;

+                    RemoveGeom();

+                    m_targetSpace = IntPtr.Zero;

+                    UnSubscribeEvents();

+                    return true;

+

+                case changes.Link:

+                    OdePrim tmp = (OdePrim)arg;

+                    changeLink(tmp);

+                    break;

+

+                case changes.DeLink:

+                    changeLink(null);

+                    break;

+

+                case changes.Position:

+                    changePosition((Vector3)arg);

+                    break;

+

+                case changes.Orientation:

+                    changeOrientation((Quaternion)arg);

+                    break;

+

+                case changes.PosOffset:

+                    donullchange();

+                    break;

+

+                case changes.OriOffset:

+                    donullchange();

+                    break;

+

+                case changes.Velocity:

+                    changevelocity((Vector3)arg);

+                    break;

+

+//                case changes.Acceleration:

+//                    changeacceleration((Vector3)arg);

+//                    break;

+

+                case changes.AngVelocity:

+                    changeangvelocity((Vector3)arg);

+                    break;

+

+                case changes.Force:

+                    changeForce((Vector3)arg);

+                    break;

+

+                case changes.Torque:

+                    changeSetTorque((Vector3)arg);

+                    break;

+

+                case changes.AddForce:

+                    changeAddForce((Vector3)arg);

+                    break;

+

+                case changes.AddAngForce:

+                    changeAddAngularImpulse((Vector3)arg);

+                    break;

+

+                case changes.AngLock:

+                    changeAngularLock((Vector3)arg);

+                    break;

+

+                case changes.Size:

+                    changeSize((Vector3)arg);

+                    break;

+

+                case changes.Shape:

+                    changeShape((PrimitiveBaseShape)arg);

+                    break;

+

+                case changes.PhysRepData:

+                    changePhysRepData((ODEPhysRepData) arg);

+                    break;

+

+                case changes.CollidesWater:

+                    changeFloatOnWater((bool)arg);

+                    break;

+

+                case changes.VolumeDtc:

+                    changeVolumedetetion((bool)arg);

+                    break;

+

+                case changes.Phantom:

+                    changePhantomStatus((bool)arg);

+                    break;

+

+                case changes.Physical:

+                    changePhysicsStatus((bool)arg);

+                    break;

+

+                case changes.Selected:

+                    changeSelectedStatus((bool)arg);

+                    break;

+

+                case changes.disabled:

+                    changeDisable((bool)arg);

+                    break;

+

+                case changes.building:

+                    changeBuilding((bool)arg);

+                    break;

+

+                case changes.VehicleType:

+                    changeVehicleType((int)arg);

+                    break;

+

+                case changes.VehicleFlags:

+                    changeVehicleFlags((strVehicleBoolParam) arg);

+                    break;

+

+                case changes.VehicleFloatParam:

+                    changeVehicleFloatParam((strVehicleFloatParam) arg);

+                    break;

+

+                case changes.VehicleVectorParam:

+                    changeVehicleVectorParam((strVehicleVectorParam) arg);

+                    break;

+

+                case changes.VehicleRotationParam:

+                    changeVehicleRotationParam((strVehicleQuatParam) arg);

+                    break;

+

+                case changes.SetVehicle:

+                    changeSetVehicle((VehicleData) arg);

+                    break;

+

+                case changes.Buoyancy:

+                    changeBuoyancy((float)arg);

+                    break;

+

+                case changes.PIDTarget:

+                    changePIDTarget((Vector3)arg);

+                    break;

+

+                case changes.PIDTau:

+                    changePIDTau((float)arg);

+                    break;

+

+                case changes.PIDActive:

+                    changePIDActive((bool)arg);

+                    break;

+

+                case changes.PIDHoverHeight:

+                    changePIDHoverHeight((float)arg);

+                    break;

+

+                case changes.PIDHoverType:

+                    changePIDHoverType((PIDHoverType)arg);

+                    break;

+

+                case changes.PIDHoverTau:

+                    changePIDHoverTau((float)arg);

+                    break;

+

+                case changes.PIDHoverActive:

+                    changePIDHoverActive((bool)arg);

+                    break;

+

+                case changes.Null:

+                    donullchange();

+                    break;

+

+

+

+                default:

+                    donullchange();

+                    break;

+            }

+            return false;

+        }

+

+        public void AddChange(changes what, object arg)

+        {

+            _parent_scene.AddChange((PhysicsActor) this, what, arg);

+        }

+

+

+        private struct strVehicleBoolParam

+        {

+            public int param;

+            public bool value;

+        }

+

+        private struct strVehicleFloatParam

+        {

+            public int param;

+            public float value;

+        }

+

+        private struct strVehicleQuatParam

+        {

+            public int param;

+            public Quaternion value;

+        }

+

+        private struct strVehicleVectorParam

+        {

+            public int param;

+            public Vector3 value;

+        }

+    }

+}

diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs
new file mode 100644
index 0000000..2923ccf
--- /dev/null
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs
@@ -0,0 +1,683 @@
+/*
+ * 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.Reflection;
+using System.Runtime.InteropServices;
+using System.Text;
+using OpenSim.Framework;
+using OpenSim.Region.Physics.Manager;
+using OdeAPI;
+using log4net;
+using OpenMetaverse;
+
+namespace OpenSim.Region.Physics.OdePlugin
+{
+    /// <summary>
+    /// Processes raycast requests as ODE is in a state to be able to do them.
+    /// This ensures that it's thread safe and there will be no conflicts.
+    /// Requests get returned by a different thread then they were requested by.
+    /// </summary>
+    public class ODERayCastRequestManager
+    {
+        /// <summary>
+        /// Pending ray requests
+        /// </summary>
+        protected OpenSim.Framework.LocklessQueue<ODERayRequest> m_PendingRequests = new OpenSim.Framework.LocklessQueue<ODERayRequest>();
+
+        /// <summary>
+        /// Scene that created this object.
+        /// </summary>
+        private OdeScene m_scene;
+
+        IntPtr ray; // the ray. we only need one for our lifetime
+        IntPtr Sphere;
+        IntPtr Box;
+        IntPtr Plane;
+
+        private int CollisionContactGeomsPerTest = 25;
+        private const int DefaultMaxCount = 25;
+        private const int MaxTimePerCallMS = 30;
+
+        /// <summary>
+        /// ODE near callback delegate
+        /// </summary>
+        private d.NearCallback nearCallback;
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private List<ContactResult> m_contactResults = new List<ContactResult>();
+        private RayFilterFlags CurrentRayFilter;
+        private int CurrentMaxCount;
+
+        public ODERayCastRequestManager(OdeScene pScene)
+        {
+            m_scene = pScene;
+            nearCallback = near;
+            ray = d.CreateRay(IntPtr.Zero, 1.0f);
+            d.GeomSetCategoryBits(ray, 0);
+            Box = d.CreateBox(IntPtr.Zero, 1.0f, 1.0f, 1.0f);
+            d.GeomSetCategoryBits(Box, 0);
+            Sphere = d.CreateSphere(IntPtr.Zero,1.0f);
+            d.GeomSetCategoryBits(Sphere, 0);
+            Plane = d.CreatePlane(IntPtr.Zero, 0f,0f,1f,1f);
+            d.GeomSetCategoryBits(Sphere, 0);
+        }
+
+        public void QueueRequest(ODERayRequest req)
+        {
+            if (req.Count == 0)
+                req.Count = DefaultMaxCount;
+
+            m_PendingRequests.Enqueue(req);
+        }
+
+        /// <summary>
+        /// Process all queued raycast requests
+        /// </summary>
+        /// <returns>Time in MS the raycasts took to process.</returns>
+        public int ProcessQueuedRequests()
+        {
+
+            if (m_PendingRequests.Count <= 0)
+                return 0;
+
+            if (m_scene.ContactgeomsArray == IntPtr.Zero || ray == IntPtr.Zero)
+                // oops something got wrong or scene isn't ready still
+            {
+                m_PendingRequests.Clear();
+                return 0;
+            }
+
+            int time = Util.EnvironmentTickCount();
+
+            ODERayRequest req;
+            int closestHit;
+            int backfacecull;
+            CollisionCategories catflags;
+
+            while (m_PendingRequests.Dequeue(out req))
+            {
+                if (req.callbackMethod != null)
+                {
+                    IntPtr geom = IntPtr.Zero;
+                    if (req.actor != null)
+                    {
+                        if (m_scene.haveActor(req.actor))
+                        {
+                            if (req.actor is OdePrim)
+                                geom = ((OdePrim)req.actor).prim_geom;
+                            else if (req.actor is OdeCharacter)
+                                geom = ((OdePrim)req.actor).prim_geom;
+                        }
+                        if (geom == IntPtr.Zero)
+                        {
+                            NoContacts(req);
+                            continue;
+                        }
+                    }
+                      
+
+                    CurrentRayFilter = req.filter;
+                    CurrentMaxCount = req.Count;
+
+                    CollisionContactGeomsPerTest = req.Count & 0xffff;
+
+                    closestHit = ((CurrentRayFilter & RayFilterFlags.ClosestHit) == 0 ? 0 : 1);
+                    backfacecull = ((CurrentRayFilter & RayFilterFlags.BackFaceCull) == 0 ? 0 : 1);
+
+                    if (req.callbackMethod is ProbeBoxCallback)
+                    {
+                        if (CollisionContactGeomsPerTest > 80)
+                            CollisionContactGeomsPerTest = 80;
+                        d.GeomBoxSetLengths(Box, req.Normal.X, req.Normal.Y, req.Normal.Z);
+                        d.GeomSetPosition(Box, req.Origin.X, req.Origin.Y, req.Origin.Z);
+                        d.Quaternion qtmp;
+                        qtmp.X = req.orientation.X;
+                        qtmp.Y = req.orientation.Y;
+                        qtmp.Z = req.orientation.Z;
+                        qtmp.W = req.orientation.W;
+                        d.GeomSetQuaternion(Box, ref qtmp);
+                    }
+                    else if (req.callbackMethod is ProbeSphereCallback)
+                    {
+                        if (CollisionContactGeomsPerTest > 80)
+                            CollisionContactGeomsPerTest = 80;
+
+                        d.GeomSphereSetRadius(Sphere, req.length);
+                        d.GeomSetPosition(Sphere, req.Origin.X, req.Origin.Y, req.Origin.Z);
+                    }
+                    else if (req.callbackMethod is ProbePlaneCallback)
+                    {
+                        if (CollisionContactGeomsPerTest > 80)
+                            CollisionContactGeomsPerTest = 80;
+
+                        d.GeomPlaneSetParams(Plane, req.Normal.X, req.Normal.Y, req.Normal.Z, req.length);
+                    }
+
+                    else
+                    {
+                        if (CollisionContactGeomsPerTest > 25)
+                            CollisionContactGeomsPerTest = 25;
+
+                        d.GeomRaySetLength(ray, req.length);
+                        d.GeomRaySet(ray, req.Origin.X, req.Origin.Y, req.Origin.Z, req.Normal.X, req.Normal.Y, req.Normal.Z);
+                        d.GeomRaySetParams(ray, 0, backfacecull);
+                        d.GeomRaySetClosestHit(ray, closestHit);
+
+                        if (req.callbackMethod is RaycastCallback)
+                        {
+                            // if we only want one get only one per Collision pair saving memory
+                            CurrentRayFilter |= RayFilterFlags.ClosestHit;
+                            d.GeomRaySetClosestHit(ray, 1);
+                        }
+                        else
+                            d.GeomRaySetClosestHit(ray, closestHit);
+                    }
+
+                    if ((CurrentRayFilter & RayFilterFlags.ContactsUnImportant) != 0)
+                        unchecked
+                        {
+                            CollisionContactGeomsPerTest |= (int)d.CONTACTS_UNIMPORTANT;
+                        }
+
+                    if (geom == IntPtr.Zero)
+                    {
+                        // translate ray filter to Collision flags
+                        catflags = 0;
+                        if ((CurrentRayFilter & RayFilterFlags.volumedtc) != 0)
+                            catflags |= CollisionCategories.VolumeDtc;
+                        if ((CurrentRayFilter & RayFilterFlags.phantom) != 0)
+                            catflags |= CollisionCategories.Phantom;
+                        if ((CurrentRayFilter & RayFilterFlags.agent) != 0)
+                            catflags |= CollisionCategories.Character;
+                        if ((CurrentRayFilter & RayFilterFlags.PrimsNonPhantom) != 0)
+                            catflags |= CollisionCategories.Geom;
+                        if ((CurrentRayFilter & RayFilterFlags.land) != 0)
+                            catflags |= CollisionCategories.Land;
+                        if ((CurrentRayFilter & RayFilterFlags.water) != 0)
+                            catflags |= CollisionCategories.Water;
+
+                        if (catflags != 0)
+                        {
+                            if (req.callbackMethod is ProbeBoxCallback)
+                            {
+                                catflags |= CollisionCategories.Space;
+                                d.GeomSetCollideBits(Box, (uint)catflags);
+                                d.GeomSetCategoryBits(Box, (uint)catflags);
+                                doProbe(req, Box);
+                            }
+                            else if (req.callbackMethod is ProbeSphereCallback)
+                            {
+                                catflags |= CollisionCategories.Space;
+                                d.GeomSetCollideBits(Sphere, (uint)catflags);
+                                d.GeomSetCategoryBits(Sphere, (uint)catflags);
+                                doProbe(req, Sphere);
+                            }
+                            else if (req.callbackMethod is ProbePlaneCallback)
+                            {
+                                catflags |= CollisionCategories.Space;
+                                d.GeomSetCollideBits(Plane, (uint)catflags);
+                                d.GeomSetCategoryBits(Plane, (uint)catflags);
+                                doPlane(req,IntPtr.Zero);
+                            }
+                            else
+                            {
+                                d.GeomSetCollideBits(ray, (uint)catflags);
+                                doSpaceRay(req);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        // if we select a geom don't use filters
+
+                        if (req.callbackMethod is ProbePlaneCallback)
+                        {
+                            d.GeomSetCollideBits(Plane, (uint)CollisionCategories.All);
+                            doPlane(req,geom);
+                        }
+                        else
+                        {
+                            d.GeomSetCollideBits(ray, (uint)CollisionCategories.All);
+                            doGeomRay(req,geom);
+                        }
+                    }
+                }
+
+                if (Util.EnvironmentTickCountSubtract(time) > MaxTimePerCallMS)
+                    break;
+            }
+
+            lock (m_contactResults)
+                m_contactResults.Clear();
+
+            return Util.EnvironmentTickCountSubtract(time);
+        }
+        /// <summary>
+        /// Method that actually initiates the raycast with spaces
+        /// </summary>
+        /// <param name="req"></param>
+        /// 
+
+        private void NoContacts(ODERayRequest req)
+        {
+            if (req.callbackMethod is RaycastCallback)
+            {
+                ((RaycastCallback)req.callbackMethod)(false, Vector3.Zero, 0, 0, Vector3.Zero);
+                return;
+            }
+            List<ContactResult> cresult = new List<ContactResult>();
+
+            if (req.callbackMethod is RayCallback)
+                ((RayCallback)req.callbackMethod)(cresult);
+            else if (req.callbackMethod is ProbeBoxCallback)
+                ((ProbeBoxCallback)req.callbackMethod)(cresult);
+            else if (req.callbackMethod is ProbeSphereCallback)
+                ((ProbeSphereCallback)req.callbackMethod)(cresult);
+        }
+
+        private const RayFilterFlags FilterActiveSpace = RayFilterFlags.agent | RayFilterFlags.physical | RayFilterFlags.LSLPhantom;
+//        private const RayFilterFlags FilterStaticSpace = RayFilterFlags.water | RayFilterFlags.land | RayFilterFlags.nonphysical | RayFilterFlags.LSLPhanton;
+        private const RayFilterFlags FilterStaticSpace = RayFilterFlags.water | RayFilterFlags.nonphysical | RayFilterFlags.LSLPhantom;
+
+        private void doSpaceRay(ODERayRequest req)
+        {
+            // Collide tests
+            if ((CurrentRayFilter & FilterActiveSpace) != 0)
+            {
+                d.SpaceCollide2(ray, m_scene.ActiveSpace, IntPtr.Zero, nearCallback);
+                d.SpaceCollide2(ray, m_scene.CharsSpace, IntPtr.Zero, nearCallback);
+            }
+            if ((CurrentRayFilter & FilterStaticSpace) != 0 && (m_contactResults.Count < CurrentMaxCount))
+                d.SpaceCollide2(ray, m_scene.StaticSpace, IntPtr.Zero, nearCallback);
+            if ((CurrentRayFilter & RayFilterFlags.land) != 0 && (m_contactResults.Count < CurrentMaxCount))
+            {
+                // current ode land to ray collisions is very bad
+                // so for now limit its range badly
+
+                if (req.length > 30.0f)
+                    d.GeomRaySetLength(ray, 30.0f);
+
+                d.SpaceCollide2(ray, m_scene.GroundSpace, IntPtr.Zero, nearCallback);
+            }
+
+            if (req.callbackMethod is RaycastCallback)
+            {
+                // Define default results
+                bool hitYN = false;
+                uint hitConsumerID = 0;
+                float distance = float.MaxValue;
+                Vector3 closestcontact = Vector3.Zero;
+                Vector3 snormal = Vector3.Zero;
+
+                // Find closest contact and object.
+                lock (m_contactResults)
+                {
+                    foreach (ContactResult cResult in m_contactResults)
+                    {
+                        if(cResult.Depth < distance)
+                        {
+                            closestcontact = cResult.Pos;
+                            hitConsumerID = cResult.ConsumerID;
+                            distance = cResult.Depth;
+                            snormal = cResult.Normal;
+                        }
+                    }
+                    m_contactResults.Clear();
+                }
+
+                if (distance > 0 && distance < float.MaxValue)
+                    hitYN = true;
+                ((RaycastCallback)req.callbackMethod)(hitYN, closestcontact, hitConsumerID, distance, snormal);
+            }
+            else
+            {
+                List<ContactResult> cresult = new List<ContactResult>(m_contactResults.Count);
+                lock (m_PendingRequests)
+                {
+                    cresult.AddRange(m_contactResults);
+                    m_contactResults.Clear();
+                }
+                ((RayCallback)req.callbackMethod)(cresult);
+            }
+        }
+
+        private void doProbe(ODERayRequest req, IntPtr probe)
+        {
+            // Collide tests
+            if ((CurrentRayFilter & FilterActiveSpace) != 0)
+            {
+                d.SpaceCollide2(probe, m_scene.ActiveSpace, IntPtr.Zero, nearCallback);
+                d.SpaceCollide2(probe, m_scene.CharsSpace, IntPtr.Zero, nearCallback);
+            }
+            if ((CurrentRayFilter & FilterStaticSpace) != 0 && (m_contactResults.Count < CurrentMaxCount))
+                d.SpaceCollide2(probe, m_scene.StaticSpace, IntPtr.Zero, nearCallback);
+            if ((CurrentRayFilter & RayFilterFlags.land) != 0 && (m_contactResults.Count < CurrentMaxCount))
+                d.SpaceCollide2(probe, m_scene.GroundSpace, IntPtr.Zero, nearCallback);
+
+            List<ContactResult> cresult = new List<ContactResult>(m_contactResults.Count);
+            lock (m_PendingRequests)
+            {
+                cresult.AddRange(m_contactResults);
+                m_contactResults.Clear();
+            }
+            if (req.callbackMethod is ProbeBoxCallback)
+                ((ProbeBoxCallback)req.callbackMethod)(cresult);
+            else if (req.callbackMethod is ProbeSphereCallback)
+                ((ProbeSphereCallback)req.callbackMethod)(cresult);
+        }
+
+        private void doPlane(ODERayRequest req,IntPtr geom)
+        {
+            // Collide tests
+            if (geom == IntPtr.Zero)
+            {
+                if ((CurrentRayFilter & FilterActiveSpace) != 0)
+                {
+                    d.SpaceCollide2(Plane, m_scene.ActiveSpace, IntPtr.Zero, nearCallback);
+                    d.SpaceCollide2(Plane, m_scene.CharsSpace, IntPtr.Zero, nearCallback);
+                }
+                if ((CurrentRayFilter & FilterStaticSpace) != 0 && (m_contactResults.Count < CurrentMaxCount))
+                    d.SpaceCollide2(Plane, m_scene.StaticSpace, IntPtr.Zero, nearCallback);
+                if ((CurrentRayFilter & RayFilterFlags.land) != 0 && (m_contactResults.Count < CurrentMaxCount))
+                    d.SpaceCollide2(Plane, m_scene.GroundSpace, IntPtr.Zero, nearCallback);
+            }
+            else
+            {
+                d.SpaceCollide2(Plane, geom, IntPtr.Zero, nearCallback);
+            }
+
+            List<ContactResult> cresult = new List<ContactResult>(m_contactResults.Count);
+            lock (m_PendingRequests)
+            {
+                cresult.AddRange(m_contactResults);
+                m_contactResults.Clear();
+            }
+
+            ((ProbePlaneCallback)req.callbackMethod)(cresult);
+        }
+
+        /// <summary>
+        /// Method that actually initiates the raycast with a geom
+        /// </summary>
+        /// <param name="req"></param>
+        private void doGeomRay(ODERayRequest req, IntPtr geom)
+        {
+            // Collide test
+            d.SpaceCollide2(ray, geom, IntPtr.Zero, nearCallback); // still do this to have full AABB pre test
+
+            if (req.callbackMethod is RaycastCallback)
+            {
+                // Define default results
+                bool hitYN = false;
+                uint hitConsumerID = 0;
+                float distance = float.MaxValue;
+                Vector3 closestcontact = Vector3.Zero;
+                Vector3 snormal = Vector3.Zero;
+
+                // Find closest contact and object.
+                lock (m_contactResults)
+                {
+                    foreach (ContactResult cResult in m_contactResults)
+                    {
+                        if(cResult.Depth < distance )
+                        {
+                            closestcontact = cResult.Pos;
+                            hitConsumerID = cResult.ConsumerID;
+                            distance = cResult.Depth;
+                            snormal = cResult.Normal;
+                        }
+                    }
+                    m_contactResults.Clear();
+                }
+
+                if (distance > 0 && distance < float.MaxValue)
+                    hitYN = true;
+
+                ((RaycastCallback)req.callbackMethod)(hitYN, closestcontact, hitConsumerID, distance, snormal);
+            }
+            else
+            {
+                List<ContactResult> cresult = new List<ContactResult>(m_contactResults.Count);
+                lock (m_PendingRequests)
+                {
+                    cresult.AddRange(m_contactResults);
+                    m_contactResults.Clear();
+                }
+                ((RayCallback)req.callbackMethod)(cresult);
+            }
+        }
+
+        private bool GetCurContactGeom(int index, ref d.ContactGeom newcontactgeom)
+        {
+            IntPtr ContactgeomsArray = m_scene.ContactgeomsArray;
+            if (ContactgeomsArray == IntPtr.Zero || index >= CollisionContactGeomsPerTest)
+                return false;
+
+            IntPtr contactptr = new IntPtr(ContactgeomsArray.ToInt64() + (Int64)(index * d.ContactGeom.unmanagedSizeOf));
+            newcontactgeom = (d.ContactGeom)Marshal.PtrToStructure(contactptr, typeof(d.ContactGeom));
+            return true;
+        }
+        
+        // This is the standard Near. g1 is the ray
+        private void near(IntPtr space, IntPtr g1, IntPtr g2)
+        {
+             if (g2 == IntPtr.Zero || g1 == g2)
+                return;
+
+             if (m_contactResults.Count >= CurrentMaxCount)
+                return;
+
+            if (d.GeomIsSpace(g2))
+            {
+                try
+                {
+                    d.SpaceCollide2(g1, g2, IntPtr.Zero, nearCallback);
+                }
+                catch (Exception e)
+                {
+                    m_log.WarnFormat("[PHYSICS Ray]: Unable to Space collide test an object: {0}", e.Message);
+                }
+                return;
+            }
+
+            int count = 0;
+            try
+            {
+                count = d.CollidePtr(g1, g2, CollisionContactGeomsPerTest, m_scene.ContactgeomsArray, d.ContactGeom.unmanagedSizeOf);
+            }
+            catch (Exception e)
+            {
+                m_log.WarnFormat("[PHYSICS Ray]: Unable to collide test an object: {0}", e.Message);
+                return;
+            }
+
+            if (count == 0)
+                return;
+/*
+            uint cat1 = d.GeomGetCategoryBits(g1);
+            uint cat2 = d.GeomGetCategoryBits(g2);
+            uint col1 = d.GeomGetCollideBits(g1);
+            uint col2 = d.GeomGetCollideBits(g2);
+*/
+            
+            uint ID = 0;
+            PhysicsActor p2 = null;
+
+            m_scene.actor_name_map.TryGetValue(g2, out p2);
+
+            if (p2 == null)
+                return;
+
+            switch (p2.PhysicsActorType)
+            {
+                case (int)ActorTypes.Prim:
+
+                    RayFilterFlags thisFlags;
+
+                    if (p2.IsPhysical)
+                        thisFlags = RayFilterFlags.physical;
+                    else
+                        thisFlags = RayFilterFlags.nonphysical;
+
+                    if (p2.Phantom)
+                        thisFlags |= RayFilterFlags.phantom;
+
+                    if (p2.IsVolumeDtc)
+                        thisFlags |= RayFilterFlags.volumedtc;
+
+                    if ((thisFlags & CurrentRayFilter) == 0)
+                        return;
+
+                    ID = ((OdePrim)p2).LocalID;
+                    break;
+
+                case (int)ActorTypes.Agent:
+
+                    if ((CurrentRayFilter & RayFilterFlags.agent) == 0)
+                        return;
+                    else
+                        ID = ((OdeCharacter)p2).LocalID;
+                    break;
+
+                case (int)ActorTypes.Ground:
+
+                    if ((CurrentRayFilter & RayFilterFlags.land) == 0)
+                        return;
+                    break;
+
+                case (int)ActorTypes.Water:
+
+                    if ((CurrentRayFilter & RayFilterFlags.water) == 0)
+                        return;
+                    break;
+
+                default:
+                    break;
+            }
+
+            d.ContactGeom curcontact = new d.ContactGeom();
+
+            // closestHit for now only works for meshs, so must do it for others
+            if ((CurrentRayFilter & RayFilterFlags.ClosestHit) == 0)
+            {
+                // Loop all contacts, build results.
+                for (int i = 0; i < count; i++)
+                {
+                    if (!GetCurContactGeom(i, ref curcontact))
+                        break;
+
+                    ContactResult collisionresult = new ContactResult();
+                    collisionresult.ConsumerID = ID;
+                    collisionresult.Pos.X = curcontact.pos.X;
+                    collisionresult.Pos.Y = curcontact.pos.Y;
+                    collisionresult.Pos.Z = curcontact.pos.Z;
+                    collisionresult.Depth = curcontact.depth;
+                    collisionresult.Normal.X = curcontact.normal.X;
+                    collisionresult.Normal.Y = curcontact.normal.Y;
+                    collisionresult.Normal.Z = curcontact.normal.Z;
+                    lock (m_contactResults)
+                    {
+                        m_contactResults.Add(collisionresult);
+                        if (m_contactResults.Count >= CurrentMaxCount)
+                            return;
+                    }
+                }
+            }
+            else
+            {
+                // keep only closest contact
+                ContactResult collisionresult = new ContactResult();
+                collisionresult.ConsumerID = ID;
+                collisionresult.Depth = float.MaxValue;
+
+                for (int i = 0; i < count; i++)
+                {
+                    if (!GetCurContactGeom(i, ref curcontact))
+                        break;
+
+                    if (curcontact.depth < collisionresult.Depth)
+                    {
+                        collisionresult.Pos.X = curcontact.pos.X;
+                        collisionresult.Pos.Y = curcontact.pos.Y;
+                        collisionresult.Pos.Z = curcontact.pos.Z;
+                        collisionresult.Depth = curcontact.depth;
+                        collisionresult.Normal.X = curcontact.normal.X;
+                        collisionresult.Normal.Y = curcontact.normal.Y;
+                        collisionresult.Normal.Z = curcontact.normal.Z;
+                    }
+                }
+
+                if (collisionresult.Depth != float.MaxValue)
+                {
+                    lock (m_contactResults)
+                        m_contactResults.Add(collisionresult);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Dereference the creator scene so that it can be garbage collected if needed.
+        /// </summary>
+        internal void Dispose()
+        {
+            m_scene = null;
+            if (ray != IntPtr.Zero)
+            {
+                d.GeomDestroy(ray);
+                ray = IntPtr.Zero;
+            }
+            if (Box != IntPtr.Zero)
+            {
+                d.GeomDestroy(Box);
+                Box = IntPtr.Zero;
+            }
+            if (Sphere != IntPtr.Zero)
+            {
+                d.GeomDestroy(Sphere);
+                Sphere = IntPtr.Zero;
+            }
+            if (Plane != IntPtr.Zero)
+            {
+                d.GeomDestroy(Plane);
+                Plane = IntPtr.Zero;
+            }           
+        }
+    }
+
+    public struct ODERayRequest
+    {
+        public PhysicsActor actor;
+        public Vector3 Origin;
+        public Vector3 Normal;
+        public int Count;
+        public float length;
+        public object callbackMethod;
+        public RayFilterFlags filter;
+        public Quaternion orientation;
+    }
+}
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODESitAvatar.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODESitAvatar.cs
new file mode 100644
index 0000000..e9023c3
--- /dev/null
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODESitAvatar.cs
@@ -0,0 +1,356 @@
+/*
+ * 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.
+ */
+// Ubit 2012
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Text;
+using OpenSim.Framework;
+using OpenSim.Region.Physics.Manager;
+using OdeAPI;
+using log4net;
+using OpenMetaverse;
+
+namespace OpenSim.Region.Physics.OdePlugin
+{
+    /// <summary>
+    /// </summary>
+    public class ODESitAvatar
+    {
+        private OdeScene m_scene;
+        private ODERayCastRequestManager m_raymanager;
+
+        public ODESitAvatar(OdeScene pScene, ODERayCastRequestManager raymanager)
+        {
+            m_scene = pScene;
+            m_raymanager = raymanager;
+        }
+
+        private static Vector3 SitAjust = new Vector3(0, 0, 0.4f);
+        private const RayFilterFlags RaySitFlags = RayFilterFlags.AllPrims | RayFilterFlags.ClosestHit;
+
+        private void RotAroundZ(float x, float y, ref Quaternion ori)
+        {
+            double ang = Math.Atan2(y, x);
+            ang *= 0.5d;
+            float s = (float)Math.Sin(ang);
+            float c = (float)Math.Cos(ang);
+
+            ori.X = 0;
+            ori.Y = 0;
+            ori.Z = s;
+            ori.W = c;
+        }
+
+
+        public void Sit(PhysicsActor actor, Vector3 avPos, Vector3 avCameraPosition, Vector3 offset, Vector3 avOffset, SitAvatarCallback PhysicsSitResponse)
+        {
+            if (!m_scene.haveActor(actor) || !(actor is OdePrim) || ((OdePrim)actor).prim_geom == IntPtr.Zero)
+            {
+                PhysicsSitResponse(-1, actor.LocalID, offset, Quaternion.Identity);
+                return;
+            }
+
+            IntPtr geom = ((OdePrim)actor).prim_geom;
+
+//            Vector3 geopos = d.GeomGetPositionOMV(geom);
+//            Quaternion geomOri = d.GeomGetQuaternionOMV(geom);
+
+            Vector3 geopos = actor.Position;
+            Quaternion geomOri = actor.Orientation;
+
+            Quaternion geomInvOri = Quaternion.Conjugate(geomOri);
+
+            Quaternion ori = Quaternion.Identity;
+
+            Vector3 rayDir = geopos + offset - avCameraPosition;
+
+            float raylen = rayDir.Length();
+            if (raylen < 0.001f)
+            {
+                PhysicsSitResponse(-1, actor.LocalID, offset, Quaternion.Identity);
+                return;
+            }
+            float t = 1 / raylen;
+            rayDir.X *= t;
+            rayDir.Y *= t;
+            rayDir.Z *= t;
+
+            raylen += 30f; // focal point may be far
+            List<ContactResult> rayResults;
+
+            rayResults = m_scene.RaycastActor(actor, avCameraPosition, rayDir, raylen, 1, RaySitFlags);
+            if (rayResults.Count == 0)
+            {
+/* if this fundamental ray failed, then just fail so user can try another spot and not be sitted far on a big prim
+                d.AABB aabb;
+                d.GeomGetAABB(geom, out aabb);
+                offset = new Vector3(avOffset.X, 0, aabb.MaxZ + avOffset.Z - geopos.Z);
+                ori = geomInvOri;
+                offset *= geomInvOri;
+                PhysicsSitResponse(1, actor.LocalID, offset, ori);
+*/
+                PhysicsSitResponse(0, actor.LocalID, offset, ori);
+                return;
+            }
+
+            int status = 1;
+
+            offset = rayResults[0].Pos - geopos;
+
+            d.GeomClassID geoclass = d.GeomGetClass(geom);
+
+            if (geoclass == d.GeomClassID.SphereClass)
+            {
+                float r = d.GeomSphereGetRadius(geom);
+
+                offset.Normalize();
+                offset *= r;
+
+                RotAroundZ(offset.X, offset.Y, ref ori);
+
+                if (r < 0.4f)
+                {
+                    offset = new Vector3(0, 0, r);
+                }
+                else
+                {
+                    if (offset.Z < 0.4f)
+                    {
+                        t = offset.Z;
+                        float rsq = r * r;
+
+                        t = 1.0f / (rsq - t * t);
+                        offset.X *= t;
+                        offset.Y *= t;
+                        offset.Z = 0.4f;
+                        t = rsq - 0.16f;
+                        offset.X *= t;
+                        offset.Y *= t;
+                    }
+                    else if (r > 0.8f && offset.Z > 0.8f * r)
+                    {
+                        status = 3;
+                        avOffset.X = -avOffset.X;
+                        avOffset.Z *= 1.6f;
+                    }
+                }
+
+                offset += avOffset * ori;
+
+                ori = geomInvOri * ori;
+                offset *= geomInvOri;
+
+                PhysicsSitResponse(status, actor.LocalID, offset, ori);
+                return;
+            }
+
+            Vector3 norm = rayResults[0].Normal;
+
+            if (norm.Z < -0.4f)
+            {
+                PhysicsSitResponse(0, actor.LocalID, offset, Quaternion.Identity);
+                return;
+            }
+
+
+            float SitNormX = -rayDir.X;
+            float SitNormY = -rayDir.Y;
+
+            Vector3 pivot = geopos + offset;
+
+            float edgeNormalX = norm.X;
+            float edgeNormalY = norm.Y;
+            float edgeDirX = -rayDir.X;
+            float edgeDirY = -rayDir.Y;
+            Vector3 edgePos = rayResults[0].Pos;
+            float edgeDist = float.MaxValue;
+
+            bool foundEdge = false;
+
+            if (norm.Z < 0.5f)
+            {
+                float rayDist = 4.0f;
+
+                for (int i = 0; i < 6; i++)
+                {
+                    pivot.X -= 0.01f * norm.X;
+                    pivot.Y -= 0.01f * norm.Y;
+                    pivot.Z -= 0.01f * norm.Z;
+
+                    rayDir.X = -norm.X * norm.Z;
+                    rayDir.Y = -norm.Y * norm.Z;
+                    rayDir.Z = 1.0f - norm.Z * norm.Z;
+                    rayDir.Normalize();
+
+                    rayResults = m_scene.RaycastActor(actor, pivot, rayDir, rayDist, 1, RayFilterFlags.AllPrims);
+                    if (rayResults.Count == 0)
+                        break;
+
+                    if (Math.Abs(rayResults[0].Normal.Z) < 0.7f)
+                    {
+                        rayDist -= rayResults[0].Depth;
+                        if (rayDist < 0f)
+                            break;
+
+                        pivot = rayResults[0].Pos;
+                        norm = rayResults[0].Normal;
+                        edgeNormalX = norm.X;
+                        edgeNormalY = norm.Y;
+                        edgeDirX = -rayDir.X;
+                        edgeDirY = -rayDir.Y;
+                    }
+                    else
+                    {
+                        foundEdge = true;
+                        edgePos = rayResults[0].Pos;
+                        break;
+                    }
+                }
+
+                if (!foundEdge)
+                {
+                    PhysicsSitResponse(0, actor.LocalID, offset, ori);
+                    return;
+                }
+                avOffset.X *= 0.5f;
+            }
+
+            else if (norm.Z > 0.866f)
+            {
+                float toCamBaseX = avCameraPosition.X - pivot.X;
+                float toCamBaseY = avCameraPosition.Y - pivot.Y;
+                float toCamX = toCamBaseX;
+                float toCamY = toCamBaseY;
+
+                for (int j = 0; j < 4; j++)
+                {
+                    float rayDist = 1.0f;
+                    float curEdgeDist = 0.0f;
+
+                    for (int i = 0; i < 3; i++)
+                    {
+                        pivot.Z -= 0.01f;
+                        rayDir.X = toCamX;
+                        rayDir.Y = toCamY;
+                        rayDir.Z = (-toCamX * norm.X - toCamY * norm.Y) / norm.Z;
+                        rayDir.Normalize();
+
+                        rayResults = m_scene.RaycastActor(actor, pivot, rayDir, rayDist, 1, RayFilterFlags.AllPrims);
+                        if (rayResults.Count == 0)
+                            break;
+
+                        curEdgeDist += rayResults[0].Depth;
+
+                        if (rayResults[0].Normal.Z > 0.5f)
+                        {
+                            rayDist -= rayResults[0].Depth;
+                            if (rayDist < 0f)
+                                break;
+
+                            pivot = rayResults[0].Pos;
+                            norm = rayResults[0].Normal;
+                        }
+                        else
+                        {
+                            foundEdge = true;
+                            if (curEdgeDist < edgeDist)
+                            {
+                                edgeDist = curEdgeDist;
+                                edgeNormalX = rayResults[0].Normal.X;
+                                edgeNormalY = rayResults[0].Normal.Y;
+                                edgeDirX = rayDir.X;
+                                edgeDirY = rayDir.Y;
+                                edgePos = rayResults[0].Pos;
+                            }
+                            break;
+                        }
+                    }
+                    if (foundEdge && edgeDist < 0.2f)
+                        break;
+
+                    pivot = geopos + offset;
+
+                    switch (j)
+                    {
+                        case 0:
+                            toCamX = -toCamBaseY;
+                            toCamY = toCamBaseX;
+                            break;
+                        case 1:
+                            toCamX = toCamBaseY;
+                            toCamY = -toCamBaseX;
+                            break;
+                        case 2:
+                            toCamX = -toCamBaseX;
+                            toCamY = -toCamBaseY;
+                            break;
+                        default:
+                            break;
+                    }
+                }
+
+                if (!foundEdge)
+                {
+                    avOffset.X = -avOffset.X;
+                    avOffset.Z *= 1.6f;
+
+                    RotAroundZ(SitNormX, SitNormY, ref ori);
+
+                    offset += avOffset * ori;
+
+                    ori = geomInvOri * ori;
+                    offset *= geomInvOri;
+
+                    PhysicsSitResponse(3, actor.LocalID, offset, ori);
+                    return;
+                }
+                avOffset.X *= 0.5f;
+            }
+
+            SitNormX = edgeNormalX;
+            SitNormY = edgeNormalY;
+            if (edgeDirX * SitNormX + edgeDirY * SitNormY < 0)
+            {
+                SitNormX = -SitNormX;
+                SitNormY = -SitNormY;
+            }
+
+            RotAroundZ(SitNormX, SitNormY, ref ori);
+
+            offset = edgePos + avOffset * ori;
+            offset -= geopos;
+
+            ori = geomInvOri * ori;
+            offset *= geomInvOri;
+
+            PhysicsSitResponse(1, actor.LocalID, offset, ori);
+            return;
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeApi.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeApi.cs
new file mode 100644
index 0000000..10d7d50
--- /dev/null
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeApi.cs
@@ -0,0 +1,2025 @@
+/*
+ * based on:
+ * Ode.NET - .NET bindings for ODE
+ * Jason Perkins (starkos@industriousone.com)
+  *  Licensed under the New BSD
+ *  Part of the OpenDynamicsEngine
+Open Dynamics Engine
+Copyright (c) 2001-2007, Russell L. Smith.
+All rights reserved.
+
+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 names of ODE's copyright owner 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 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. IN NO EVENT SHALL THE COPYRIGHT
+OWNER 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
+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.
+ * 
+ * changes by opensim team; 
+ * changes by Aurora team http://www.aurora-sim.org/
+  
+ * Revision/fixs by Ubit Umarov
+ */
+
+using System;
+using System.Runtime.InteropServices;
+using System.Security;
+using OMV = OpenMetaverse;
+namespace OdeAPI
+{
+//#if dDOUBLE
+// don't see much use in double precision with time steps of 20ms and 10 iterations used on opensim
+// at least we save same memory and memory access time, FPU performance on intel usually is similar
+//      using dReal = System.Double;
+//#else
+        using dReal = System.Single;
+//#endif
+
+        public static class d
+        {
+                public static dReal Infinity = dReal.MaxValue;
+        public static int NTotalBodies = 0;
+        public static int NTotalGeoms = 0;
+
+        public const uint CONTACTS_UNIMPORTANT = 0x80000000;
+
+                #region Flags and Enumerations
+
+        [Flags]
+        public enum AllocateODEDataFlags : uint
+        {
+            BasicData = 0,
+            CollisionData = 0x00000001,
+            All = ~0u
+        }
+
+        [Flags]
+        public enum IniteODEFlags : uint
+        {
+            dInitFlagManualThreadCleanup = 0x00000001
+        }
+
+                [Flags]
+                public enum ContactFlags : int
+                {
+                        Mu2 = 0x001,
+                        FDir1 = 0x002,
+                        Bounce = 0x004,
+                        SoftERP = 0x008,
+                        SoftCFM = 0x010,
+                        Motion1 = 0x020,
+                        Motion2 = 0x040,
+            MotionN = 0x080,
+                        Slip1 = 0x100,
+                        Slip2 = 0x200,
+                        Approx0 = 0x0000,
+                        Approx1_1 = 0x1000,
+                        Approx1_2 = 0x2000,
+                        Approx1 = 0x3000
+                }
+
+                public enum GeomClassID : int
+                {
+                        SphereClass,
+                        BoxClass,
+                        CapsuleClass,
+                        CylinderClass,
+                        PlaneClass,
+                        RayClass,
+                        ConvexClass,
+                        GeomTransformClass,
+                        TriMeshClass,
+            HeightfieldClass,
+                        FirstSpaceClass,
+                        SimpleSpaceClass = FirstSpaceClass,
+                        HashSpaceClass,
+                        QuadTreeSpaceClass,
+                        LastSpaceClass = QuadTreeSpaceClass,
+            UbitTerrainClass,
+                        FirstUserClass,
+                        LastUserClass = FirstUserClass + MaxUserClasses - 1,
+                        NumClasses,
+                        MaxUserClasses = 5
+                }
+
+                public enum JointType : int
+                {
+                        None,
+                        Ball,
+                        Hinge,
+                        Slider,
+                        Contact,
+                        Universal,
+                        Hinge2,
+                        Fixed,
+                        Null,
+                        AMotor,
+                        LMotor,
+                        Plane2D
+                }
+
+                public enum JointParam : int
+                {
+                        LoStop,
+                        HiStop,
+                        Vel,
+                        FMax,
+                        FudgeFactor,
+                        Bounce,
+                        CFM,
+                        StopERP,
+                        StopCFM,
+                        SuspensionERP,
+                        SuspensionCFM,
+                        LoStop2 = 256,
+                        HiStop2,
+                        Vel2,
+                        FMax2,
+                        FudgeFactor2,
+                        Bounce2,
+                        CFM2,
+                        StopERP2,
+                        StopCFM2,
+                        SuspensionERP2,
+                        SuspensionCFM2,
+                        LoStop3 = 512,
+                        HiStop3,
+                        Vel3,
+                        FMax3,
+                        FudgeFactor3,
+                        Bounce3,
+                        CFM3,
+                        StopERP3,
+                        StopCFM3,
+                        SuspensionERP3,
+                        SuspensionCFM3
+                }
+
+        public enum dSweepAndPruneAxis : int
+        {
+            XYZ = ((0)|(1<<2)|(2<<4)),
+            XZY = ((0)|(2<<2)|(1<<4)),
+            YXZ = ((1)|(0<<2)|(2<<4)),
+            YZX = ((1)|(2<<2)|(0<<4)),
+            ZXY = ((2)|(0<<2)|(1<<4)),
+            ZYX = ((2)|(1<<2)|(0<<4))
+        }
+
+                #endregion
+
+                #region Callbacks
+
+                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+                public delegate int AABBTestFn(IntPtr o1, IntPtr o2, ref AABB aabb);
+
+                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+                public delegate int ColliderFn(IntPtr o1, IntPtr o2, int flags, out ContactGeom contact, int skip);
+
+                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+                public delegate void GetAABBFn(IntPtr geom, out AABB aabb);
+
+                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+                public delegate ColliderFn GetColliderFnFn(int num);
+
+                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+                public delegate void GeomDtorFn(IntPtr o);
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate dReal HeightfieldGetHeight(IntPtr p_user_data, int x, int z);
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+        public delegate dReal UbitTerrainGetHeight(IntPtr p_user_data, int x, int z);
+
+                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+                public delegate void NearCallback(IntPtr data, IntPtr geom1, IntPtr geom2);
+
+                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+                public delegate int TriCallback(IntPtr trimesh, IntPtr refObject, int triangleIndex);
+
+                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+                public delegate int TriArrayCallback(IntPtr trimesh, IntPtr refObject, int[] triangleIndex, int triCount);
+
+                [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+                public delegate int TriRayCallback(IntPtr trimesh, IntPtr ray, int triangleIndex, dReal u, dReal v);
+
+                #endregion
+
+                #region Structs
+
+                [StructLayout(LayoutKind.Sequential)]
+                public struct AABB
+                {
+                        public dReal MinX, MaxX;
+                        public dReal MinY, MaxY;
+                        public dReal MinZ, MaxZ;
+                }
+
+
+                [StructLayout(LayoutKind.Sequential)]
+                public struct Contact
+                {
+                        public SurfaceParameters surface;
+                        public ContactGeom geom;
+                        public Vector3 fdir1;
+            public static readonly int unmanagedSizeOf = Marshal.SizeOf(typeof(Contact));
+                }
+
+
+                [StructLayout(LayoutKind.Sequential)]
+                public struct ContactGeom
+                {
+
+                        public Vector3 pos;
+                        public Vector3 normal;
+                        public dReal depth;
+                        public IntPtr g1;
+                        public IntPtr g2;
+                        public int side1;
+                        public int side2;
+            public static readonly int unmanagedSizeOf = Marshal.SizeOf(typeof(ContactGeom));
+        }
+
+                [StructLayout(LayoutKind.Sequential)]
+                public struct GeomClass
+                {
+                        public int bytes;
+                        public GetColliderFnFn collider;
+                        public GetAABBFn aabb;
+                        public AABBTestFn aabb_test;
+                        public GeomDtorFn dtor;
+                }
+
+
+                [StructLayout(LayoutKind.Sequential)]
+                public struct JointFeedback 
+                {
+                        public Vector3 f1;
+                        public Vector3 t1;
+                        public Vector3 f2;
+                        public Vector3 t2;
+                }
+
+
+                [StructLayout(LayoutKind.Sequential)]
+                public struct Mass
+                {
+                        public dReal mass;
+                        public Vector4 c;
+                        public Matrix3 I;
+                }
+
+
+                [StructLayout(LayoutKind.Sequential)]
+                public struct Matrix3
+                {
+                        public Matrix3(dReal m00, dReal m10, dReal m20, dReal m01, dReal m11, dReal m21, dReal m02, dReal m12, dReal m22)
+                        {
+                                M00 = m00;  M10 = m10;  M20 = m20;  _m30 = 0.0f;
+                                M01 = m01;  M11 = m11;  M21 = m21;  _m31 = 0.0f;
+                                M02 = m02;  M12 = m12;  M22 = m22;  _m32 = 0.0f;
+                        }
+                        public dReal M00, M10, M20;
+                        private dReal _m30;
+                        public dReal M01, M11, M21;
+                        private dReal _m31;
+                        public dReal M02, M12, M22;
+                        private dReal _m32;
+                }
+
+                [StructLayout(LayoutKind.Sequential)]
+                public struct Matrix4
+                {
+                        public Matrix4(dReal m00, dReal m10, dReal m20, dReal m30,
+                                dReal m01, dReal m11, dReal m21, dReal m31,
+                                dReal m02, dReal m12, dReal m22, dReal m32,
+                                dReal m03, dReal m13, dReal m23, dReal m33)
+                        {
+                                M00 = m00; M10 = m10; M20 = m20; M30 = m30;
+                                M01 = m01; M11 = m11; M21 = m21; M31 = m31;
+                                M02 = m02; M12 = m12; M22 = m22; M32 = m32;
+                                M03 = m03; M13 = m13; M23 = m23; M33 = m33;
+                        }
+                        public dReal M00, M10, M20, M30;
+                        public dReal M01, M11, M21, M31;
+                        public dReal M02, M12, M22, M32;
+                        public dReal M03, M13, M23, M33;
+                }
+
+                [StructLayout(LayoutKind.Sequential)]
+                public struct Quaternion
+                {
+                        public dReal W, X, Y, Z;
+                }
+
+
+                [StructLayout(LayoutKind.Sequential)]
+                public struct SurfaceParameters
+                {
+                        public ContactFlags mode;
+                        public dReal mu;
+                        public dReal mu2;
+                        public dReal bounce;
+                        public dReal bounce_vel;
+                        public dReal soft_erp;
+                        public dReal soft_cfm;
+                        public dReal motion1;
+                        public dReal motion2;
+            public dReal motionN;
+                        public dReal slip1;
+                        public dReal slip2;
+                }
+
+
+                [StructLayout(LayoutKind.Sequential)]
+                public struct Vector3
+                {
+                        public Vector3(dReal x, dReal y, dReal z)
+                        {
+                                X = x;  Y = y;  Z = z;  _w = 0.0f;
+                        }
+                        public dReal X, Y, Z;
+                        private dReal _w;
+                }
+
+
+                [StructLayout(LayoutKind.Sequential)]
+                public struct Vector4
+                {
+                        public Vector4(dReal x, dReal y, dReal z, dReal w)
+                        {
+                                X = x;  Y = y;  Z = z;  W = w;
+                        }
+                        public dReal X, Y, Z, W;
+                }
+
+                #endregion
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dAllocateODEDataForThread"), SuppressUnmanagedCodeSecurity]
+        public static extern int AllocateODEDataForThread(uint ODEInitFlags);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dAreConnected"), SuppressUnmanagedCodeSecurity]
+                public static extern bool AreConnected(IntPtr b1, IntPtr b2);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dAreConnectedExcluding"), SuppressUnmanagedCodeSecurity]
+                public static extern bool AreConnectedExcluding(IntPtr b1, IntPtr b2, JointType joint_type);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddForce"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodyAddForce(IntPtr body, dReal fx, dReal fy, dReal fz);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddForceAtPos"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodyAddForceAtPos(IntPtr body, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddForceAtRelPos"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodyAddForceAtRelPos(IntPtr body, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddRelForce"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodyAddRelForce(IntPtr body, dReal fx, dReal fy, dReal fz);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddRelForceAtPos"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodyAddRelForceAtPos(IntPtr body, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddRelForceAtRelPos"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodyAddRelForceAtRelPos(IntPtr body, dReal fx, dReal fy, dReal fz, dReal px, dReal py, dReal pz);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddRelTorque"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodyAddRelTorque(IntPtr body, dReal fx, dReal fy, dReal fz);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyAddTorque"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodyAddTorque(IntPtr body, dReal fx, dReal fy, dReal fz);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyPosition"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodyCopyPosition(IntPtr body, out Vector3 pos);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyPosition"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodyCopyPosition(IntPtr body, out dReal X);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyQuaternion"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodyCopyQuaternion(IntPtr body, out Quaternion quat);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyQuaternion"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodyCopyQuaternion(IntPtr body, out dReal X);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyRotation"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodyCopyRotation(IntPtr body, out Matrix3 R);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCopyRotation"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodyCopyRotation(IntPtr body, out dReal M00);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyCreate"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr BodyiCreate(IntPtr world);
+        public static IntPtr BodyCreate(IntPtr world)
+        {
+            NTotalBodies++;
+            return BodyiCreate(world);
+        }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyDestroy"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyiDestroy(IntPtr body);
+        public static void BodyDestroy(IntPtr body)
+        {
+            NTotalBodies--;
+            BodyiDestroy(body);
+        }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyDisable"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodyDisable(IntPtr body);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyEnable"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodyEnable(IntPtr body);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableAngularThreshold"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal BodyGetAutoDisableAngularThreshold(IntPtr body);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableFlag"), SuppressUnmanagedCodeSecurity]
+                public static extern bool BodyGetAutoDisableFlag(IntPtr body);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableDefaults"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodyGetAutoDisableDefaults(IntPtr body);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableLinearThreshold"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal BodyGetAutoDisableLinearThreshold(IntPtr body);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableSteps"), SuppressUnmanagedCodeSecurity]
+                public static extern int BodyGetAutoDisableSteps(IntPtr body);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAutoDisableTime"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal BodyGetAutoDisableTime(IntPtr body);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAngularVel"), SuppressUnmanagedCodeSecurity]
+                public extern unsafe static Vector3* BodyGetAngularVelUnsafe(IntPtr body);
+                public static Vector3 BodyGetAngularVel(IntPtr body)
+                {
+                        unsafe { return *(BodyGetAngularVelUnsafe(body)); }
+                }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetData"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr BodyGetData(IntPtr body);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetFiniteRotationMode"), SuppressUnmanagedCodeSecurity]
+                public static extern int BodyGetFiniteRotationMode(IntPtr body);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetFiniteRotationAxis"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodyGetFiniteRotationAxis(IntPtr body, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetForce"), SuppressUnmanagedCodeSecurity]
+                public extern unsafe static Vector3* BodyGetForceUnsafe(IntPtr body);
+                public static Vector3 BodyGetForce(IntPtr body)
+                {
+                        unsafe { return *(BodyGetForceUnsafe(body)); }
+                }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetGravityMode"), SuppressUnmanagedCodeSecurity]
+                public static extern bool BodyGetGravityMode(IntPtr body);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetGyroscopicMode"), SuppressUnmanagedCodeSecurity]
+        public static extern int BodyGetGyroscopicMode(IntPtr body);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetJoint"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr BodyGetJoint(IntPtr body, int index);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetLinearVel"), SuppressUnmanagedCodeSecurity]
+                public extern unsafe static Vector3* BodyGetLinearVelUnsafe(IntPtr body);
+                public static Vector3 BodyGetLinearVel(IntPtr body)
+                {
+                        unsafe { return *(BodyGetLinearVelUnsafe(body)); }
+                }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetMass"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodyGetMass(IntPtr body, out Mass mass);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetNumJoints"), SuppressUnmanagedCodeSecurity]
+                public static extern int BodyGetNumJoints(IntPtr body);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetPointVel"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodyGetPointVel(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetPosition"), SuppressUnmanagedCodeSecurity]
+                public extern unsafe static Vector3* BodyGetPositionUnsafe(IntPtr body);
+                public static Vector3 BodyGetPosition(IntPtr body)
+                {
+                        unsafe { return *(BodyGetPositionUnsafe(body)); }
+                }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetPosRelPoint"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodyGetPosRelPoint(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetQuaternion"), SuppressUnmanagedCodeSecurity]
+                public extern unsafe static Quaternion* BodyGetQuaternionUnsafe(IntPtr body);
+                public static Quaternion BodyGetQuaternion(IntPtr body)
+                {
+                        unsafe { return *(BodyGetQuaternionUnsafe(body)); }
+                }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetRelPointPos"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodyGetRelPointPos(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetRelPointVel"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodyGetRelPointVel(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetRotation"), SuppressUnmanagedCodeSecurity]
+                public extern unsafe static Matrix3* BodyGetRotationUnsafe(IntPtr body);
+                public static Matrix3 BodyGetRotation(IntPtr body)
+                {
+                        unsafe { return *(BodyGetRotationUnsafe(body)); }
+                }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetTorque"), SuppressUnmanagedCodeSecurity]
+                public extern unsafe static Vector3* BodyGetTorqueUnsafe(IntPtr body);
+                public static Vector3 BodyGetTorque(IntPtr body)
+                {
+                        unsafe { return *(BodyGetTorqueUnsafe(body)); }
+                }
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetWorld"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr BodyGetWorld(IntPtr body);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetFirstGeom"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr BodyGetFirstGeom(IntPtr body);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetNextGeom"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr dBodyGetNextGeom(IntPtr Geom);
+
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyIsEnabled"), SuppressUnmanagedCodeSecurity]
+                public static extern bool BodyIsEnabled(IntPtr body);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAngularVel"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodySetAngularVel(IntPtr body, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableAngularThreshold"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodySetAutoDisableAngularThreshold(IntPtr body, dReal angular_threshold);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableDefaults"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodySetAutoDisableDefaults(IntPtr body);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableFlag"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodySetAutoDisableFlag(IntPtr body, bool do_auto_disable);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableLinearThreshold"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodySetAutoDisableLinearThreshold(IntPtr body, dReal linear_threshold);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableSteps"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodySetAutoDisableSteps(IntPtr body, int steps);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAutoDisableTime"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodySetAutoDisableTime(IntPtr body, dReal time);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetData"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodySetData(IntPtr body, IntPtr data);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetFiniteRotationMode"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodySetFiniteRotationMode(IntPtr body, int mode);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetFiniteRotationAxis"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodySetFiniteRotationAxis(IntPtr body, dReal x, dReal y, dReal z);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetLinearDamping"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetLinearDamping(IntPtr body, dReal scale);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAngularDamping"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetAngularDamping(IntPtr body, dReal scale);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetLinearDamping"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal BodyGetLinearDamping(IntPtr body);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAngularDamping"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal BodyGetAngularDamping(IntPtr body);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAngularDamping"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetDamping(IntPtr body, dReal linear_scale, dReal angular_scale);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetAngularDampingThreshold"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetAngularDampingThreshold(IntPtr body, dReal threshold);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetLinearDampingThreshold"), SuppressUnmanagedCodeSecurity]
+        public static extern void BodySetLinearDampingThreshold(IntPtr body, dReal threshold);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetLinearDampingThreshold"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal BodyGetLinearDampingThreshold(IntPtr body);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyGetAngularDampingThreshold"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal BodyGetAngularDampingThreshold(IntPtr body);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetForce"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodySetForce(IntPtr body, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetGravityMode"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodySetGravityMode(IntPtr body, bool mode);
+
+        /// <summary>
+        /// Sets the Gyroscopic term status on the body specified.
+        /// </summary>
+        /// <param name="body">Pointer to body</param>
+        /// <param name="enabled">NonZero enabled, Zero disabled</param>
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetGyroscopicMode"), SuppressUnmanagedCodeSecurity]
+        public static extern void dBodySetGyroscopicMode(IntPtr body, int enabled);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetLinearVel"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodySetLinearVel(IntPtr body, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetMass"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodySetMass(IntPtr body, ref Mass mass);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetPosition"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodySetPosition(IntPtr body, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetQuaternion"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodySetQuaternion(IntPtr body, ref Quaternion q);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetQuaternion"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodySetQuaternion(IntPtr body, ref dReal w);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetRotation"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodySetRotation(IntPtr body, ref Matrix3 R);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetRotation"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodySetRotation(IntPtr body, ref dReal M00);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodySetTorque"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodySetTorque(IntPtr body, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyVectorFromWorld"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodyVectorFromWorld(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBodyVectorToWorld"), SuppressUnmanagedCodeSecurity]
+                public static extern void BodyVectorToWorld(IntPtr body, dReal px, dReal py, dReal pz, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBoxBox"), SuppressUnmanagedCodeSecurity]
+                public static extern void BoxBox(ref Vector3 p1, ref Matrix3 R1,
+                        ref Vector3 side1, ref Vector3 p2,
+                        ref Matrix3 R2, ref Vector3 side2,
+                        ref Vector3 normal, out dReal depth, out int return_code,
+                        int maxc, out ContactGeom contact, int skip);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dBoxTouchesBox"), SuppressUnmanagedCodeSecurity]
+                public static extern void BoxTouchesBox(ref Vector3 _p1, ref Matrix3 R1,
+                        ref Vector3 side1, ref Vector3 _p2,
+                        ref Matrix3 R2, ref Vector3 side2);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCleanupODEAllDataForThread"), SuppressUnmanagedCodeSecurity]
+                public static extern void CleanupODEAllDataForThread();
+        
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dClosestLineSegmentPoints"), SuppressUnmanagedCodeSecurity]
+                public static extern void ClosestLineSegmentPoints(ref Vector3 a1, ref Vector3 a2, 
+                        ref Vector3 b1, ref Vector3 b2, 
+                        ref Vector3 cp1, ref Vector3 cp2);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCloseODE"), SuppressUnmanagedCodeSecurity]
+                public static extern void CloseODE();
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCollide"), SuppressUnmanagedCodeSecurity]
+        public static extern int Collide(IntPtr o1, IntPtr o2, int flags, [In, Out] ContactGeom[] contact, int skip);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCollide"), SuppressUnmanagedCodeSecurity]
+        public static extern int CollidePtr(IntPtr o1, IntPtr o2, int flags, IntPtr contactgeomarray, int skip);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dConnectingJoint"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr ConnectingJoint(IntPtr j1, IntPtr j2);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateBox"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr CreateiBox(IntPtr space, dReal lx, dReal ly, dReal lz);
+                public static IntPtr CreateBox(IntPtr space, dReal lx, dReal ly, dReal lz)
+        {
+            NTotalGeoms++;
+            return CreateiBox(space, lx, ly, lz);
+        }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateCapsule"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr CreateiCapsule(IntPtr space, dReal radius, dReal length);
+        public static IntPtr CreateCapsule(IntPtr space, dReal radius, dReal length)
+        {
+            NTotalGeoms++;
+            return CreateiCapsule(space, radius, length);
+        }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateConvex"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr CreateiConvex(IntPtr space, dReal[] planes, int planeCount, dReal[] points, int pointCount, int[] polygons);
+        public static IntPtr CreateConvex(IntPtr space, dReal[] planes, int planeCount, dReal[] points, int pointCount, int[] polygons)
+        {
+            NTotalGeoms++;
+            return CreateiConvex(space, planes, planeCount, points, pointCount, polygons);
+        }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateCylinder"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr CreateiCylinder(IntPtr space, dReal radius, dReal length);
+        public static IntPtr CreateCylinder(IntPtr space, dReal radius, dReal length)
+        {
+            NTotalGeoms++;
+            return CreateiCylinder(space, radius, length);
+        }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateHeightfield"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr CreateiHeightfield(IntPtr space, IntPtr data, int bPlaceable);
+        public static IntPtr CreateHeightfield(IntPtr space, IntPtr data, int bPlaceable)
+        {
+            NTotalGeoms++;
+            return CreateiHeightfield(space, data, bPlaceable);
+        }
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateUbitTerrain"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr CreateiUbitTerrain(IntPtr space, IntPtr data, int bPlaceable);
+        public static IntPtr CreateUbitTerrain(IntPtr space, IntPtr data, int bPlaceable)
+        {
+            NTotalGeoms++;
+            return CreateiUbitTerrain(space, data, bPlaceable);
+        }
+
+
+
+        
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateGeom"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr CreateiGeom(int classnum);
+        public static IntPtr CreateGeom(int classnum)
+        {
+            NTotalGeoms++;
+            return CreateiGeom(classnum);
+        }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateGeomClass"), SuppressUnmanagedCodeSecurity]
+                public static extern int CreateGeomClass(ref GeomClass classptr);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateGeomTransform"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr CreateGeomTransform(IntPtr space);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreatePlane"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr CreateiPlane(IntPtr space, dReal a, dReal b, dReal c, dReal d);
+        public static IntPtr CreatePlane(IntPtr space, dReal a, dReal b, dReal c, dReal d)
+        {
+            NTotalGeoms++;
+            return CreateiPlane(space, a, b, c, d);
+        }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateRay"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr CreateiRay(IntPtr space, dReal length);
+        public static IntPtr CreateRay(IntPtr space, dReal length)
+        {
+            NTotalGeoms++;
+            return CreateiRay(space, length);
+        }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateSphere"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr CreateiSphere(IntPtr space, dReal radius);
+        public static IntPtr CreateSphere(IntPtr space, dReal radius)
+        {
+            NTotalGeoms++;
+            return CreateiSphere(space, radius);
+        }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dCreateTriMesh"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr CreateiTriMesh(IntPtr space, IntPtr data, 
+                        TriCallback callback, TriArrayCallback arrayCallback, TriRayCallback rayCallback);
+        public static IntPtr CreateTriMesh(IntPtr space, IntPtr data,
+            TriCallback callback, TriArrayCallback arrayCallback, TriRayCallback rayCallback)
+        {
+            NTotalGeoms++;
+            return CreateiTriMesh(space, data, callback, arrayCallback, rayCallback);
+        }
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dDot"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal Dot(ref dReal X0, ref dReal X1, int n);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dDQfromW"), SuppressUnmanagedCodeSecurity]
+                public static extern void DQfromW(dReal[] dq, ref Vector3 w, ref Quaternion q);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dFactorCholesky"), SuppressUnmanagedCodeSecurity]
+                public static extern int FactorCholesky(ref dReal A00, int n);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dFactorLDLT"), SuppressUnmanagedCodeSecurity]
+                public static extern void FactorLDLT(ref dReal A, out dReal d, int n, int nskip);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomBoxGetLengths"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomBoxGetLengths(IntPtr geom, out Vector3 len);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomBoxGetLengths"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomBoxGetLengths(IntPtr geom, out dReal x);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomBoxPointDepth"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal GeomBoxPointDepth(IntPtr geom, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomBoxSetLengths"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomBoxSetLengths(IntPtr geom, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCapsuleGetParams"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomCapsuleGetParams(IntPtr geom, out dReal radius, out dReal length);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCapsulePointDepth"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal GeomCapsulePointDepth(IntPtr geom, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCapsuleSetParams"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomCapsuleSetParams(IntPtr geom, dReal radius, dReal length);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomClearOffset"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomClearOffset(IntPtr geom);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyOffsetPosition"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr GeomCopyOffsetPosition(IntPtr geom, ref Vector3 pos);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyOffsetPosition"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr GeomCopyOffsetPosition(IntPtr geom, ref dReal X);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetOffsetQuaternion"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomCopyOffsetQuaternion(IntPtr geom, ref Quaternion Q);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetOffsetQuaternion"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomCopyOffsetQuaternion(IntPtr geom, ref dReal X);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyOffsetRotation"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr GeomCopyOffsetRotation(IntPtr geom, ref Matrix3 R);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyOffsetRotation"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr GeomCopyOffsetRotation(IntPtr geom, ref dReal M00);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyPosition"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomCopyPosition(IntPtr geom, out Vector3 pos);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyPosition"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomCopyPosition(IntPtr geom, out dReal X);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyRotation"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomCopyRotation(IntPtr geom, out Matrix3 R);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCopyRotation"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomCopyRotation(IntPtr geom, out dReal M00);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCylinderGetParams"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomCylinderGetParams(IntPtr geom, out dReal radius, out dReal length);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomCylinderSetParams"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomCylinderSetParams(IntPtr geom, dReal radius, dReal length);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomDestroy"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomiDestroy(IntPtr geom);
+        public static void GeomDestroy(IntPtr geom)
+        {
+            NTotalGeoms--;
+            GeomiDestroy(geom);
+        }
+
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomDisable"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomDisable(IntPtr geom);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomEnable"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomEnable(IntPtr geom);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetAABB"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomGetAABB(IntPtr geom, out AABB aabb);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetAABB"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomGetAABB(IntPtr geom, out dReal minX);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetBody"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr GeomGetBody(IntPtr geom);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetCategoryBits"), SuppressUnmanagedCodeSecurity]
+                public static extern uint GeomGetCategoryBits(IntPtr geom);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetClassData"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr GeomGetClassData(IntPtr geom);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetCollideBits"), SuppressUnmanagedCodeSecurity]
+                public static extern uint GeomGetCollideBits(IntPtr geom);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetClass"), SuppressUnmanagedCodeSecurity]
+                public static extern GeomClassID GeomGetClass(IntPtr geom);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetData"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomGetData(IntPtr geom);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetOffsetPosition"), SuppressUnmanagedCodeSecurity]
+                public extern unsafe static Vector3* GeomGetOffsetPositionUnsafe(IntPtr geom);
+                public static Vector3 GeomGetOffsetPosition(IntPtr geom)
+                {
+                        unsafe { return *(GeomGetOffsetPositionUnsafe(geom)); }
+                }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetOffsetRotation"), SuppressUnmanagedCodeSecurity]
+                public extern unsafe static Matrix3* GeomGetOffsetRotationUnsafe(IntPtr geom);
+                public static Matrix3 GeomGetOffsetRotation(IntPtr geom)
+                {
+                        unsafe { return *(GeomGetOffsetRotationUnsafe(geom)); }
+                }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetPosition"), SuppressUnmanagedCodeSecurity]
+                public extern unsafe static Vector3* GeomGetPositionUnsafe(IntPtr geom);
+                public static Vector3 GeomGetPosition(IntPtr geom)
+                {
+                        unsafe { return *(GeomGetPositionUnsafe(geom)); }
+                }
+                public static OMV.Vector3 GeomGetPositionOMV(IntPtr geom)
+                {
+            Vector3 vtmp = GeomGetPosition(geom);
+            return new OMV.Vector3(vtmp.X, vtmp.Y, vtmp.Z);
+                }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetQuaternion"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomCopyQuaternion(IntPtr geom, out Quaternion q);
+        public static OMV.Quaternion GeomGetQuaternionOMV(IntPtr geom)
+        {
+            Quaternion qtmp;
+            GeomCopyQuaternion(geom, out qtmp);
+            return new OMV.Quaternion(qtmp.X, qtmp.Y, qtmp.Z, qtmp.W);
+        }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetQuaternion"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomCopyQuaternion(IntPtr geom, out dReal X);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetRotation"), SuppressUnmanagedCodeSecurity]
+                public extern unsafe static Matrix3* GeomGetRotationUnsafe(IntPtr geom);
+                public static Matrix3 GeomGetRotation(IntPtr geom)
+                {
+                        unsafe { return *(GeomGetRotationUnsafe(geom)); }
+                }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetSpace"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr GeomGetSpace(IntPtr geom);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildByte"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomHeightfieldDataBuildByte(IntPtr d, byte[] pHeightData, int bCopyHeightData,
+                                dReal width, dReal depth, int widthSamples, int depthSamples,
+                                dReal scale, dReal offset, dReal thickness, int bWrap);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildByte"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomHeightfieldDataBuildByte(IntPtr d, IntPtr pHeightData, int bCopyHeightData,
+                                dReal width, dReal depth, int widthSamples, int depthSamples,
+                                dReal scale, dReal offset, dReal thickness,     int bWrap);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildCallback"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomHeightfieldDataBuildCallback(IntPtr d, IntPtr pUserData, HeightfieldGetHeight pCallback,
+                                dReal width, dReal depth, int widthSamples, int depthSamples,
+                                dReal scale, dReal offset, dReal thickness, int bWrap);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildShort"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomHeightfieldDataBuildShort(IntPtr d, ushort[] pHeightData, int bCopyHeightData,
+                                dReal width, dReal depth, int widthSamples, int depthSamples,
+                                dReal scale, dReal offset, dReal thickness, int bWrap);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildShort"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomHeightfieldDataBuildShort(IntPtr d, short[] pHeightData, int bCopyHeightData,
+                                dReal width, dReal depth, int widthSamples, int depthSamples,
+                                dReal scale, dReal offset, dReal thickness, int bWrap);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildShort"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomHeightfieldDataBuildShort(IntPtr d, IntPtr pHeightData, int bCopyHeightData,
+                                dReal width, dReal depth, int widthSamples, int depthSamples,
+                                dReal scale, dReal offset, dReal thickness, int bWrap);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildSingle"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomHeightfieldDataBuildSingle(IntPtr d, float[] pHeightData, int bCopyHeightData,
+                                dReal width, dReal depth, int widthSamples, int depthSamples,
+                                dReal scale, dReal offset, dReal thickness, int bWrap);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildSingle"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomHeightfieldDataBuildSingle(IntPtr d, IntPtr pHeightData, int bCopyHeightData,
+                                dReal width, dReal depth, int widthSamples, int depthSamples,
+                                dReal scale, dReal offset, dReal thickness, int bWrap);
+
+
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildDouble"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomHeightfieldDataBuildDouble(IntPtr d, double[] pHeightData, int bCopyHeightData,
+                                dReal width, dReal depth, int widthSamples, int depthSamples,
+                                dReal scale, dReal offset, dReal thickness, int bWrap);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataBuildDouble"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomHeightfieldDataBuildDouble(IntPtr d, IntPtr pHeightData, int bCopyHeightData,
+                                dReal width, dReal depth, int widthSamples, int depthSamples,
+                                dReal scale, dReal offset, dReal thickness, int bWrap);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataCreate"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr GeomHeightfieldDataCreate();
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataDestroy"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomHeightfieldDataDestroy(IntPtr d);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldDataSetBounds"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomHeightfieldDataSetBounds(IntPtr d, dReal minHeight, dReal maxHeight);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldGetHeightfieldData"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr GeomHeightfieldGetHeightfieldData(IntPtr g);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomHeightfieldSetHeightfieldData"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomHeightfieldSetHeightfieldData(IntPtr g, IntPtr d);
+
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomUbitTerrainDataBuild"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomUbitTerrainDataBuild(IntPtr d, float[] pHeightData, int bCopyHeightData,
+                dReal sampleSize, int widthSamples, int depthSamples,
+                dReal offset, dReal thickness, int bWrap);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomUbitTerrainDataBuild"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomUbitTerrainDataBuild(IntPtr d, IntPtr pHeightData, int bCopyHeightData,
+                dReal sampleSize, int widthSamples, int depthSamples,
+                dReal thickness, int bWrap);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomUbitTerrainDataCreate"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomUbitTerrainDataCreate();
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomUbitTerrainDataDestroy"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomUbitTerrainDataDestroy(IntPtr d);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomUbitTerrainDataSetBounds"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomUbitTerrainDataSetBounds(IntPtr d, dReal minHeight, dReal maxHeight);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomUbitTerrainGetHeightfieldData"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr GeomUbitTerrainGetHeightfieldData(IntPtr g);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomUbitTerrainSetHeightfieldData"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomUbitTerrainSetHeightfieldData(IntPtr g, IntPtr d);
+
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomIsEnabled"), SuppressUnmanagedCodeSecurity]
+                public static extern bool GeomIsEnabled(IntPtr geom);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomIsOffset"), SuppressUnmanagedCodeSecurity]
+                public static extern bool GeomIsOffset(IntPtr geom);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomIsSpace"), SuppressUnmanagedCodeSecurity]
+                public static extern bool GeomIsSpace(IntPtr geom);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomPlaneGetParams"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomPlaneGetParams(IntPtr geom, ref Vector4 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomPlaneGetParams"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomPlaneGetParams(IntPtr geom, ref dReal A);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomPlanePointDepth"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal GeomPlanePointDepth(IntPtr geom, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomPlaneSetParams"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomPlaneSetParams(IntPtr plane, dReal a, dReal b, dReal c, dReal d);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGet"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomRayGet(IntPtr ray, ref Vector3 start, ref Vector3 dir);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGet"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomRayGet(IntPtr ray, ref dReal startX, ref dReal dirX);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGetClosestHit"), SuppressUnmanagedCodeSecurity]
+                public static extern int GeomRayGetClosestHit(IntPtr ray);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGetLength"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal GeomRayGetLength(IntPtr ray);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRayGetParams"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal GeomRayGetParams(IntPtr g, out int firstContact, out int backfaceCull);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRaySet"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomRaySet(IntPtr ray, dReal px, dReal py, dReal pz, dReal dx, dReal dy, dReal dz);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRaySetClosestHit"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomRaySetClosestHit(IntPtr ray, int closestHit);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRaySetLength"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomRaySetLength(IntPtr ray, dReal length);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomRaySetParams"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomRaySetParams(IntPtr ray, int firstContact, int backfaceCull);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetBody"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomSetBody(IntPtr geom, IntPtr body);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetCategoryBits"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomSetCategoryBits(IntPtr geom, uint bits);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetCollideBits"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomSetCollideBits(IntPtr geom, uint bits);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetConvex"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr GeomSetConvex(IntPtr geom, dReal[] planes, int planeCount, dReal[] points, int pointCount, int[] polygons);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetData"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomSetData(IntPtr geom, IntPtr data);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetPosition"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomSetOffsetPosition(IntPtr geom, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetQuaternion"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomSetOffsetQuaternion(IntPtr geom, ref Quaternion Q);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetQuaternion"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomSetOffsetQuaternion(IntPtr geom, ref dReal X);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetRotation"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomSetOffsetRotation(IntPtr geom, ref Matrix3 R);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetRotation"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomSetOffsetRotation(IntPtr geom, ref dReal M00);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldPosition"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomSetOffsetWorldPosition(IntPtr geom, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldQuaternion"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomSetOffsetWorldQuaternion(IntPtr geom, ref Quaternion Q);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldQuaternion"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomSetOffsetWorldQuaternion(IntPtr geom, ref dReal X);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldRotation"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomSetOffsetWorldRotation(IntPtr geom, ref Matrix3 R);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetWorldRotation"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomSetOffsetWorldRotation(IntPtr geom, ref dReal M00);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetPosition"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomSetPosition(IntPtr geom, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetQuaternion"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomSetQuaternion(IntPtr geom, ref Quaternion quat);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetQuaternion"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomSetQuaternion(IntPtr geom, ref dReal w);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetRotation"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomSetRotation(IntPtr geom, ref Matrix3 R);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetRotation"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomSetRotation(IntPtr geom, ref dReal M00);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSphereGetRadius"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal GeomSphereGetRadius(IntPtr geom);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSpherePointDepth"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal GeomSpherePointDepth(IntPtr geom, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSphereSetRadius"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomSphereSetRadius(IntPtr geom, dReal radius);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformGetCleanup"), SuppressUnmanagedCodeSecurity]
+                public static extern int GeomTransformGetCleanup(IntPtr geom);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformGetGeom"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr GeomTransformGetGeom(IntPtr geom);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformGetInfo"), SuppressUnmanagedCodeSecurity]
+                public static extern int GeomTransformGetInfo(IntPtr geom);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformSetCleanup"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTransformSetCleanup(IntPtr geom, int mode);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformSetGeom"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTransformSetGeom(IntPtr geom, IntPtr obj);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTransformSetInfo"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTransformSetInfo(IntPtr geom, int info);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildDouble"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTriMeshDataBuildDouble(IntPtr d,
+                        double[] vertices, int vertexStride, int vertexCount,
+                        int[] indices, int indexCount, int triStride);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildDouble"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTriMeshDataBuildDouble(IntPtr d,
+                        IntPtr vertices, int vertexStride, int vertexCount,
+                        IntPtr indices, int indexCount, int triStride);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildDouble1"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTriMeshDataBuildDouble1(IntPtr d,
+                        double[] vertices, int vertexStride, int vertexCount,
+                        int[] indices, int indexCount, int triStride,
+                        double[] normals);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildDouble1"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTriMeshDataBuildDouble(IntPtr d,
+                        IntPtr vertices, int vertexStride, int vertexCount,
+                        IntPtr indices, int indexCount, int triStride,
+                        IntPtr normals);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSimple"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTriMeshDataBuildSingle(IntPtr d,
+                        dReal[] vertices, int vertexStride, int vertexCount,
+                        int[] indices, int indexCount, int triStride);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSimple"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTriMeshDataBuildSingle(IntPtr d,
+                        IntPtr vertices, int vertexStride, int vertexCount,
+                        IntPtr indices, int indexCount, int triStride);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSimple1"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTriMeshDataBuildSingle1(IntPtr d,
+                        dReal[] vertices, int vertexStride, int vertexCount,
+                        int[] indices, int indexCount, int triStride,
+                        dReal[] normals);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSimple1"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTriMeshDataBuildSingle1(IntPtr d,
+                        IntPtr vertices, int vertexStride, int vertexCount,
+                        IntPtr indices, int indexCount, int triStride,
+                        IntPtr normals);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSingle"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTriMeshDataBuildSimple(IntPtr d, 
+                        float[] vertices, int vertexStride, int vertexCount,
+                        int[] indices, int indexCount, int triStride);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSingle"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTriMeshDataBuildSimple(IntPtr d,
+                        IntPtr vertices, int vertexStride, int vertexCount,
+                        IntPtr indices, int indexCount, int triStride);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSingle1"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTriMeshDataBuildSimple1(IntPtr d, 
+                        float[] vertices, int vertexStride, int vertexCount,
+                        int[] indices, int indexCount, int triStride,
+                        float[] normals);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataBuildSingle1"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTriMeshDataBuildSimple1(IntPtr d,
+                        IntPtr vertices, int vertexStride, int vertexCount,
+                        IntPtr indices, int indexCount, int triStride,
+                        IntPtr normals);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshClearTCCache"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTriMeshClearTCCache(IntPtr g);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataCreate"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr GeomTriMeshDataCreate();
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataDestroy"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTriMeshDataDestroy(IntPtr d);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataGet"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr GeomTriMeshDataGet(IntPtr d, int data_id);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataPreprocess"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTriMeshDataPreprocess(IntPtr d);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataSet"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTriMeshDataSet(IntPtr d, int data_id, IntPtr in_data);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshDataUpdate"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTriMeshDataUpdate(IntPtr d);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshEnableTC"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTriMeshEnableTC(IntPtr g, int geomClass, bool enable);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetArrayCallback"), SuppressUnmanagedCodeSecurity]
+                public static extern TriArrayCallback GeomTriMeshGetArrayCallback(IntPtr g);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetCallback"), SuppressUnmanagedCodeSecurity]
+                public static extern TriCallback GeomTriMeshGetCallback(IntPtr g);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetData"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr GeomTriMeshGetData(IntPtr g);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetLastTransform"), SuppressUnmanagedCodeSecurity]
+                public extern unsafe static Matrix4* GeomTriMeshGetLastTransformUnsafe(IntPtr geom);
+                public static Matrix4 GeomTriMeshGetLastTransform(IntPtr geom)
+                {
+                        unsafe { return *(GeomTriMeshGetLastTransformUnsafe(geom)); }
+                }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetPoint"), SuppressUnmanagedCodeSecurity]
+                public extern static void GeomTriMeshGetPoint(IntPtr g, int index, dReal u, dReal v, ref Vector3 outVec);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetRayCallback"), SuppressUnmanagedCodeSecurity]
+                public static extern TriRayCallback GeomTriMeshGetRayCallback(IntPtr g);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetTriangle"), SuppressUnmanagedCodeSecurity]
+                public extern static void GeomTriMeshGetTriangle(IntPtr g, int index, ref Vector3 v0, ref Vector3 v1, ref Vector3 v2);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetTriangleCount"), SuppressUnmanagedCodeSecurity]
+                public extern static int GeomTriMeshGetTriangleCount(IntPtr g);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshGetTriMeshDataID"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr GeomTriMeshGetTriMeshDataID(IntPtr g);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshIsTCEnabled"), SuppressUnmanagedCodeSecurity]
+                public static extern bool GeomTriMeshIsTCEnabled(IntPtr g, int geomClass);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetArrayCallback"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTriMeshSetArrayCallback(IntPtr g, TriArrayCallback arrayCallback);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetCallback"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTriMeshSetCallback(IntPtr g, TriCallback callback);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetData"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTriMeshSetData(IntPtr g, IntPtr data);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetLastTransform"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTriMeshSetLastTransform(IntPtr g, ref Matrix4 last_trans);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetLastTransform"), SuppressUnmanagedCodeSecurity]
+                public static extern void GeomTriMeshSetLastTransform(IntPtr g, ref dReal M00);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomTriMeshSetRayCallback"), SuppressUnmanagedCodeSecurity]
+        public static extern void GeomTriMeshSetRayCallback(IntPtr g, TriRayCallback callback);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGetConfiguration"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr iGetConfiguration();
+
+        public static string GetConfiguration()
+        {
+            IntPtr ptr = iGetConfiguration();
+            string s = Marshal.PtrToStringAnsi(ptr);
+            return s;
+        }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dHashSpaceCreate"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr HashSpaceCreate(IntPtr space);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dHashSpaceGetLevels"), SuppressUnmanagedCodeSecurity]
+                public static extern void HashSpaceGetLevels(IntPtr space, out int minlevel, out int maxlevel);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dHashSpaceSetLevels"), SuppressUnmanagedCodeSecurity]
+                public static extern void HashSpaceSetLevels(IntPtr space, int minlevel, int maxlevel);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dInfiniteAABB"), SuppressUnmanagedCodeSecurity]
+                public static extern void InfiniteAABB(IntPtr geom, out AABB aabb);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dInitODE"), SuppressUnmanagedCodeSecurity]
+                public static extern void InitODE();
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dInitODE2"), SuppressUnmanagedCodeSecurity]
+        public static extern int InitODE2(uint ODEInitFlags);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dIsPositiveDefinite"), SuppressUnmanagedCodeSecurity]
+                public static extern int IsPositiveDefinite(ref dReal A, int n);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dInvertPDMatrix"), SuppressUnmanagedCodeSecurity]
+                public static extern int InvertPDMatrix(ref dReal A, out dReal Ainv, int n);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddAMotorTorques"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointAddAMotorTorques(IntPtr joint, dReal torque1, dReal torque2, dReal torque3);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddHingeTorque"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointAddHingeTorque(IntPtr joint, dReal torque);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddHinge2Torque"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointAddHinge2Torques(IntPtr joint, dReal torque1, dReal torque2);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddPRTorque"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointAddPRTorque(IntPtr joint, dReal torque);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddUniversalTorque"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointAddUniversalTorques(IntPtr joint, dReal torque1, dReal torque2);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAddSliderForce"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointAddSliderForce(IntPtr joint, dReal force);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointAttach"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointAttach(IntPtr joint, IntPtr body1, IntPtr body2);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateAMotor"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr JointCreateAMotor(IntPtr world, IntPtr group);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateBall"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr JointCreateBall(IntPtr world, IntPtr group);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateContact"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointCreateContact(IntPtr world, IntPtr group, ref Contact contact);
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateContact"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr JointCreateContactPtr(IntPtr world, IntPtr group, IntPtr contact);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateFixed"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr JointCreateFixed(IntPtr world, IntPtr group);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateHinge"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr JointCreateHinge(IntPtr world, IntPtr group);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateHinge2"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr JointCreateHinge2(IntPtr world, IntPtr group);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateLMotor"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr JointCreateLMotor(IntPtr world, IntPtr group);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateNull"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr JointCreateNull(IntPtr world, IntPtr group);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreatePR"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr JointCreatePR(IntPtr world, IntPtr group);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreatePlane2D"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr JointCreatePlane2D(IntPtr world, IntPtr group);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateSlider"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr JointCreateSlider(IntPtr world, IntPtr group);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointCreateUniversal"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr JointCreateUniversal(IntPtr world, IntPtr group);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointDestroy"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointDestroy(IntPtr j);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorAngle"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal JointGetAMotorAngle(IntPtr j, int anum);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorAngleRate"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal JointGetAMotorAngleRate(IntPtr j, int anum);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorAxis"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointGetAMotorAxis(IntPtr j, int anum, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorAxisRel"), SuppressUnmanagedCodeSecurity]
+                public static extern int JointGetAMotorAxisRel(IntPtr j, int anum);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorMode"), SuppressUnmanagedCodeSecurity]
+                public static extern int JointGetAMotorMode(IntPtr j);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorNumAxes"), SuppressUnmanagedCodeSecurity]
+                public static extern int JointGetAMotorNumAxes(IntPtr j);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetAMotorParam"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal JointGetAMotorParam(IntPtr j, int parameter);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetBallAnchor"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointGetBallAnchor(IntPtr j, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetBallAnchor2"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointGetBallAnchor2(IntPtr j, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetBody"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr JointGetBody(IntPtr j);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetData"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr JointGetData(IntPtr j);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetFeedback"), SuppressUnmanagedCodeSecurity]
+                public extern unsafe static JointFeedback* JointGetFeedbackUnsafe(IntPtr j);
+                public static JointFeedback JointGetFeedback(IntPtr j)
+                {
+                        unsafe { return *(JointGetFeedbackUnsafe(j)); }
+                }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAnchor"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointGetHingeAnchor(IntPtr j, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAngle"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal JointGetHingeAngle(IntPtr j);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAngleRate"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal JointGetHingeAngleRate(IntPtr j);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAxis"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointGetHingeAxis(IntPtr j, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeParam"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal JointGetHingeParam(IntPtr j, int parameter);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Angle1"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal JointGetHinge2Angle1(IntPtr j);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Angle1Rate"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal JointGetHinge2Angle1Rate(IntPtr j);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Angle2Rate"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal JointGetHinge2Angle2Rate(IntPtr j);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHingeAnchor2"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointGetHingeAnchor2(IntPtr j, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Anchor"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointGetHinge2Anchor(IntPtr j, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Anchor2"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointGetHinge2Anchor2(IntPtr j, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Axis1"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointGetHinge2Axis1(IntPtr j, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Axis2"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointGetHinge2Axis2(IntPtr j, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetHinge2Param"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal JointGetHinge2Param(IntPtr j, int parameter);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetLMotorAxis"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointGetLMotorAxis(IntPtr j, int anum, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetLMotorNumAxes"), SuppressUnmanagedCodeSecurity]
+                public static extern int JointGetLMotorNumAxes(IntPtr j);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetLMotorParam"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal JointGetLMotorParam(IntPtr j, int parameter);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRAnchor"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointGetPRAnchor(IntPtr j, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRAxis1"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointGetPRAxis1(IntPtr j, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRAxis2"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointGetPRAxis2(IntPtr j, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRParam"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal JointGetPRParam(IntPtr j, int parameter);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRPosition"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal JointGetPRPosition(IntPtr j);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetPRPositionRate"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal JointGetPRPositionRate(IntPtr j);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetSliderAxis"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointGetSliderAxis(IntPtr j, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetSliderParam"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal JointGetSliderParam(IntPtr j, int parameter);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetSliderPosition"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal JointGetSliderPosition(IntPtr j);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetSliderPositionRate"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal JointGetSliderPositionRate(IntPtr j);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetType"), SuppressUnmanagedCodeSecurity]
+                public static extern JointType JointGetType(IntPtr j);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAnchor"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointGetUniversalAnchor(IntPtr j, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAnchor2"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointGetUniversalAnchor2(IntPtr j, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngle1"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal JointGetUniversalAngle1(IntPtr j);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngle1Rate"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal JointGetUniversalAngle1Rate(IntPtr j);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngle2"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal JointGetUniversalAngle2(IntPtr j);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngle2Rate"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal JointGetUniversalAngle2Rate(IntPtr j);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAngles"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointGetUniversalAngles(IntPtr j, out dReal angle1, out dReal angle2);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAxis1"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointGetUniversalAxis1(IntPtr j, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalAxis2"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointGetUniversalAxis2(IntPtr j, out Vector3 result);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGetUniversalParam"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal JointGetUniversalParam(IntPtr j, int parameter);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGroupCreate"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr JointGroupCreate(int max_size);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGroupDestroy"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointGroupDestroy(IntPtr group);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointGroupEmpty"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointGroupEmpty(IntPtr group);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorAngle"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetAMotorAngle(IntPtr j, int anum, dReal angle);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorAxis"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetAMotorAxis(IntPtr j, int anum, int rel, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorMode"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetAMotorMode(IntPtr j, int mode);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorNumAxes"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetAMotorNumAxes(IntPtr group, int num);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetAMotorParam"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetAMotorParam(IntPtr group, int parameter, dReal value);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetBallAnchor"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetBallAnchor(IntPtr j, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetBallAnchor2"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetBallAnchor2(IntPtr j, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetData"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetData(IntPtr j, IntPtr data);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetFeedback"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetFeedback(IntPtr j, out JointFeedback feedback);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetFixed"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetFixed(IntPtr j);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHingeAnchor"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetHingeAnchor(IntPtr j, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHingeAnchorDelta"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetHingeAnchorDelta(IntPtr j, dReal x, dReal y, dReal z, dReal ax, dReal ay, dReal az);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHingeAxis"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetHingeAxis(IntPtr j, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHingeParam"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetHingeParam(IntPtr j, int parameter, dReal value);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHinge2Anchor"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetHinge2Anchor(IntPtr j, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHinge2Axis1"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetHinge2Axis1(IntPtr j, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHinge2Axis2"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetHinge2Axis2(IntPtr j, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetHinge2Param"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetHinge2Param(IntPtr j, int parameter, dReal value);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetLMotorAxis"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetLMotorAxis(IntPtr j, int anum, int rel, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetLMotorNumAxes"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetLMotorNumAxes(IntPtr j, int num);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetLMotorParam"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetLMotorParam(IntPtr j, int parameter, dReal value);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPlane2DAngleParam"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetPlane2DAngleParam(IntPtr j, int parameter, dReal value);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPlane2DXParam"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetPlane2DXParam(IntPtr j, int parameter, dReal value);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPlane2DYParam"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetPlane2DYParam(IntPtr j, int parameter, dReal value);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPRAnchor"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetPRAnchor(IntPtr j, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPRAxis1"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetPRAxis1(IntPtr j, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPRAxis2"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetPRAxis2(IntPtr j, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetPRParam"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetPRParam(IntPtr j, int parameter, dReal value);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetSliderAxis"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetSliderAxis(IntPtr j, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetSliderAxisDelta"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetSliderAxisDelta(IntPtr j, dReal x, dReal y, dReal z, dReal ax, dReal ay, dReal az);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetSliderParam"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetSliderParam(IntPtr j, int parameter, dReal value);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetUniversalAnchor"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetUniversalAnchor(IntPtr j, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetUniversalAxis1"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetUniversalAxis1(IntPtr j, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetUniversalAxis2"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetUniversalAxis2(IntPtr j, dReal x, dReal y, dReal z);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dJointSetUniversalParam"), SuppressUnmanagedCodeSecurity]
+                public static extern void JointSetUniversalParam(IntPtr j, int parameter, dReal value);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dLDLTAddTL"), SuppressUnmanagedCodeSecurity]
+                public static extern void LDLTAddTL(ref dReal L, ref dReal d, ref dReal a, int n, int nskip);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassAdd"), SuppressUnmanagedCodeSecurity]
+                public static extern void MassAdd(ref Mass a, ref Mass b);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassAdjust"), SuppressUnmanagedCodeSecurity]
+                public static extern void MassAdjust(ref Mass m, dReal newmass);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassCheck"), SuppressUnmanagedCodeSecurity]
+                public static extern bool MassCheck(ref Mass m);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassRotate"), SuppressUnmanagedCodeSecurity]
+                public static extern void MassRotate(ref Mass mass, ref Matrix3 R);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassRotate"), SuppressUnmanagedCodeSecurity]
+                public static extern void MassRotate(ref Mass mass, ref dReal M00);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetBox"), SuppressUnmanagedCodeSecurity]
+                public static extern void MassSetBox(out Mass mass, dReal density, dReal lx, dReal ly, dReal lz);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetBoxTotal"), SuppressUnmanagedCodeSecurity]
+                public static extern void MassSetBoxTotal(out Mass mass, dReal total_mass, dReal lx, dReal ly, dReal lz);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetCapsule"), SuppressUnmanagedCodeSecurity]
+                public static extern void MassSetCapsule(out Mass mass, dReal density, int direction, dReal radius, dReal length);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetCapsuleTotal"), SuppressUnmanagedCodeSecurity]
+                public static extern void MassSetCapsuleTotal(out Mass mass, dReal total_mass, int direction, dReal radius, dReal length);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetCylinder"), SuppressUnmanagedCodeSecurity]
+                public static extern void MassSetCylinder(out Mass mass, dReal density, int direction, dReal radius, dReal length);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetCylinderTotal"), SuppressUnmanagedCodeSecurity]
+                public static extern void MassSetCylinderTotal(out Mass mass, dReal total_mass, int direction, dReal radius, dReal length);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetParameters"), SuppressUnmanagedCodeSecurity]
+                public static extern void MassSetParameters(out Mass mass, dReal themass,
+                         dReal cgx, dReal cgy, dReal cgz,
+                         dReal i11, dReal i22, dReal i33,
+                         dReal i12, dReal i13, dReal i23);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetSphere"), SuppressUnmanagedCodeSecurity]
+                public static extern void MassSetSphere(out Mass mass, dReal density, dReal radius);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetSphereTotal"), SuppressUnmanagedCodeSecurity]
+                public static extern void dMassSetSphereTotal(out Mass mass, dReal total_mass, dReal radius);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetTrimesh"), SuppressUnmanagedCodeSecurity]
+                public static extern void MassSetTrimesh(out Mass mass, dReal density, IntPtr g);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassSetZero"), SuppressUnmanagedCodeSecurity]
+                public static extern void MassSetZero(out Mass mass);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMassTranslate"), SuppressUnmanagedCodeSecurity]
+                public static extern void MassTranslate(ref Mass mass, dReal x, dReal y, dReal z);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMultiply0"), SuppressUnmanagedCodeSecurity]
+        public static extern void Multiply0(out dReal A00, ref dReal B00, ref dReal C00, int p, int q, int r);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMultiply0"), SuppressUnmanagedCodeSecurity]
+        private static extern void MultiplyiM3V3(out Vector3 vout, ref Matrix3 matrix, ref Vector3 vect,int p, int q, int r);
+        public static void MultiplyM3V3(out Vector3 outvector, ref Matrix3 matrix, ref Vector3 invector)
+        {
+            MultiplyiM3V3(out outvector, ref matrix, ref invector, 3, 3, 1);
+        }
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMultiply1"), SuppressUnmanagedCodeSecurity]
+                public static extern void Multiply1(out dReal A00, ref dReal B00, ref dReal C00, int p, int q, int r);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dMultiply2"), SuppressUnmanagedCodeSecurity]
+                public static extern void Multiply2(out dReal A00, ref dReal B00, ref dReal C00, int p, int q, int r);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQFromAxisAndAngle"), SuppressUnmanagedCodeSecurity]
+                public static extern void QFromAxisAndAngle(out Quaternion q, dReal ax, dReal ay, dReal az, dReal angle);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQfromR"), SuppressUnmanagedCodeSecurity]
+                public static extern void QfromR(out Quaternion q, ref Matrix3 R);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQMultiply0"), SuppressUnmanagedCodeSecurity]
+                public static extern void QMultiply0(out Quaternion qa, ref Quaternion qb, ref Quaternion qc);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQMultiply1"), SuppressUnmanagedCodeSecurity]
+                public static extern void QMultiply1(out Quaternion qa, ref Quaternion qb, ref Quaternion qc);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQMultiply2"), SuppressUnmanagedCodeSecurity]
+                public static extern void QMultiply2(out Quaternion qa, ref Quaternion qb, ref Quaternion qc);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQMultiply3"), SuppressUnmanagedCodeSecurity]
+                public static extern void QMultiply3(out Quaternion qa, ref Quaternion qb, ref Quaternion qc);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQSetIdentity"), SuppressUnmanagedCodeSecurity]
+                public static extern void QSetIdentity(out Quaternion q);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQuadTreeSpaceCreate"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr QuadTreeSpaceCreate(IntPtr space, ref Vector3 center, ref Vector3 extents, int depth);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dQuadTreeSpaceCreate"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr QuadTreeSpaceCreate(IntPtr space, ref dReal centerX, ref dReal extentsX, int depth);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRandReal"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal RandReal();
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRFrom2Axes"), SuppressUnmanagedCodeSecurity]
+                public static extern void RFrom2Axes(out Matrix3 R, dReal ax, dReal ay, dReal az, dReal bx, dReal by, dReal bz);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRFromAxisAndAngle"), SuppressUnmanagedCodeSecurity]
+                public static extern void RFromAxisAndAngle(out Matrix3 R, dReal x, dReal y, dReal z, dReal angle);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRFromEulerAngles"), SuppressUnmanagedCodeSecurity]
+                public static extern void RFromEulerAngles(out Matrix3 R, dReal phi, dReal theta, dReal psi);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRfromQ"), SuppressUnmanagedCodeSecurity]
+                public static extern void RfromQ(out Matrix3 R, ref Quaternion q);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRFromZAxis"), SuppressUnmanagedCodeSecurity]
+                public static extern void RFromZAxis(out Matrix3 R, dReal ax, dReal ay, dReal az);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dRSetIdentity"), SuppressUnmanagedCodeSecurity]
+                public static extern void RSetIdentity(out Matrix3 R);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSetValue"), SuppressUnmanagedCodeSecurity]
+                public static extern void SetValue(out dReal a, int n);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSetZero"), SuppressUnmanagedCodeSecurity]
+                public static extern void SetZero(out dReal a, int n);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSimpleSpaceCreate"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr SimpleSpaceCreate(IntPtr space);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSolveCholesky"), SuppressUnmanagedCodeSecurity]
+                public static extern void SolveCholesky(ref dReal L, out dReal b, int n);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSolveL1"), SuppressUnmanagedCodeSecurity]
+                public static extern void SolveL1(ref dReal L, out dReal b, int n, int nskip);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSolveL1T"), SuppressUnmanagedCodeSecurity]
+                public static extern void SolveL1T(ref dReal L, out dReal b, int n, int nskip);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSolveLDLT"), SuppressUnmanagedCodeSecurity]
+                public static extern void SolveLDLT(ref dReal L, ref dReal d, out dReal b, int n, int nskip);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceAdd"), SuppressUnmanagedCodeSecurity]
+                public static extern void SpaceAdd(IntPtr space, IntPtr geom);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceLockQuery"), SuppressUnmanagedCodeSecurity]
+        public static extern bool SpaceLockQuery(IntPtr space);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceClean"), SuppressUnmanagedCodeSecurity]
+                public static extern void SpaceClean(IntPtr space);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceCollide"), SuppressUnmanagedCodeSecurity]
+                public static extern void SpaceCollide(IntPtr space, IntPtr data, NearCallback callback);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceCollide2"), SuppressUnmanagedCodeSecurity]
+                public static extern void SpaceCollide2(IntPtr space1, IntPtr space2, IntPtr data, NearCallback callback);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceDestroy"), SuppressUnmanagedCodeSecurity]
+                public static extern void SpaceDestroy(IntPtr space);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceGetCleanup"), SuppressUnmanagedCodeSecurity]
+                public static extern bool SpaceGetCleanup(IntPtr space);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceGetNumGeoms"), SuppressUnmanagedCodeSecurity]
+                public static extern int SpaceGetNumGeoms(IntPtr space);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceGetGeom"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr SpaceGetGeom(IntPtr space, int i);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceGetSublevel"), SuppressUnmanagedCodeSecurity]
+        public static extern int SpaceGetSublevel(IntPtr space);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceQuery"), SuppressUnmanagedCodeSecurity]
+                public static extern bool SpaceQuery(IntPtr space, IntPtr geom);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceRemove"), SuppressUnmanagedCodeSecurity]
+                public static extern void SpaceRemove(IntPtr space, IntPtr geom);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceSetCleanup"), SuppressUnmanagedCodeSecurity]
+                public static extern void SpaceSetCleanup(IntPtr space, bool mode);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSpaceSetSublevel"), SuppressUnmanagedCodeSecurity]
+        public static extern void SpaceSetSublevel(IntPtr space, int sublevel);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dSweepAndPruneSpaceCreate"), SuppressUnmanagedCodeSecurity]
+        public static extern IntPtr SweepAndPruneSpaceCreate(IntPtr space, int AxisOrder);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dVectorScale"), SuppressUnmanagedCodeSecurity]
+                public static extern void VectorScale(out dReal a, ref dReal d, int n);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldCreate"), SuppressUnmanagedCodeSecurity]
+                public static extern IntPtr WorldCreate();
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldDestroy"), SuppressUnmanagedCodeSecurity]
+                public static extern void WorldDestroy(IntPtr world);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableAverageSamplesCount"), SuppressUnmanagedCodeSecurity]
+        public static extern int WorldGetAutoDisableAverageSamplesCount(IntPtr world);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableAngularThreshold"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal WorldGetAutoDisableAngularThreshold(IntPtr world);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableFlag"), SuppressUnmanagedCodeSecurity]
+                public static extern bool WorldGetAutoDisableFlag(IntPtr world);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableLinearThreshold"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal WorldGetAutoDisableLinearThreshold(IntPtr world);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableSteps"), SuppressUnmanagedCodeSecurity]
+                public static extern int WorldGetAutoDisableSteps(IntPtr world);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoDisableTime"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal WorldGetAutoDisableTime(IntPtr world);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAutoEnableDepthSF1"), SuppressUnmanagedCodeSecurity]
+                public static extern int WorldGetAutoEnableDepthSF1(IntPtr world);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetCFM"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal WorldGetCFM(IntPtr world);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetERP"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal WorldGetERP(IntPtr world);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetGravity"), SuppressUnmanagedCodeSecurity]
+                public static extern void WorldGetGravity(IntPtr world, out Vector3 gravity);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetGravity"), SuppressUnmanagedCodeSecurity]
+                public static extern void WorldGetGravity(IntPtr world, out dReal X);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetContactMaxCorrectingVel"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal WorldGetContactMaxCorrectingVel(IntPtr world);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetContactSurfaceLayer"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal WorldGetContactSurfaceLayer(IntPtr world);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAngularDamping"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal WorldGetAngularDamping(IntPtr world);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetAngularDampingThreshold"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal WorldGetAngularDampingThreshold(IntPtr world);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetLinearDamping"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal WorldGetLinearDamping(IntPtr world);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetLinearDampingThreshold"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal WorldGetLinearDampingThreshold(IntPtr world);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetQuickStepNumIterations"), SuppressUnmanagedCodeSecurity]
+                public static extern int WorldGetQuickStepNumIterations(IntPtr world);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetQuickStepW"), SuppressUnmanagedCodeSecurity]
+                public static extern dReal WorldGetQuickStepW(IntPtr world);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldGetMaxAngularSpeed"), SuppressUnmanagedCodeSecurity]
+        public static extern dReal WorldGetMaxAngularSpeed(IntPtr world);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldImpulseToForce"), SuppressUnmanagedCodeSecurity]
+                public static extern void WorldImpulseToForce(IntPtr world, dReal stepsize, dReal ix, dReal iy, dReal iz, out Vector3 force);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldImpulseToForce"), SuppressUnmanagedCodeSecurity]
+                public static extern void WorldImpulseToForce(IntPtr world, dReal stepsize, dReal ix, dReal iy, dReal iz, out dReal forceX);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldQuickStep"), SuppressUnmanagedCodeSecurity]
+                public static extern void WorldQuickStep(IntPtr world, dReal stepsize);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAngularDamping"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetAngularDamping(IntPtr world, dReal scale);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAngularDampingThreshold"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetAngularDampingThreshold(IntPtr world, dReal threshold);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableAngularThreshold"), SuppressUnmanagedCodeSecurity]
+                public static extern void WorldSetAutoDisableAngularThreshold(IntPtr world, dReal angular_threshold);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableAverageSamplesCount"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetAutoDisableAverageSamplesCount(IntPtr world, int average_samples_count);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableFlag"), SuppressUnmanagedCodeSecurity]
+                public static extern void WorldSetAutoDisableFlag(IntPtr world, bool do_auto_disable);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableLinearThreshold"), SuppressUnmanagedCodeSecurity]
+                public static extern void WorldSetAutoDisableLinearThreshold(IntPtr world, dReal linear_threshold);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableSteps"), SuppressUnmanagedCodeSecurity]
+                public static extern void WorldSetAutoDisableSteps(IntPtr world, int steps);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoDisableTime"), SuppressUnmanagedCodeSecurity]
+                public static extern void WorldSetAutoDisableTime(IntPtr world, dReal time);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetAutoEnableDepthSF1"), SuppressUnmanagedCodeSecurity]
+                public static extern void WorldSetAutoEnableDepthSF1(IntPtr world, int autoEnableDepth);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetCFM"), SuppressUnmanagedCodeSecurity]
+                public static extern void WorldSetCFM(IntPtr world, dReal cfm);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetContactMaxCorrectingVel"), SuppressUnmanagedCodeSecurity]
+                public static extern void WorldSetContactMaxCorrectingVel(IntPtr world, dReal vel);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetContactSurfaceLayer"), SuppressUnmanagedCodeSecurity]
+                public static extern void WorldSetContactSurfaceLayer(IntPtr world, dReal depth);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetDamping"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetDamping(IntPtr world, dReal linear_scale, dReal angular_scale);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetERP"), SuppressUnmanagedCodeSecurity]
+                public static extern void WorldSetERP(IntPtr world, dReal erp);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetGravity"), SuppressUnmanagedCodeSecurity]
+                public static extern void WorldSetGravity(IntPtr world, dReal x, dReal y, dReal z);
+        
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetLinearDamping"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetLinearDamping(IntPtr world, dReal scale);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetLinearDampingThreshold"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetLinearDampingThreshold(IntPtr world, dReal threshold);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetQuickStepNumIterations"), SuppressUnmanagedCodeSecurity]
+                public static extern void WorldSetQuickStepNumIterations(IntPtr world, int num);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetQuickStepW"), SuppressUnmanagedCodeSecurity]
+                public static extern void WorldSetQuickStepW(IntPtr world, dReal over_relaxation);
+
+        [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldSetMaxAngularSpeed"), SuppressUnmanagedCodeSecurity]
+        public static extern void WorldSetMaxAngularSpeed(IntPtr world, dReal max_speed);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldStep"), SuppressUnmanagedCodeSecurity]
+                public static extern void WorldStep(IntPtr world, dReal stepsize);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldStepFast1"), SuppressUnmanagedCodeSecurity]
+                public static extern void WorldStepFast1(IntPtr world, dReal stepsize, int maxiterations);
+
+                [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dWorldExportDIF"), SuppressUnmanagedCodeSecurity]
+                public static extern void WorldExportDIF(IntPtr world, string filename, bool append, string prefix);
+        }
+}
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdePlugin.cs
new file mode 100644
index 0000000..d32188e
--- /dev/null
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdePlugin.cs
@@ -0,0 +1,90 @@
+/*
+ * 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.Reflection;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.IO;
+using System.Diagnostics;
+using log4net;
+using Nini.Config;
+using OdeAPI;
+using OpenSim.Framework;
+using OpenSim.Region.Physics.Manager;
+using OpenMetaverse;
+
+namespace OpenSim.Region.Physics.OdePlugin
+{
+    /// <summary>
+    /// ODE plugin
+    /// </summary>
+    public class OdePlugin : IPhysicsPlugin
+    {
+        //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
+        private OdeScene m_scene;
+
+        public bool Init()
+        {
+            if (Util.IsWindows())
+                Util.LoadArchSpecificWindowsDll("ode.dll");
+
+            if (d.InitODE2(0) != 0)
+            {
+                if (d.AllocateODEDataForThread(~0U) == 0)
+                {
+                    d.CloseODE();
+                    return false;
+                }
+                return true;
+            }
+            return false;
+        }
+
+        public PhysicsScene GetScene(String sceneIdentifier)
+        {
+            if (m_scene == null)
+            {
+
+                m_scene = new OdeScene(sceneIdentifier);
+            }
+            return (m_scene);
+        }
+
+        public string GetName()
+        {
+            return ("UbitODE");
+        }
+
+        public void Dispose()
+        {
+            d.CloseODE();
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
new file mode 100644
index 0000000..754bc86
--- /dev/null
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -0,0 +1,2859 @@
+/*
+ * 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.
+ */
+
+//#define SPAM
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.IO;
+using System.Diagnostics;
+using log4net;
+using Nini.Config;
+using OdeAPI;
+using OpenSim.Framework;
+using OpenSim.Region.Physics.Manager;
+using OpenMetaverse;
+
+namespace OpenSim.Region.Physics.OdePlugin
+{
+    public enum StatusIndicators : int
+    {
+        Generic = 0,
+        Start = 1,
+        End = 2
+    }
+
+    public struct sCollisionData
+    {
+        public uint ColliderLocalId;
+        public uint CollidedWithLocalId;
+        public int NumberOfCollisions;
+        public int CollisionType;
+        public int StatusIndicator;
+        public int lastframe;
+    }
+
+
+    // colision flags of things others can colide with
+    // rays, sensors, probes removed since can't  be colided with
+    // The top space where things are placed provided further selection
+    // ie physical are in active space nonphysical in static
+    // this should be exclusive as possible
+
+    [Flags]
+    public enum CollisionCategories : uint
+    {
+        Disabled = 0,
+        //by 'things' types
+        Space =         0x01,
+        Geom =          0x02, // aka prim/part
+        Character =     0x04,
+        Land =          0x08,
+        Water =         0x010,
+
+        // by state
+        Phantom =       0x01000,
+        VolumeDtc =     0x02000,
+        Selected =      0x04000,
+        NoShape =       0x08000,
+
+
+        All =           0xffffffff
+    }
+
+    /// <summary>
+    /// Material type for a primitive
+    /// </summary>
+    public enum Material : int
+    {
+        /// <summary></summary>
+        Stone = 0,
+        /// <summary></summary>
+        Metal = 1,
+        /// <summary></summary>
+        Glass = 2,
+        /// <summary></summary>
+        Wood = 3,
+        /// <summary></summary>
+        Flesh = 4,
+        /// <summary></summary>
+        Plastic = 5,
+        /// <summary></summary>
+        Rubber = 6,
+
+        light = 7 // compatibility with old viewers
+    }
+    
+    public enum changes : int
+    {
+        Add = 0,                // arg null. finishs the prim creation. should be used internally only ( to remove later ?)
+        Remove,
+        Link,               // arg AuroraODEPrim new parent prim or null to delink. Makes the prim part of a object with prim parent as root
+        //  or removes from a object if arg is null
+        DeLink,
+        Position,           // arg Vector3 new position in world coords. Changes prim position. Prim must know if it is root or child
+        Orientation,        // arg Quaternion new orientation in world coords. Changes prim position. Prim must know it it is root or child
+        PosOffset,          // not in use
+        // arg Vector3 new position in local coords. Changes prim position in object
+        OriOffset,          // not in use
+        // arg Vector3 new position in local coords. Changes prim position in object
+        Velocity,
+        AngVelocity,
+        Acceleration,
+        Force,
+        Torque,
+        Momentum,
+
+        AddForce,
+        AddAngForce,
+        AngLock,
+
+        Buoyancy,
+
+        PIDTarget,
+        PIDTau,
+        PIDActive,
+
+        PIDHoverHeight,
+        PIDHoverType,
+        PIDHoverTau,
+        PIDHoverActive,
+
+        Size,
+        AvatarSize,
+        Shape,
+        PhysRepData,
+        AddPhysRep,
+
+        CollidesWater,
+        VolumeDtc,
+
+        Physical,
+        Phantom,
+        Selected,
+        disabled,
+        building,
+
+        VehicleType,
+        VehicleFloatParam,
+        VehicleVectorParam,
+        VehicleRotationParam,
+        VehicleFlags,
+        SetVehicle,
+
+        Null             //keep this last used do dim the methods array. does nothing but pulsing the prim
+    }
+
+    public struct ODEchangeitem
+    {
+        public PhysicsActor actor;
+        public OdeCharacter character;
+        public changes what;
+        public Object arg;
+    }
+
+    
+
+    public class OdeScene : PhysicsScene
+    {
+        private readonly ILog m_log;
+        // private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>();
+
+        public bool OdeUbitLib = false;
+//        private int threadid = 0;
+        private Random fluidRandomizer = new Random(Environment.TickCount);
+
+        const d.ContactFlags comumContactFlags = d.ContactFlags.SoftERP | d.ContactFlags.SoftCFM |d.ContactFlags.Approx1 | d.ContactFlags.Bounce;
+        const float MaxERP = 0.8f;
+        const float minERP = 0.1f;
+        const float comumContactCFM = 0.0001f;
+        
+        float frictionMovementMult = 0.8f;
+
+        float TerrainBounce = 0.1f;
+        float TerrainFriction = 0.3f;
+
+        public float AvatarFriction = 0;// 0.9f * 0.5f;
+
+        private const uint m_regionWidth = Constants.RegionSize;
+        private const uint m_regionHeight = Constants.RegionSize;
+
+        public float ODE_STEPSIZE = 0.020f;
+        public float HalfOdeStep = 0.01f;
+        public int odetimestepMS = 20; // rounded
+        private float metersInSpace = 25.6f;
+        private float m_timeDilation = 1.0f;
+
+        private DateTime m_lastframe;
+        private DateTime m_lastMeshExpire;
+
+        public float gravityx = 0f;
+        public float gravityy = 0f;
+        public float gravityz = -9.8f;
+
+        private float waterlevel = 0f;
+        private int framecount = 0;
+
+        private int m_meshExpireCntr;
+
+//        private IntPtr WaterGeom = IntPtr.Zero;
+//        private IntPtr WaterHeightmapData = IntPtr.Zero;
+//        private GCHandle WaterMapHandler = new GCHandle();
+
+        private float avDensity = 3f;
+        private float avMovementDivisorWalk = 1.3f;
+        private float avMovementDivisorRun = 0.8f;
+        private float minimumGroundFlightOffset = 3f;
+        public float maximumMassObject = 10000.01f;
+
+
+        public float geomDefaultDensity = 10.000006836f;
+
+        public int geomContactPointsStartthrottle = 3;
+        public int geomUpdatesPerThrottledUpdate = 15;
+
+        public float bodyPIDD = 35f;
+        public float bodyPIDG = 25;
+
+//        public int geomCrossingFailuresBeforeOutofbounds = 6;
+
+        public int bodyFramesAutoDisable = 5;
+
+
+        private d.NearCallback nearCallback;
+
+        private HashSet<OdeCharacter> _characters = new HashSet<OdeCharacter>();
+        private HashSet<OdePrim> _prims = new HashSet<OdePrim>();
+        private HashSet<OdePrim> _activeprims = new HashSet<OdePrim>();
+        private HashSet<OdePrim> _activegroups = new HashSet<OdePrim>();
+
+        public OpenSim.Framework.LocklessQueue<ODEchangeitem> ChangesQueue = new OpenSim.Framework.LocklessQueue<ODEchangeitem>();
+
+        /// <summary>
+        /// A list of actors that should receive collision events.
+        /// </summary>
+        private List<PhysicsActor> _collisionEventPrim = new List<PhysicsActor>();
+        private List<PhysicsActor> _collisionEventPrimRemove = new List<PhysicsActor>();
+        
+        private HashSet<OdeCharacter> _badCharacter = new HashSet<OdeCharacter>();
+//        public Dictionary<IntPtr, String> geom_name_map = new Dictionary<IntPtr, String>();
+        public Dictionary<IntPtr, PhysicsActor> actor_name_map = new Dictionary<IntPtr, PhysicsActor>();
+
+        private float contactsurfacelayer = 0.002f;
+
+        private int contactsPerCollision = 80;
+        internal IntPtr ContactgeomsArray = IntPtr.Zero;
+        private IntPtr GlobalContactsArray = IntPtr.Zero;
+
+        const int maxContactsbeforedeath = 4000;
+        private volatile int m_global_contactcount = 0;
+
+        private IntPtr contactgroup;
+
+        public ContactData[] m_materialContactsData = new ContactData[8];
+
+        private Dictionary<Vector3, IntPtr> RegionTerrain = new Dictionary<Vector3, IntPtr>();
+        private Dictionary<IntPtr, float[]> TerrainHeightFieldHeights = new Dictionary<IntPtr, float[]>();
+        private Dictionary<IntPtr, GCHandle> TerrainHeightFieldHeightsHandlers = new Dictionary<IntPtr, GCHandle>();
+       
+        private int m_physicsiterations = 10;
+        private const float m_SkipFramesAtms = 0.40f; // Drop frames gracefully at a 400 ms lag
+//        private PhysicsActor PANull = new NullPhysicsActor();
+        private float step_time = 0.0f;
+
+        public IntPtr world;
+
+
+        // split the spaces acording to contents type
+        // ActiveSpace contains characters and active prims
+        // StaticSpace contains land and other that is mostly static in enviroment
+        // this can contain subspaces, like the grid in staticspace
+        // as now space only contains this 2 top spaces
+
+        public IntPtr TopSpace; // the global space
+        public IntPtr ActiveSpace; // space for active prims
+        public IntPtr CharsSpace; // space for active prims
+        public IntPtr StaticSpace; // space for the static things around
+        public IntPtr GroundSpace; // space for ground
+
+        public IntPtr SharedRay;
+
+        // some speedup variables
+        private int spaceGridMaxX;
+        private int spaceGridMaxY;
+        private float spacesPerMeter;
+
+        // split static geometry collision into a grid as before
+        private IntPtr[,] staticPrimspace;
+        private IntPtr[] staticPrimspaceOffRegion;
+
+        public Object OdeLock;
+        public static Object SimulationLock;
+
+        public IMesher mesher;
+
+        private IConfigSource m_config;
+
+        public bool physics_logging = false;
+        public int physics_logging_interval = 0;
+        public bool physics_logging_append_existing_logfile = false;
+
+        private Vector3 m_worldOffset = Vector3.Zero;
+        public Vector2 WorldExtents = new Vector2((int)Constants.RegionSize, (int)Constants.RegionSize);
+        private PhysicsScene m_parentScene = null;
+
+        private ODERayCastRequestManager m_rayCastManager;
+        public ODEMeshWorker m_meshWorker;
+
+/* maybe needed if ode uses tls
+        private void checkThread()
+        {
+
+            int th = Thread.CurrentThread.ManagedThreadId;
+            if(th != threadid)
+            {
+                threadid = th;
+                d.AllocateODEDataForThread(~0U);
+            }
+        }
+ */
+        /// <summary>
+        /// Initiailizes the scene
+        /// Sets many properties that ODE requires to be stable
+        /// These settings need to be tweaked 'exactly' right or weird stuff happens.
+        /// </summary>
+        public OdeScene(string sceneIdentifier)
+            {
+            m_log 
+                = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.ToString() + "." + sceneIdentifier);
+
+//            checkThread();
+            Name = sceneIdentifier;
+
+            OdeLock = new Object();
+            SimulationLock = new Object();
+
+            nearCallback = near;
+
+            m_rayCastManager = new ODERayCastRequestManager(this);         
+
+            lock (OdeLock)
+                {
+                // Create the world and the first space
+                try
+                    {
+                    world = d.WorldCreate();
+                    TopSpace = d.HashSpaceCreate(IntPtr.Zero);
+
+                    // now the major subspaces
+                    ActiveSpace = d.HashSpaceCreate(TopSpace);
+                    CharsSpace = d.HashSpaceCreate(TopSpace);
+                    StaticSpace = d.HashSpaceCreate(TopSpace);
+                    GroundSpace = d.HashSpaceCreate(TopSpace);
+                    }
+                catch
+                    {
+                    // i must RtC#FM 
+                    // i did!
+                    }
+
+                d.HashSpaceSetLevels(TopSpace, -2, 8);
+                d.HashSpaceSetLevels(ActiveSpace, -2, 8);
+                d.HashSpaceSetLevels(CharsSpace, -4, 3);
+                d.HashSpaceSetLevels(StaticSpace, -2, 8);
+                d.HashSpaceSetLevels(GroundSpace, 0, 8);
+
+                // demote to second level
+                d.SpaceSetSublevel(ActiveSpace, 1);
+                d.SpaceSetSublevel(CharsSpace, 1);
+                d.SpaceSetSublevel(StaticSpace, 1);
+                d.SpaceSetSublevel(GroundSpace, 1);
+
+                d.GeomSetCategoryBits(ActiveSpace, (uint)(CollisionCategories.Space |
+                                                        CollisionCategories.Geom |
+                                                        CollisionCategories.Character |
+                                                        CollisionCategories.Phantom |
+                                                        CollisionCategories.VolumeDtc
+                                                        ));
+                d.GeomSetCollideBits(ActiveSpace, (uint)(CollisionCategories.Space |
+                                                        CollisionCategories.Geom |
+                                                        CollisionCategories.Character |
+                                                        CollisionCategories.Phantom |
+                                                        CollisionCategories.VolumeDtc
+                                                        ));
+                d.GeomSetCategoryBits(CharsSpace, (uint)(CollisionCategories.Space |
+                                        CollisionCategories.Geom |
+                                        CollisionCategories.Character |
+                                        CollisionCategories.Phantom |
+                                        CollisionCategories.VolumeDtc
+                                        ));
+                d.GeomSetCollideBits(CharsSpace, 0);
+
+                d.GeomSetCategoryBits(StaticSpace, (uint)(CollisionCategories.Space |
+                                                        CollisionCategories.Geom |
+//                                                        CollisionCategories.Land |
+//                                                        CollisionCategories.Water |
+                                                        CollisionCategories.Phantom |
+                                                        CollisionCategories.VolumeDtc
+                                                        ));
+                d.GeomSetCollideBits(StaticSpace, 0);
+
+                d.GeomSetCategoryBits(GroundSpace, (uint)(CollisionCategories.Land));
+                d.GeomSetCollideBits(GroundSpace, 0);
+
+                contactgroup = d.JointGroupCreate(0);
+                //contactgroup
+
+                SharedRay = d.CreateRay(TopSpace, 1.0f);
+
+                d.WorldSetAutoDisableFlag(world, false);
+            }
+        }
+
+        // Initialize the mesh plugin
+//        public override void Initialise(IMesher meshmerizer, IConfigSource config, RegionInfo region )
+        public override void Initialise(IMesher meshmerizer, IConfigSource config)
+        {
+//            checkThread();
+            mesher = meshmerizer;
+            m_config = config;
+
+            string ode_config = d.GetConfiguration();
+            if (ode_config != null && ode_config != "")
+            {
+                m_log.WarnFormat("ODE configuration: {0}", ode_config);
+
+                if (ode_config.Contains("ODE_Ubit"))
+                {
+                    OdeUbitLib = true;
+                }
+            }
+
+            /*
+                        if (region != null)
+                        {
+                            WorldExtents.X = region.RegionSizeX;
+                            WorldExtents.Y = region.RegionSizeY;
+                        }
+             */
+
+            // Defaults
+
+            int contactsPerCollision = 80;
+
+            IConfig physicsconfig = null;
+
+            if (m_config != null)
+            {
+                physicsconfig = m_config.Configs["ODEPhysicsSettings"];
+                if (physicsconfig != null)
+                {
+                    gravityx = physicsconfig.GetFloat("world_gravityx", gravityx);
+                    gravityy = physicsconfig.GetFloat("world_gravityy", gravityy);
+                    gravityz = physicsconfig.GetFloat("world_gravityz", gravityz);
+
+                    metersInSpace = physicsconfig.GetFloat("meters_in_small_space", metersInSpace);
+
+                    contactsurfacelayer = physicsconfig.GetFloat("world_contact_surface_layer", contactsurfacelayer);
+
+                    ODE_STEPSIZE = physicsconfig.GetFloat("world_stepsize", ODE_STEPSIZE);
+                    m_physicsiterations = physicsconfig.GetInt("world_internal_steps_without_collisions", m_physicsiterations);
+
+                    avDensity = physicsconfig.GetFloat("av_density", avDensity);
+                    avMovementDivisorWalk = physicsconfig.GetFloat("av_movement_divisor_walk", avMovementDivisorWalk);
+                    avMovementDivisorRun = physicsconfig.GetFloat("av_movement_divisor_run", avMovementDivisorRun);
+
+                    contactsPerCollision = physicsconfig.GetInt("contacts_per_collision", contactsPerCollision);
+
+                    geomContactPointsStartthrottle = physicsconfig.GetInt("geom_contactpoints_start_throttling", 3);
+                    geomUpdatesPerThrottledUpdate = physicsconfig.GetInt("geom_updates_before_throttled_update", 15);
+//                    geomCrossingFailuresBeforeOutofbounds = physicsconfig.GetInt("geom_crossing_failures_before_outofbounds", 5);
+
+                    geomDefaultDensity = physicsconfig.GetFloat("geometry_default_density", geomDefaultDensity);
+                    bodyFramesAutoDisable = physicsconfig.GetInt("body_frames_auto_disable", bodyFramesAutoDisable);
+
+                    physics_logging = physicsconfig.GetBoolean("physics_logging", false);
+                    physics_logging_interval = physicsconfig.GetInt("physics_logging_interval", 0);
+                    physics_logging_append_existing_logfile = physicsconfig.GetBoolean("physics_logging_append_existing_logfile", false);
+
+                    minimumGroundFlightOffset = physicsconfig.GetFloat("minimum_ground_flight_offset", minimumGroundFlightOffset);
+                    maximumMassObject = physicsconfig.GetFloat("maximum_mass_object", maximumMassObject);
+                }
+            }
+
+            m_meshWorker = new ODEMeshWorker(this, m_log, meshmerizer, physicsconfig);
+
+            HalfOdeStep = ODE_STEPSIZE * 0.5f;
+            odetimestepMS = (int)(1000.0f * ODE_STEPSIZE +0.5f);
+
+            ContactgeomsArray = Marshal.AllocHGlobal(contactsPerCollision * d.ContactGeom.unmanagedSizeOf);
+            GlobalContactsArray = Marshal.AllocHGlobal(maxContactsbeforedeath * d.Contact.unmanagedSizeOf);
+
+            m_materialContactsData[(int)Material.Stone].mu = 0.8f;
+            m_materialContactsData[(int)Material.Stone].bounce = 0.4f;
+
+            m_materialContactsData[(int)Material.Metal].mu = 0.3f;
+            m_materialContactsData[(int)Material.Metal].bounce = 0.4f;
+
+            m_materialContactsData[(int)Material.Glass].mu = 0.2f;
+            m_materialContactsData[(int)Material.Glass].bounce = 0.7f;
+
+            m_materialContactsData[(int)Material.Wood].mu = 0.6f;
+            m_materialContactsData[(int)Material.Wood].bounce = 0.5f;
+
+            m_materialContactsData[(int)Material.Flesh].mu = 0.9f;
+            m_materialContactsData[(int)Material.Flesh].bounce = 0.3f;
+
+            m_materialContactsData[(int)Material.Plastic].mu = 0.4f;
+            m_materialContactsData[(int)Material.Plastic].bounce = 0.7f;
+
+            m_materialContactsData[(int)Material.Rubber].mu = 0.9f;
+            m_materialContactsData[(int)Material.Rubber].bounce = 0.95f;
+
+            m_materialContactsData[(int)Material.light].mu = 0.0f;
+            m_materialContactsData[(int)Material.light].bounce = 0.0f;
+
+            // Set the gravity,, don't disable things automatically (we set it explicitly on some things)
+
+            d.WorldSetGravity(world, gravityx, gravityy, gravityz);
+            d.WorldSetContactSurfaceLayer(world, contactsurfacelayer);
+
+            d.WorldSetLinearDamping(world, 0.002f);
+            d.WorldSetAngularDamping(world, 0.002f);
+            d.WorldSetAngularDampingThreshold(world, 0f);
+            d.WorldSetLinearDampingThreshold(world, 0f);
+            d.WorldSetMaxAngularSpeed(world, 100f);
+
+            d.WorldSetCFM(world,1e-6f); // a bit harder than default
+            //d.WorldSetCFM(world, 1e-4f); // a bit harder than default
+            d.WorldSetERP(world, 0.6f); // higher than original
+
+            // Set how many steps we go without running collision testing
+            // This is in addition to the step size.
+            // Essentially Steps * m_physicsiterations
+            d.WorldSetQuickStepNumIterations(world, m_physicsiterations);
+
+            d.WorldSetContactMaxCorrectingVel(world, 60.0f);
+
+            spacesPerMeter = 1 / metersInSpace;
+            spaceGridMaxX = (int)(WorldExtents.X * spacesPerMeter);
+            spaceGridMaxY = (int)(WorldExtents.Y * spacesPerMeter);
+
+            staticPrimspace = new IntPtr[spaceGridMaxX, spaceGridMaxY];
+
+            // create all spaces now
+            int i, j;
+            IntPtr newspace;
+
+            for (i = 0; i < spaceGridMaxX; i++)
+                for (j = 0; j < spaceGridMaxY; j++)
+                {
+                    newspace = d.HashSpaceCreate(StaticSpace);
+                    d.GeomSetCategoryBits(newspace, (int)CollisionCategories.Space);
+                    waitForSpaceUnlock(newspace);
+                    d.SpaceSetSublevel(newspace, 2);
+                    d.HashSpaceSetLevels(newspace, -2, 8);
+                    d.GeomSetCategoryBits(newspace, (uint)(CollisionCategories.Space |
+                                        CollisionCategories.Geom |
+                                        CollisionCategories.Land |
+                                        CollisionCategories.Water |
+                                        CollisionCategories.Phantom |
+                                        CollisionCategories.VolumeDtc
+                                        ));
+                    d.GeomSetCollideBits(newspace, 0);
+
+                    staticPrimspace[i, j] = newspace;
+                }
+            // let this now be real maximum values
+            spaceGridMaxX--;
+            spaceGridMaxY--;
+
+            // create 4 off world spaces (x<0,x>max,y<0,y>max)
+            staticPrimspaceOffRegion = new IntPtr[4];
+
+            for (i = 0; i < 4; i++)
+                {
+                    newspace = d.HashSpaceCreate(StaticSpace);
+                    d.GeomSetCategoryBits(newspace, (int)CollisionCategories.Space);
+                    waitForSpaceUnlock(newspace);
+                    d.SpaceSetSublevel(newspace, 2);
+                    d.HashSpaceSetLevels(newspace, -2, 8);
+                    d.GeomSetCategoryBits(newspace, (uint)(CollisionCategories.Space |
+                                        CollisionCategories.Geom |
+                                        CollisionCategories.Land |
+                                        CollisionCategories.Water |
+                                        CollisionCategories.Phantom |
+                                        CollisionCategories.VolumeDtc
+                                        ));
+                    d.GeomSetCollideBits(newspace, 0);
+
+                    staticPrimspaceOffRegion[i] = newspace;
+                }
+
+            m_lastframe = DateTime.UtcNow;
+            m_lastMeshExpire = m_lastframe;
+        }
+
+        internal void waitForSpaceUnlock(IntPtr space)
+        {
+            //if (space != IntPtr.Zero)
+                //while (d.SpaceLockQuery(space)) { } // Wait and do nothing
+        }
+
+        #region Collision Detection
+
+        // sets a global contact for a joint for contactgeom , and base contact description)
+
+        private IntPtr CreateContacJoint(ref d.ContactGeom contactGeom, float mu, float bounce, float cfm, float erpscale, float dscale)
+        {
+            if (GlobalContactsArray == IntPtr.Zero || m_global_contactcount >= maxContactsbeforedeath)
+                return IntPtr.Zero;
+
+            float erp = contactGeom.depth;
+            erp *= erpscale;
+            if (erp < minERP)
+                erp = minERP;
+            else if (erp > MaxERP)
+                erp = MaxERP;
+
+            float depth = contactGeom.depth * dscale;
+            if (depth > 0.5f)
+                depth = 0.5f;
+
+            d.Contact newcontact = new d.Contact();
+            newcontact.geom.depth = depth;
+            newcontact.geom.g1 = contactGeom.g1;
+            newcontact.geom.g2 = contactGeom.g2;
+            newcontact.geom.pos = contactGeom.pos;
+            newcontact.geom.normal = contactGeom.normal;
+            newcontact.geom.side1 = contactGeom.side1;
+            newcontact.geom.side2 = contactGeom.side2;
+
+            // this needs bounce also
+            newcontact.surface.mode = comumContactFlags;
+            newcontact.surface.mu = mu;
+            newcontact.surface.bounce = bounce;
+            newcontact.surface.soft_cfm = cfm;
+            newcontact.surface.soft_erp = erp;
+
+            IntPtr contact = new IntPtr(GlobalContactsArray.ToInt64() + (Int64)(m_global_contactcount * d.Contact.unmanagedSizeOf));
+            Marshal.StructureToPtr(newcontact, contact, true);
+            return d.JointCreateContactPtr(world, contactgroup, contact);
+        }
+
+        private bool GetCurContactGeom(int index, ref d.ContactGeom newcontactgeom)
+        {
+            if (ContactgeomsArray == IntPtr.Zero || index >= contactsPerCollision)
+                return false;
+
+            IntPtr contactptr = new IntPtr(ContactgeomsArray.ToInt64() + (Int64)(index * d.ContactGeom.unmanagedSizeOf));
+            newcontactgeom = (d.ContactGeom)Marshal.PtrToStructure(contactptr, typeof(d.ContactGeom));
+            return true;
+        }
+
+        /// <summary>
+        /// This is our near callback.  A geometry is near a body
+        /// </summary>
+        /// <param name="space">The space that contains the geoms.  Remember, spaces are also geoms</param>
+        /// <param name="g1">a geometry or space</param>
+        /// <param name="g2">another geometry or space</param>
+        /// 
+
+        private void near(IntPtr space, IntPtr g1, IntPtr g2)
+        {
+            //  no lock here!  It's invoked from within Simulate(), which is thread-locked
+
+            if (m_global_contactcount >= maxContactsbeforedeath)
+                return;
+
+            // Test if we're colliding a geom with a space.
+            // If so we have to drill down into the space recursively
+
+            if (g1 == IntPtr.Zero || g2 == IntPtr.Zero)
+                return;
+
+            if (d.GeomIsSpace(g1) || d.GeomIsSpace(g2))
+            {
+                // We'll be calling near recursivly if one
+                // of them is a space to find all of the
+                // contact points in the space
+                try
+                {
+                    d.SpaceCollide2(g1, g2, IntPtr.Zero, nearCallback);
+                }
+                catch (AccessViolationException)
+                {
+                    m_log.Warn("[PHYSICS]: Unable to collide test a space");
+                    return;
+                }
+                //here one should check collisions of geoms inside a space
+                // but on each space we only should have geoms that not colide amoung each other
+                // so we don't dig inside spaces
+                return;
+            }
+
+            // get geom bodies to check if we already a joint contact
+            // guess this shouldn't happen now
+            IntPtr b1 = d.GeomGetBody(g1);
+            IntPtr b2 = d.GeomGetBody(g2);
+
+            // d.GeomClassID id = d.GeomGetClass(g1);
+
+            // Figure out how many contact points we have
+            int count = 0;
+            try
+            {
+                // Colliding Geom To Geom
+                // This portion of the function 'was' blatantly ripped off from BoxStack.cs
+
+                if (g1 == g2)
+                    return; // Can't collide with yourself
+
+                if (b1 != IntPtr.Zero && b2 != IntPtr.Zero && d.AreConnectedExcluding(b1, b2, d.JointType.Contact))
+                    return;
+                /*
+                // debug
+                                PhysicsActor dp2;
+                                if (d.GeomGetClass(g1) == d.GeomClassID.HeightfieldClass)
+                                {
+                                    d.AABB aabb;
+                                    d.GeomGetAABB(g2, out aabb);
+                                    float x = aabb.MaxX - aabb.MinX;
+                                    float y = aabb.MaxY - aabb.MinY;
+                                    float z = aabb.MaxZ - aabb.MinZ;
+                                    if (x > 60.0f || y > 60.0f || z > 60.0f)
+                                    {
+                                        if (!actor_name_map.TryGetValue(g2, out dp2))
+                                            m_log.WarnFormat("[PHYSICS]: failed actor mapping for geom 2");
+                                        else
+                                            m_log.WarnFormat("[PHYSICS]: land versus large prim geo {0},size {1}, AABBsize <{2},{3},{4}>, at {5} ori {6},({7})",
+                                                dp2.Name, dp2.Size, x, y, z,
+                                                dp2.Position.ToString(),
+                                                dp2.Orientation.ToString(),
+                                                dp2.Orientation.Length());
+                                        return;
+                                    }
+                                }
+                //
+                */
+
+
+                if (d.GeomGetCategoryBits(g1) == (uint)CollisionCategories.VolumeDtc ||
+                    d.GeomGetCategoryBits(g2) == (uint)CollisionCategories.VolumeDtc)
+                {
+                    int cflags;
+                    unchecked
+                    {
+                        cflags = (int)(1 | d.CONTACTS_UNIMPORTANT);
+                    }
+                    count = d.CollidePtr(g1, g2, cflags, ContactgeomsArray, d.ContactGeom.unmanagedSizeOf);
+                }
+                else
+                    count = d.CollidePtr(g1, g2, (contactsPerCollision & 0xffff), ContactgeomsArray, d.ContactGeom.unmanagedSizeOf);
+            }
+            catch (SEHException)
+            {
+                m_log.Error("[PHYSICS]: The Operating system shut down ODE because of corrupt memory.  This could be a result of really irregular terrain.  If this repeats continuously, restart using Basic Physics and terrain fill your terrain.  Restarting the sim.");
+                //                ode.drelease(world);
+                base.TriggerPhysicsBasedRestart();
+            }
+            catch (Exception e)
+            {
+                m_log.WarnFormat("[PHYSICS]: Unable to collide test an object: {0}", e.Message);
+                return;
+            }
+
+            // contacts done
+            if (count == 0)
+                return;
+
+            // try get physical actors 
+            PhysicsActor p1;
+            PhysicsActor p2;
+
+            if (!actor_name_map.TryGetValue(g1, out p1))
+            {
+                m_log.WarnFormat("[PHYSICS]: failed actor mapping for geom 1");
+                return;
+            }
+
+            if (!actor_name_map.TryGetValue(g2, out p2))
+            {
+                m_log.WarnFormat("[PHYSICS]: failed actor mapping for geom 2");
+                return;
+            }
+
+            // update actors collision score
+            if (p1.CollisionScore >= float.MaxValue - count)
+                p1.CollisionScore = 0;
+            p1.CollisionScore += count;
+
+            if (p2.CollisionScore >= float.MaxValue - count)
+                p2.CollisionScore = 0;
+            p2.CollisionScore += count;
+
+            // get first contact
+            d.ContactGeom curContact = new d.ContactGeom();
+
+            if (!GetCurContactGeom(0, ref curContact))
+                return;
+
+            // do volume detection case
+            if ((p1.IsVolumeDtc || p2.IsVolumeDtc))
+            {
+                ContactPoint maxDepthContact = new ContactPoint(
+                    new Vector3(curContact.pos.X, curContact.pos.Y, curContact.pos.Z),
+                    new Vector3(curContact.normal.X, curContact.normal.Y, curContact.normal.Z),
+                    curContact.depth, false
+                    );
+
+                collision_accounting_events(p1, p2, maxDepthContact);
+                return;
+            }
+
+            // big messy collision analises
+
+            float mu = 0;
+            float bounce = 0;
+            float cfm = 0.0001f;
+            float erpscale = 1.0f;
+            float dscale = 1.0f;
+            bool IgnoreNegSides = false;
+
+            ContactData contactdata1 = new ContactData(0, 0, false);
+            ContactData contactdata2 = new ContactData(0, 0, false);
+
+            bool dop1ava = false;
+            bool dop2ava = false;
+            bool ignore = false;
+
+            switch (p1.PhysicsActorType)
+            {
+                case (int)ActorTypes.Agent:
+                    {
+                        dop1ava = true;
+                        switch (p2.PhysicsActorType)
+                        {
+                            case (int)ActorTypes.Agent:
+                                p1.CollidingObj = true;
+                                p2.CollidingObj = true;
+                                break;
+
+                            case (int)ActorTypes.Prim:
+                                if (p2.Velocity.LengthSquared() > 0.0f)
+                                    p2.CollidingObj = true;
+                                break;
+
+                            default:
+                                ignore = true; // avatar to terrain and water ignored
+                                break;
+                        }
+                        break;
+                    }
+
+                case (int)ActorTypes.Prim:
+                    switch (p2.PhysicsActorType)
+                    {
+                        case (int)ActorTypes.Agent:
+
+                            dop2ava = true;
+
+                            if (p1.Velocity.LengthSquared() > 0.0f)
+                                p1.CollidingObj = true;
+                            break;
+
+                        case (int)ActorTypes.Prim:
+                            if ((p1.Velocity - p2.Velocity).LengthSquared() > 0.0f)
+                            {
+                                p1.CollidingObj = true;
+                                p2.CollidingObj = true;
+                            }
+                            p1.getContactData(ref contactdata1);
+                            p2.getContactData(ref contactdata2);
+                            bounce = contactdata1.bounce * contactdata2.bounce;
+                            mu = (float)Math.Sqrt(contactdata1.mu * contactdata2.mu);
+
+                            cfm = p1.Mass;
+                            if (cfm > p2.Mass)
+                                cfm = p2.Mass;
+                            dscale = 10 / cfm;
+                            dscale = (float)Math.Sqrt(dscale);
+                            if (dscale > 1.0f)
+                                dscale = 1.0f;
+                            erpscale = cfm * 0.01f;
+                            cfm = 0.0001f / cfm;
+                            if (cfm > 0.01f)
+                                cfm = 0.01f;
+                            else if (cfm < 0.00001f)
+                                cfm = 0.00001f;
+
+                            if ((Math.Abs(p2.Velocity.X - p1.Velocity.X) > 0.1f || Math.Abs(p2.Velocity.Y - p1.Velocity.Y) > 0.1f))
+                                mu *= frictionMovementMult;
+
+                            break;
+
+                        case (int)ActorTypes.Ground:
+                            p1.getContactData(ref contactdata1);
+                            bounce = contactdata1.bounce * TerrainBounce;
+                            mu = (float)Math.Sqrt(contactdata1.mu * TerrainFriction);
+                            if (Math.Abs(p1.Velocity.X) > 0.1f || Math.Abs(p1.Velocity.Y) > 0.1f)
+                                mu *= frictionMovementMult;
+                            p1.CollidingGround = true;
+
+                            cfm = p1.Mass;
+                            dscale = 10 / cfm;
+                            dscale = (float)Math.Sqrt(dscale);
+                            if (dscale > 1.0f)
+                                dscale = 1.0f;
+                            erpscale = cfm * 0.01f;
+                            cfm = 0.0001f / cfm;
+                            if (cfm > 0.01f)
+                                cfm = 0.01f;
+                            else if (cfm < 0.00001f)
+                                cfm = 0.00001f;
+
+                            if (d.GeomGetClass(g1) == d.GeomClassID.TriMeshClass)
+                            {
+                                if (curContact.side1 > 0)
+                                    IgnoreNegSides = true;
+                            }
+                            break;
+
+                        case (int)ActorTypes.Water:
+                        default:
+                            ignore = true;
+                            break;
+                    }
+                    break;
+
+                case (int)ActorTypes.Ground:
+                    if (p2.PhysicsActorType == (int)ActorTypes.Prim)
+                    {
+                        p2.CollidingGround = true;
+                        p2.getContactData(ref contactdata2);
+                        bounce = contactdata2.bounce * TerrainBounce;
+                        mu = (float)Math.Sqrt(contactdata2.mu * TerrainFriction);
+
+                        cfm = p2.Mass;
+                        dscale = 10 / cfm;
+                        dscale = (float)Math.Sqrt(dscale);
+
+                        if (dscale > 1.0f)
+                            dscale = 1.0f;
+
+                        erpscale = cfm * 0.01f;
+                        cfm = 0.0001f / cfm;
+                        if (cfm > 0.01f)
+                            cfm = 0.01f;
+                        else if (cfm < 0.00001f)
+                            cfm = 0.00001f;
+
+                        if (curContact.side1 > 0) // should be 2 ?
+                            IgnoreNegSides = true;
+
+                        if (Math.Abs(p2.Velocity.X) > 0.1f || Math.Abs(p2.Velocity.Y) > 0.1f)
+                            mu *= frictionMovementMult;
+                    }
+                    else
+                        ignore = true;
+                    break;
+
+                case (int)ActorTypes.Water:
+                default:
+                    break;
+            }
+
+            if (ignore)
+                return;
+
+
+            d.ContactGeom maxContact = curContact;
+            //            if (IgnoreNegSides && curContact.side1 < 0)
+            //                maxContact.depth = float.MinValue;
+
+            d.ContactGeom minContact = curContact;
+            //            if (IgnoreNegSides && curContact.side1 < 0)
+            //                minContact.depth = float.MaxValue;
+
+            IntPtr Joint;
+            bool FeetCollision = false;
+            int ncontacts = 0;
+
+
+            int i = 0;
+
+            while (true)
+            {
+
+//                    if (!(IgnoreNegSides && curContact.side1 < 0))
+                {
+                    bool noskip = true;
+                    if (dop1ava)
+                    {
+                        if (!(((OdeCharacter)p1).Collide(g1, false, ref curContact, ref FeetCollision)))
+
+                            noskip = false;
+                    }
+                    else if (dop2ava)
+                    {
+                        if (!(((OdeCharacter)p2).Collide(g2, true, ref curContact, ref FeetCollision)))
+                            noskip = false;
+                    }
+
+                    if (noskip)
+                    {
+                        m_global_contactcount++;
+                        if (m_global_contactcount >= maxContactsbeforedeath)
+                            break;
+
+                        ncontacts++;
+
+                        Joint = CreateContacJoint(ref curContact, mu, bounce, cfm, erpscale, dscale);
+                        if (Joint == IntPtr.Zero)
+                            break;
+
+                        d.JointAttach(Joint, b1, b2);
+
+                        if (curContact.depth > maxContact.depth)
+                            maxContact = curContact;
+
+                        if (curContact.depth < minContact.depth)
+                            minContact = curContact;
+                    }
+                }
+
+                if (++i >= count)
+                    break;
+
+                if (!GetCurContactGeom(i, ref curContact))
+                    break;
+            }
+
+            if (ncontacts > 0)
+            {
+                ContactPoint maxDepthContact = new ContactPoint(
+                            new Vector3(maxContact.pos.X, maxContact.pos.Y, maxContact.pos.Z),
+                            new Vector3(minContact.normal.X, minContact.normal.Y, minContact.normal.Z),
+                            maxContact.depth, FeetCollision
+                            );
+                collision_accounting_events(p1, p2, maxDepthContact);
+            }
+        }
+
+        private void collision_accounting_events(PhysicsActor p1, PhysicsActor p2, ContactPoint contact)
+        {
+            uint obj2LocalID = 0;
+
+            bool p1events = p1.SubscribedEvents();
+            bool p2events = p2.SubscribedEvents();
+
+            if (p1.IsVolumeDtc)
+                p2events = false;
+            if (p2.IsVolumeDtc)
+                p1events = false;
+
+            if (!p2events && !p1events)
+                return;
+
+            Vector3 vel = Vector3.Zero;
+            if (p2 != null && p2.IsPhysical)
+                vel = p2.Velocity;
+
+            if (p1 != null && p1.IsPhysical)
+                vel -= p1.Velocity;
+
+            contact.RelativeSpeed = Vector3.Dot(vel, contact.SurfaceNormal);
+
+            switch ((ActorTypes)p1.PhysicsActorType)
+            {
+                case ActorTypes.Agent:
+                case ActorTypes.Prim:
+                    {
+                        switch ((ActorTypes)p2.PhysicsActorType)
+                        {
+                            case ActorTypes.Agent:
+                            case ActorTypes.Prim:
+                                if (p2events)
+                                {
+                                    AddCollisionEventReporting(p2);
+                                    p2.AddCollisionEvent(p1.ParentActor.LocalID, contact);
+                                }
+                                obj2LocalID = p2.ParentActor.LocalID;
+                                break;
+
+                            case ActorTypes.Ground:
+                            case ActorTypes.Unknown:
+                            default:
+                                obj2LocalID = 0;
+                                break;
+                        }
+                        if (p1events)
+                        {
+                            contact.SurfaceNormal = -contact.SurfaceNormal;
+                            AddCollisionEventReporting(p1);
+                            p1.AddCollisionEvent(obj2LocalID, contact);
+                        }
+                        break;
+                    }
+                case ActorTypes.Ground:
+                case ActorTypes.Unknown:
+                default:
+                    {
+                        if (p2events && !p2.IsVolumeDtc)
+                        {
+                            AddCollisionEventReporting(p2);
+                            p2.AddCollisionEvent(0, contact);
+                        }
+                        break;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// This is our collision testing routine in ODE
+        /// </summary>
+        /// <param name="timeStep"></param>
+        private void collision_optimized()
+        {
+            lock (_characters)
+                {
+                try
+                {
+                    foreach (OdeCharacter chr in _characters)
+                    {
+                        if (chr == null || chr.Body == IntPtr.Zero)
+                            continue;
+
+                        chr.IsColliding = false;
+                        //                    chr.CollidingGround = false; not done here
+                        chr.CollidingObj = false;
+                        // do colisions with static space
+                        d.SpaceCollide2(chr.collider, StaticSpace, IntPtr.Zero, nearCallback);
+
+                        // chars with chars
+                        d.SpaceCollide(CharsSpace, IntPtr.Zero, nearCallback);
+                        // no coll with gnd
+                    }
+                }
+                catch (AccessViolationException)
+                {
+                    m_log.Warn("[PHYSICS]: Unable to collide Character to static space");
+                }
+
+            }
+
+            lock (_activeprims)
+            {
+                foreach (OdePrim aprim in _activeprims)
+                {
+                    aprim.CollisionScore = 0;
+                    aprim.IsColliding = false;
+                }
+            }
+
+            // collide active prims with static enviroment
+            lock (_activegroups)
+            {
+                try
+                {
+                    foreach (OdePrim prm in _activegroups)
+                    {
+                        if (!prm.m_outbounds)
+                        {
+                            if (d.BodyIsEnabled(prm.Body))
+                            {
+                                d.SpaceCollide2(StaticSpace, prm.collide_geom, IntPtr.Zero, nearCallback);
+                                d.SpaceCollide2(GroundSpace, prm.collide_geom, IntPtr.Zero, nearCallback);
+                            }
+                        }
+                    }
+                }
+                catch (AccessViolationException)
+                {
+                    m_log.Warn("[PHYSICS]: Unable to collide Active prim to static space");
+                }
+            }
+            // colide active amoung them
+            try
+            {
+                d.SpaceCollide(ActiveSpace, IntPtr.Zero, nearCallback);
+            }
+            catch (AccessViolationException)
+            {
+                m_log.Warn("[PHYSICS]: Unable to collide Active with Characters space");
+            }
+            // and with chars
+            try
+            {
+                d.SpaceCollide2(CharsSpace,ActiveSpace, IntPtr.Zero, nearCallback);
+            }
+            catch (AccessViolationException)
+            {
+                m_log.Warn("[PHYSICS]: Unable to collide in Active space");
+            }
+            //            _perloopContact.Clear();
+        }
+
+        #endregion
+        /// <summary>
+        /// Add actor to the list that should receive collision events in the simulate loop.
+        /// </summary>
+        /// <param name="obj"></param>
+        public void AddCollisionEventReporting(PhysicsActor obj)
+        {
+            if (!_collisionEventPrim.Contains(obj))
+                _collisionEventPrim.Add(obj);
+        }
+
+        /// <summary>
+        /// Remove actor from the list that should receive collision events in the simulate loop.
+        /// </summary>
+        /// <param name="obj"></param>
+        public void RemoveCollisionEventReporting(PhysicsActor obj)
+        {
+            if (_collisionEventPrim.Contains(obj) && !_collisionEventPrimRemove.Contains(obj))
+                _collisionEventPrimRemove.Add(obj);
+        }
+
+        public override float TimeDilation
+        {
+            get { return m_timeDilation; }
+        }
+
+        public override bool SupportsNINJAJoints
+        {
+            get { return false; }
+        }
+
+        #region Add/Remove Entities
+
+        public override PhysicsActor AddAvatar(uint localID, string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying)
+        {
+            Vector3 pos;
+            pos.X = position.X;
+            pos.Y = position.Y;
+            pos.Z = position.Z;
+            OdeCharacter newAv = new OdeCharacter(localID,avName, this, pos, size, feetOffset, avDensity, avMovementDivisorWalk, avMovementDivisorRun);
+            newAv.Flying = isFlying;
+            newAv.MinimumGroundFlightOffset = minimumGroundFlightOffset;
+            
+            return newAv;
+        }
+
+        public void AddCharacter(OdeCharacter chr)
+        {
+            lock (_characters)
+            {
+                if (!_characters.Contains(chr))
+                {
+                    _characters.Add(chr);
+                    if (chr.bad)
+                        m_log.DebugFormat("[PHYSICS] Added BAD actor {0} to characters list", chr.m_uuid);
+                }
+            }
+        }
+
+        public void RemoveCharacter(OdeCharacter chr)
+        {
+            lock (_characters)
+            {
+                if (_characters.Contains(chr))
+                {
+                    _characters.Remove(chr);
+                }
+            }
+        }
+
+        public void BadCharacter(OdeCharacter chr)
+        {
+            lock (_badCharacter)
+            {
+                if (!_badCharacter.Contains(chr))
+                    _badCharacter.Add(chr);
+            }
+        }
+
+        public override void RemoveAvatar(PhysicsActor actor)
+        {
+            //m_log.Debug("[PHYSICS]:ODELOCK");
+            ((OdeCharacter) actor).Destroy();
+        }
+
+
+        public void addActivePrim(OdePrim activatePrim)
+        {
+            // adds active prim..   
+            lock (_activeprims)
+            {
+                if (!_activeprims.Contains(activatePrim))
+                    _activeprims.Add(activatePrim);
+            }
+        }
+
+        public void addActiveGroups(OdePrim activatePrim)
+        {
+            lock (_activegroups)
+            {
+                if (!_activegroups.Contains(activatePrim))
+                    _activegroups.Add(activatePrim);
+            }
+        }
+
+        private PhysicsActor AddPrim(String name, Vector3 position, Vector3 size, Quaternion rotation,
+                                     PrimitiveBaseShape pbs, bool isphysical, bool isPhantom, byte shapeType, uint localID)
+        {
+            OdePrim newPrim;
+            lock (OdeLock)
+            {
+                newPrim = new OdePrim(name, this, position, size, rotation, pbs, isphysical, isPhantom, shapeType, localID);
+                lock (_prims)
+                    _prims.Add(newPrim);
+            }
+            return newPrim;
+        }
+
+        public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
+                                                  Vector3 size, Quaternion rotation, bool isPhysical, bool isPhantom, uint localid)
+        {
+            return AddPrim(primName, position, size, rotation, pbs, isPhysical, isPhantom, 0 , localid);
+        }
+
+
+        public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
+                                                  Vector3 size, Quaternion rotation, bool isPhysical, uint localid)
+        {
+            return AddPrim(primName, position, size, rotation, pbs, isPhysical,false, 0, localid);
+        }
+
+        public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
+                                                  Vector3 size, Quaternion rotation, bool isPhysical, bool isPhantom, byte shapeType, uint localid)
+        {
+
+            return AddPrim(primName, position, size, rotation, pbs, isPhysical,isPhantom, shapeType, localid);
+        }
+
+        public void remActivePrim(OdePrim deactivatePrim)
+        {
+            lock (_activeprims)
+            {
+                _activeprims.Remove(deactivatePrim);
+            }
+        }
+        public void remActiveGroup(OdePrim deactivatePrim)
+        {
+            lock (_activegroups)
+            {
+                _activegroups.Remove(deactivatePrim);
+            }
+        }
+
+        public override void RemovePrim(PhysicsActor prim)
+        {
+            // As with all ODE physics operations, we don't remove the prim immediately but signal that it should be
+            // removed in the next physics simulate pass.
+            if (prim is OdePrim)
+            {
+//                lock (OdeLock)
+                {
+                    
+                    OdePrim p = (OdePrim)prim;
+                    p.setPrimForRemoval();
+                }
+            }
+        }
+        /// <summary>
+        /// This is called from within simulate but outside the locked portion
+        /// We need to do our own locking here
+        /// (Note: As of 20110801 this no longer appears to be true - this is being called within lock (odeLock) in
+        /// Simulate() -- justincc).
+        ///
+        /// Essentially, we need to remove the prim from our space segment, whatever segment it's in.
+        ///
+        /// If there are no more prim in the segment, we need to empty (spacedestroy)the segment and reclaim memory
+        /// that the space was using.
+        /// </summary>
+        /// <param name="prim"></param>
+        public void RemovePrimThreadLocked(OdePrim prim)
+        {
+            //Console.WriteLine("RemovePrimThreadLocked " +  prim.m_primName);
+            lock (prim)
+            {
+//                RemoveCollisionEventReporting(prim);
+                lock (_prims)
+                    _prims.Remove(prim);
+            }
+
+        }
+
+        public bool havePrim(OdePrim prm)
+        {
+            lock (_prims)
+                return _prims.Contains(prm);
+        }
+
+        public bool haveActor(PhysicsActor actor)
+        {
+            if (actor is OdePrim)
+            {
+                lock (_prims)
+                    return _prims.Contains((OdePrim)actor);
+            }
+            else if (actor is OdeCharacter)
+            {
+                lock (_characters)
+                    return _characters.Contains((OdeCharacter)actor);
+            }
+            return false;
+        }
+
+        #endregion
+
+        #region Space Separation Calculation
+
+        /// <summary>
+        /// Called when a static prim moves or becomes static
+        /// Places the prim in a space one the static sub-spaces grid
+        /// </summary>
+        /// <param name="geom">the pointer to the geom that moved</param>
+        /// <param name="pos">the position that the geom moved to</param>
+        /// <param name="currentspace">a pointer to the space it was in before it was moved.</param>
+        /// <returns>a pointer to the new space it's in</returns>
+        public IntPtr MoveGeomToStaticSpace(IntPtr geom, Vector3 pos, IntPtr currentspace)
+        {
+            // moves a prim into another static sub-space or from another space into a static sub-space
+
+            // Called ODEPrim so
+            // it's already in locked space.
+
+            if (geom == IntPtr.Zero) // shouldn't happen
+                return IntPtr.Zero;
+
+            // get the static sub-space for current position
+            IntPtr newspace = calculateSpaceForGeom(pos);
+
+            if (newspace == currentspace) // if we are there all done
+                return newspace;
+
+            // else remove it from its current space
+            if (currentspace != IntPtr.Zero && d.SpaceQuery(currentspace, geom))
+            {
+                if (d.GeomIsSpace(currentspace))
+                {
+                    waitForSpaceUnlock(currentspace);
+                    d.SpaceRemove(currentspace, geom);
+
+                    if (d.SpaceGetSublevel(currentspace) > 2 && d.SpaceGetNumGeoms(currentspace) == 0)
+                    {
+                        d.SpaceDestroy(currentspace);
+                    }
+                }
+                else
+                {
+                    m_log.Info("[Physics]: Invalid or empty Space passed to 'MoveGeomToStaticSpace':" + currentspace +
+                                   " Geom:" + geom);
+                }
+            }
+            else // odd currentspace is null or doesn't contain the geom? lets try the geom ideia of current space
+            {
+                currentspace = d.GeomGetSpace(geom);
+                if (currentspace != IntPtr.Zero)
+                {
+                    if (d.GeomIsSpace(currentspace))
+                    {
+                        waitForSpaceUnlock(currentspace);
+                        d.SpaceRemove(currentspace, geom);
+
+                        if (d.SpaceGetSublevel(currentspace) > 2 && d.SpaceGetNumGeoms(currentspace) == 0)
+                        {
+                            d.SpaceDestroy(currentspace);
+                        }
+
+                    }
+                }
+            }
+
+            // put the geom in the newspace
+            waitForSpaceUnlock(newspace);
+            d.SpaceAdd(newspace, geom);
+
+            // let caller know this newspace
+            return newspace;
+        }
+
+        /// <summary>
+        /// Calculates the space the prim should be in by its position
+        /// </summary>
+        /// <param name="pos"></param>
+        /// <returns>a pointer to the space. This could be a new space or reused space.</returns>
+        public IntPtr calculateSpaceForGeom(Vector3 pos)
+        {
+            int x, y;
+
+            if (pos.X < 0)
+                return staticPrimspaceOffRegion[0];
+
+            if (pos.Y < 0)
+                return staticPrimspaceOffRegion[2];
+
+            x = (int)(pos.X * spacesPerMeter);
+            if (x > spaceGridMaxX)
+                return staticPrimspaceOffRegion[1];
+            
+            y = (int)(pos.Y * spacesPerMeter);
+            if (y > spaceGridMaxY)
+                return staticPrimspaceOffRegion[3];
+
+            return staticPrimspace[x, y];
+        }
+ 
+        #endregion
+
+
+        /// <summary>
+        /// Called to queue a change to a actor
+        /// to use in place of old taint mechanism so changes do have a time sequence
+        /// </summary>
+
+        public void AddChange(PhysicsActor actor, changes what, Object arg)
+        {
+            ODEchangeitem item = new ODEchangeitem();
+            item.actor = actor;
+            item.what = what;
+            item.arg = arg;
+            ChangesQueue.Enqueue(item);
+        }
+
+        /// <summary>
+        /// Called after our prim properties are set Scale, position etc.
+        /// We use this event queue like method to keep changes to the physical scene occuring in the threadlocked mutex
+        /// This assures us that we have no race conditions
+        /// </summary>
+        /// <param name="prim"></param>
+        public override void AddPhysicsActorTaint(PhysicsActor prim)
+        {
+        }
+
+        // does all pending changes generated during region load process
+        public override void PrepareSimulation()
+        {
+            lock (OdeLock)
+            {
+                if (world == IntPtr.Zero)
+                {
+                    ChangesQueue.Clear();
+                    return;
+                }
+
+                ODEchangeitem item;
+
+                int donechanges = 0;
+                if (ChangesQueue.Count > 0)
+                {
+                    m_log.InfoFormat("[ODE] start processing pending actor operations");
+                    int tstart = Util.EnvironmentTickCount();
+
+                    while (ChangesQueue.Dequeue(out item))
+                    {
+                        if (item.actor != null)
+                        {
+                            try
+                            {
+                                if (item.actor is OdeCharacter)
+                                    ((OdeCharacter)item.actor).DoAChange(item.what, item.arg);
+                                else if (((OdePrim)item.actor).DoAChange(item.what, item.arg))
+                                    RemovePrimThreadLocked((OdePrim)item.actor);
+                            }
+                            catch
+                            {
+                                m_log.WarnFormat("[PHYSICS]: Operation failed for a actor {0} {1}",
+                                    item.actor.Name, item.what.ToString());
+                            }
+                        }
+                        donechanges++;
+                    }
+                    int time = Util.EnvironmentTickCountSubtract(tstart);
+                    m_log.InfoFormat("[ODE] finished {0} operations in {1}ms", donechanges, time);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This is our main simulate loop
+        /// It's thread locked by a Mutex in the scene.
+        /// It holds Collisions, it instructs ODE to step through the physical reactions
+        /// It moves the objects around in memory
+        /// It calls the methods that report back to the object owners.. (scenepresence, SceneObjectGroup)
+        /// </summary>
+        /// <param name="timeStep"></param>
+        /// <returns></returns>
+        public override float Simulate(float timeStep)
+        {
+            DateTime now = DateTime.UtcNow;
+            TimeSpan timedif = now - m_lastframe;
+            timeStep = (float)timedif.TotalSeconds;
+            m_lastframe = now;
+            
+            // acumulate time so we can reduce error
+            step_time += timeStep;
+
+            if (step_time < HalfOdeStep)
+                return 0;
+
+            if (framecount < 0)
+                framecount = 0;
+
+
+            framecount++;
+
+            int curphysiteractions;
+
+            // if in trouble reduce step resolution
+            if (step_time >= m_SkipFramesAtms)
+                curphysiteractions = m_physicsiterations / 2;
+            else
+                curphysiteractions = m_physicsiterations;
+
+//            checkThread();
+            int nodeframes = 0;
+
+            lock (SimulationLock)
+                lock(OdeLock)
+            {
+                if (world == IntPtr.Zero)
+                {
+                    ChangesQueue.Clear();
+                    return 0;
+                }
+
+                ODEchangeitem item;
+
+
+                
+                d.WorldSetQuickStepNumIterations(world, curphysiteractions);
+
+                int loopstartMS = Util.EnvironmentTickCount();
+                int looptimeMS = 0;
+                
+
+                while (step_time > HalfOdeStep)
+                {
+                    try
+                    {
+                        // clear pointer/counter to contacts to pass into joints
+                        m_global_contactcount = 0;
+
+                        if (ChangesQueue.Count > 0)
+                        {
+                            int changestartMS = Util.EnvironmentTickCount();
+                            int ttmp;
+                            while (ChangesQueue.Dequeue(out item))
+                            {
+                                if (item.actor != null)
+                                {
+                                    try
+                                    {
+                                        if (item.actor is OdeCharacter)
+                                            ((OdeCharacter)item.actor).DoAChange(item.what, item.arg);
+                                        else if (((OdePrim)item.actor).DoAChange(item.what, item.arg))
+                                            RemovePrimThreadLocked((OdePrim)item.actor);
+                                    }
+                                    catch
+                                    {
+                                        m_log.WarnFormat("[PHYSICS]: doChange failed for a actor {0} {1}",
+                                            item.actor.Name, item.what.ToString());
+                                    }
+                                }
+                                ttmp = Util.EnvironmentTickCountSubtract(changestartMS);
+                                if (ttmp > 20)
+                                    break;
+                            }
+                        }
+
+                        // Move characters
+                        lock (_characters)
+                        {
+                            List<OdeCharacter> defects = new List<OdeCharacter>();
+                            foreach (OdeCharacter actor in _characters)
+                            {
+                                if (actor != null)
+                                    actor.Move(defects);
+                            }
+                            if (defects.Count != 0)
+                            {
+                                foreach (OdeCharacter defect in defects)
+                                {
+                                    RemoveCharacter(defect);
+                                }
+                                defects.Clear();
+                            }
+                        }
+
+                        // Move other active objects
+                        lock (_activegroups)
+                        {
+                            foreach (OdePrim aprim in _activegroups)
+                            {
+                                aprim.Move();
+                            }
+                        }
+
+                        //if ((framecount % m_randomizeWater) == 0)
+                        // randomizeWater(waterlevel);
+
+                        m_rayCastManager.ProcessQueuedRequests();
+
+                        collision_optimized();
+
+                        foreach (PhysicsActor obj in _collisionEventPrim)
+                        {
+                            if (obj == null)
+                                continue;
+
+                            switch ((ActorTypes)obj.PhysicsActorType)
+                            {
+                                case ActorTypes.Agent:
+                                    OdeCharacter cobj = (OdeCharacter)obj;
+                                    cobj.AddCollisionFrameTime((int)(odetimestepMS));
+                                    cobj.SendCollisions();
+                                    break;
+
+                                case ActorTypes.Prim:
+                                    OdePrim pobj = (OdePrim)obj;
+                                    if (pobj.Body == IntPtr.Zero || (d.BodyIsEnabled(pobj.Body) && !pobj.m_outbounds))
+                                    if (!pobj.m_outbounds)
+                                    {
+                                        pobj.AddCollisionFrameTime((int)(odetimestepMS));
+                                        pobj.SendCollisions();
+                                    }
+                                    break;
+                            }
+                        }
+
+                        foreach (PhysicsActor obj in _collisionEventPrimRemove)
+                            _collisionEventPrim.Remove(obj);
+
+                        _collisionEventPrimRemove.Clear();
+
+                        // do a ode simulation step
+                        d.WorldQuickStep(world, ODE_STEPSIZE);
+                        d.JointGroupEmpty(contactgroup);
+
+                        // update managed ideia of physical data and do updates to core
+        /*
+                        lock (_characters)
+                        {
+                            foreach (OdeCharacter actor in _characters)
+                            {
+                                if (actor != null)
+                                {
+                                    if (actor.bad)
+                                        m_log.WarnFormat("[PHYSICS]: BAD Actor {0} in _characters list was not removed?", actor.m_uuid);
+
+                                    actor.UpdatePositionAndVelocity();
+                                }
+                            }
+                        }
+        */
+
+                        lock (_activegroups)
+                        {
+                            {
+                                foreach (OdePrim actor in _activegroups)
+                                {
+                                    if (actor.IsPhysical)
+                                    {
+                                        actor.UpdatePositionAndVelocity();
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat("[PHYSICS]: {0}, {1}, {2}", e.Message, e.TargetSite, e);
+//                        ode.dunlock(world);
+                    }
+
+                    step_time -= ODE_STEPSIZE;
+                    nodeframes++;
+
+                    looptimeMS = Util.EnvironmentTickCountSubtract(loopstartMS);
+                    if (looptimeMS > 100)
+                        break;
+                }
+
+                lock (_badCharacter)
+                {
+                    if (_badCharacter.Count > 0)
+                    {
+                        foreach (OdeCharacter chr in _badCharacter)
+                        {
+                            RemoveCharacter(chr);
+                        }
+
+                        _badCharacter.Clear();
+                    }
+                }
+
+                timedif = now - m_lastMeshExpire;
+
+                if (timedif.Seconds > 10)
+                {
+                    mesher.ExpireReleaseMeshs();
+                    m_lastMeshExpire = now;
+                }
+
+// information block running in debug only
+/*
+                int ntopactivegeoms = d.SpaceGetNumGeoms(ActiveSpace);
+                int ntopstaticgeoms = d.SpaceGetNumGeoms(StaticSpace);
+                int ngroundgeoms = d.SpaceGetNumGeoms(GroundSpace);
+
+                int nactivegeoms = 0;
+                int nactivespaces = 0;
+
+                int nstaticgeoms = 0;
+                int nstaticspaces = 0;
+                IntPtr sp;
+
+                for (int i = 0; i < ntopactivegeoms; i++)
+                {
+                    sp = d.SpaceGetGeom(ActiveSpace, i);
+                    if (d.GeomIsSpace(sp))
+                    {
+                        nactivespaces++;
+                        nactivegeoms += d.SpaceGetNumGeoms(sp);
+                    }
+                    else
+                        nactivegeoms++;
+                }
+
+                for (int i = 0; i < ntopstaticgeoms; i++)
+                {
+                    sp = d.SpaceGetGeom(StaticSpace, i);
+                    if (d.GeomIsSpace(sp))
+                    {
+                        nstaticspaces++;
+                        nstaticgeoms += d.SpaceGetNumGeoms(sp);
+                    }
+                    else
+                        nstaticgeoms++;
+                }
+
+                int ntopgeoms = d.SpaceGetNumGeoms(TopSpace);
+
+                int totgeoms = nstaticgeoms + nactivegeoms + ngroundgeoms + 1; // one ray
+                int nbodies = d.NTotalBodies;
+                int ngeoms = d.NTotalGeoms;
+*/
+                // Finished with all sim stepping. If requested, dump world state to file for debugging.
+                // TODO: This call to the export function is already inside lock (OdeLock) - but is an extra lock needed?
+                // TODO: This overwrites all dump files in-place. Should this be a growing logfile, or separate snapshots?
+                if (physics_logging && (physics_logging_interval > 0) && (framecount % physics_logging_interval == 0))
+                {
+                    string fname = "state-" + world.ToString() + ".DIF"; // give each physics world a separate filename
+                    string prefix = "world" + world.ToString(); // prefix for variable names in exported .DIF file
+
+                    if (physics_logging_append_existing_logfile)
+                    {
+                        string header = "-------------- START OF PHYSICS FRAME " + framecount.ToString() + " --------------";
+                        TextWriter fwriter = File.AppendText(fname);
+                        fwriter.WriteLine(header);
+                        fwriter.Close();
+                    }
+
+                    d.WorldExportDIF(world, fname, physics_logging_append_existing_logfile, prefix);
+                }
+                
+                // think time dilation as to do with dinamic step size that we dont' have
+                // even so tell something to world
+                if (looptimeMS < 100) // we did the requested loops
+                    m_timeDilation = 1.0f;
+                else if (step_time > 0)
+                {
+                    m_timeDilation = timeStep / step_time;
+                    if (m_timeDilation > 1)
+                        m_timeDilation = 1;
+                    if (step_time > m_SkipFramesAtms)
+                        step_time = 0;
+                    m_lastframe = DateTime.UtcNow; // skip also the time lost
+                }
+            }
+
+//            return nodeframes * ODE_STEPSIZE; // return real simulated time
+            return 1000 * nodeframes; // return steps for now * 1000 to keep core happy
+        }
+
+        /// <summary>
+        public override void GetResults()
+        {
+        }
+
+        public override bool IsThreaded
+        {
+            // for now we won't be multithreaded
+            get { return (false); }
+        }
+
+        public float GetTerrainHeightAtXY(float x, float y)
+        {
+
+
+            int offsetX = ((int)(x / (int)Constants.RegionSize)) * (int)Constants.RegionSize;
+            int offsetY = ((int)(y / (int)Constants.RegionSize)) * (int)Constants.RegionSize;
+
+
+            IntPtr heightFieldGeom = IntPtr.Zero;
+
+            // get region map
+            if (!RegionTerrain.TryGetValue(new Vector3(offsetX, offsetY, 0), out heightFieldGeom))
+                return 0f;
+
+            if (heightFieldGeom == IntPtr.Zero)
+                return 0f;
+
+            if (!TerrainHeightFieldHeights.ContainsKey(heightFieldGeom))
+                return 0f;
+
+            // TerrainHeightField for ODE as offset 1m
+            x += 1f - offsetX;
+            y += 1f - offsetY;
+
+            // make position fit into array
+            if (x < 0)
+                x = 0;
+            if (y < 0)
+                y = 0;
+
+            // integer indexs
+            int ix;
+            int iy;
+            //  interpolators offset
+            float dx;
+            float dy;
+
+            int regsize = (int)Constants.RegionSize + 3; // map size see setterrain number of samples
+
+            if (OdeUbitLib)
+            {
+                if (x < regsize - 1)
+                {
+                    ix = (int)x;
+                    dx = x - (float)ix;
+                }
+                else // out world use external height
+                {
+                    ix = regsize - 2;
+                    dx = 0;
+                }
+                if (y < regsize - 1)
+                {
+                    iy = (int)y;
+                    dy = y - (float)iy;
+                }
+                else
+                {
+                    iy = regsize - 2;
+                    dy = 0;
+                }
+            }
+
+            else
+            {
+                // we  still have square fixed size regions
+                // also flip x and y because of how map is done for ODE fliped axis
+                // so ix,iy,dx and dy are inter exchanged
+                if (x < regsize - 1)
+                {
+                    iy = (int)x;
+                    dy = x - (float)iy;
+                }
+                else // out world use external height
+                {
+                    iy = regsize - 2;
+                    dy = 0;
+                }
+                if (y < regsize - 1)
+                {
+                    ix = (int)y;
+                    dx = y - (float)ix;
+                }
+                else
+                {
+                    ix = regsize - 2;
+                    dx = 0;
+                }
+            }
+
+            float h0;
+            float h1;
+            float h2;
+
+            iy *= regsize;
+            iy += ix; // all indexes have iy + ix
+
+            float[] heights = TerrainHeightFieldHeights[heightFieldGeom];
+            /*
+                        if ((dx + dy) <= 1.0f)
+                        {
+                            h0 = ((float)heights[iy]); // 0,0 vertice
+                            h1 = (((float)heights[iy + 1]) - h0) * dx; // 1,0 vertice minus 0,0
+                            h2 = (((float)heights[iy + regsize]) - h0) * dy; // 0,1 vertice minus 0,0
+                        }
+                        else
+                        {
+                            h0 = ((float)heights[iy + regsize + 1]); // 1,1 vertice
+                            h1 = (((float)heights[iy + 1]) - h0) * (1 - dy); // 1,1 vertice minus 1,0
+                            h2 = (((float)heights[iy + regsize]) - h0) * (1 - dx); // 1,1 vertice minus 0,1
+                        }
+            */
+            h0 = ((float)heights[iy]); // 0,0 vertice
+
+            if ((dy > dx))
+            {
+                iy += regsize;
+                h2 = (float)heights[iy]; // 0,1 vertice
+                h1 = (h2 - h0) * dy; // 0,1 vertice minus 0,0
+                h2 = ((float)heights[iy + 1] - h2) * dx; // 1,1 vertice minus 0,1
+            }
+            else
+            {
+                iy++;
+                h2 = (float)heights[iy]; // vertice 1,0
+                h1 = (h2 - h0) * dx; // 1,0 vertice minus 0,0
+                h2 = (((float)heights[iy + regsize]) - h2) * dy; // 1,1 vertice minus 1,0
+            }
+
+            return h0 + h1 + h2;
+        }
+
+
+        public override void SetTerrain(float[] heightMap)
+        {
+            if (m_worldOffset != Vector3.Zero && m_parentScene != null)
+            {
+                if (m_parentScene is OdeScene)
+                {
+                    ((OdeScene)m_parentScene).SetTerrain(heightMap, m_worldOffset);
+                }
+            }
+            else
+            {
+                SetTerrain(heightMap, m_worldOffset);
+            }
+        }
+
+        public override void CombineTerrain(float[] heightMap, Vector3 pOffset)
+        {
+            SetTerrain(heightMap, pOffset);
+        }
+
+        public void SetTerrain(float[] heightMap, Vector3 pOffset)
+        {
+            if (OdeUbitLib)
+                UbitSetTerrain(heightMap, pOffset);
+            else
+                OriSetTerrain(heightMap, pOffset);
+        }
+
+        public void OriSetTerrain(float[] heightMap, Vector3 pOffset)
+        {
+            // assumes 1m size grid and constante size square regions
+            // needs to know about sims around in future
+
+            float[] _heightmap;
+
+            uint heightmapWidth = Constants.RegionSize + 2;
+            uint heightmapHeight = Constants.RegionSize + 2;
+
+            uint heightmapWidthSamples = heightmapWidth + 1;
+            uint heightmapHeightSamples = heightmapHeight + 1;
+
+            _heightmap = new float[heightmapWidthSamples * heightmapHeightSamples];
+
+            const float scale = 1.0f;
+            const float offset = 0.0f;
+            const float thickness = 10f;
+            const int wrap = 0;
+
+            uint regionsize = Constants.RegionSize;
+ 
+            float hfmin = float.MaxValue;
+            float hfmax = float.MinValue;
+            float val;
+            uint xx;
+            uint yy;
+
+            uint maxXXYY = regionsize - 1;
+            // flipping map adding one margin all around so things don't fall in edges
+
+            uint xt = 0;
+            xx = 0;
+
+            for (uint x = 0; x < heightmapWidthSamples; x++)
+            {
+                if (x > 1 && xx < maxXXYY)
+                    xx++;
+                yy = 0;
+                for (uint y = 0; y < heightmapHeightSamples; y++)
+                {
+                    if (y > 1 && y < maxXXYY)
+                        yy += regionsize;
+
+                    val = heightMap[yy + xx];
+                    if (val < 0.0f)
+                        val = 0.0f; // no neg terrain as in chode
+                    _heightmap[xt + y] = val;
+
+                    if (hfmin > val)
+                        hfmin = val;
+                    if (hfmax < val)
+                        hfmax = val;
+                }
+                xt += heightmapHeightSamples;
+            }
+            lock (OdeLock)
+            {
+                IntPtr GroundGeom = IntPtr.Zero;
+                if (RegionTerrain.TryGetValue(pOffset, out GroundGeom))
+                {
+                    RegionTerrain.Remove(pOffset);
+                    if (GroundGeom != IntPtr.Zero)
+                    {
+                        actor_name_map.Remove(GroundGeom);
+                        d.GeomDestroy(GroundGeom);
+
+                        if (TerrainHeightFieldHeights.ContainsKey(GroundGeom))
+                            {
+                            TerrainHeightFieldHeightsHandlers[GroundGeom].Free();
+                            TerrainHeightFieldHeightsHandlers.Remove(GroundGeom);
+                            TerrainHeightFieldHeights.Remove(GroundGeom);
+                            }
+                    }
+                }
+                IntPtr HeightmapData = d.GeomHeightfieldDataCreate();
+
+                GCHandle _heightmaphandler = GCHandle.Alloc(_heightmap, GCHandleType.Pinned);
+
+                d.GeomHeightfieldDataBuildSingle(HeightmapData, _heightmaphandler.AddrOfPinnedObject(), 0, heightmapWidth , heightmapHeight,
+                                                 (int)heightmapWidthSamples, (int)heightmapHeightSamples, scale,
+                                                 offset, thickness, wrap);
+
+                d.GeomHeightfieldDataSetBounds(HeightmapData, hfmin - 1, hfmax + 1);
+
+                GroundGeom = d.CreateHeightfield(GroundSpace, HeightmapData, 1);
+
+                if (GroundGeom != IntPtr.Zero)
+                {
+                    d.GeomSetCategoryBits(GroundGeom, (uint)(CollisionCategories.Land));
+                    d.GeomSetCollideBits(GroundGeom, 0);
+
+                    PhysicsActor pa = new NullPhysicsActor();
+                    pa.Name = "Terrain";
+                    pa.PhysicsActorType = (int)ActorTypes.Ground;
+                    actor_name_map[GroundGeom] = pa;
+
+//                    geom_name_map[GroundGeom] = "Terrain";
+
+                    d.Matrix3 R = new d.Matrix3();
+
+                    Quaternion q1 = Quaternion.CreateFromAxisAngle(new Vector3(1, 0, 0), 1.5707f);
+                    Quaternion q2 = Quaternion.CreateFromAxisAngle(new Vector3(0, 1, 0), 1.5707f);
+
+
+                    q1 = q1 * q2;
+
+                    Vector3 v3;
+                    float angle;
+                    q1.GetAxisAngle(out v3, out angle);
+
+                    d.RFromAxisAndAngle(out R, v3.X, v3.Y, v3.Z, angle);
+                    d.GeomSetRotation(GroundGeom, ref R);
+                    d.GeomSetPosition(GroundGeom, pOffset.X + (float)Constants.RegionSize * 0.5f, pOffset.Y + (float)Constants.RegionSize * 0.5f, 0);
+                    RegionTerrain.Add(pOffset, GroundGeom);
+                    TerrainHeightFieldHeights.Add(GroundGeom, _heightmap);
+                    TerrainHeightFieldHeightsHandlers.Add(GroundGeom, _heightmaphandler);
+                }
+            }
+        }
+
+        public void UbitSetTerrain(float[] heightMap, Vector3 pOffset)
+        {
+            // assumes 1m size grid and constante size square regions
+            // needs to know about sims around in future
+
+            float[] _heightmap;
+
+            uint heightmapWidth = Constants.RegionSize + 2;
+            uint heightmapHeight = Constants.RegionSize + 2;
+
+            uint heightmapWidthSamples = heightmapWidth + 1;
+            uint heightmapHeightSamples = heightmapHeight + 1;
+
+            _heightmap = new float[heightmapWidthSamples * heightmapHeightSamples];
+
+
+            uint regionsize = Constants.RegionSize;
+
+            float hfmin = float.MaxValue;
+//            float hfmax = float.MinValue;
+            float val;
+
+
+            uint maxXXYY = regionsize - 1;
+            // adding one margin all around so things don't fall in edges
+
+            uint xx;
+            uint yy = 0;
+            uint yt = 0;
+
+            for (uint y = 0; y < heightmapHeightSamples; y++)
+            {
+                if (y > 1 && y < maxXXYY)
+                    yy += regionsize;
+                xx = 0;
+                for (uint x = 0; x < heightmapWidthSamples; x++)
+                {
+                    if (x > 1 && x < maxXXYY)
+                        xx++;
+
+                    val = heightMap[yy + xx];
+                    if (val < 0.0f)
+                        val = 0.0f; // no neg terrain as in chode
+                    _heightmap[yt + x] = val;
+
+                    if (hfmin > val)
+                        hfmin = val;
+//                    if (hfmax < val)
+//                        hfmax = val;
+                }
+                yt += heightmapWidthSamples;
+            }
+            lock (OdeLock)
+            {
+                IntPtr GroundGeom = IntPtr.Zero;
+                if (RegionTerrain.TryGetValue(pOffset, out GroundGeom))
+                {
+                    RegionTerrain.Remove(pOffset);
+                    if (GroundGeom != IntPtr.Zero)
+                    {
+                        actor_name_map.Remove(GroundGeom);
+                        d.GeomDestroy(GroundGeom);
+
+                        if (TerrainHeightFieldHeights.ContainsKey(GroundGeom))
+                        {
+                            if (TerrainHeightFieldHeightsHandlers[GroundGeom].IsAllocated)
+                                TerrainHeightFieldHeightsHandlers[GroundGeom].Free();
+                            TerrainHeightFieldHeightsHandlers.Remove(GroundGeom);
+                            TerrainHeightFieldHeights.Remove(GroundGeom);
+                        }
+                    }
+                }
+                IntPtr HeightmapData = d.GeomUbitTerrainDataCreate();
+
+                const int wrap = 0;
+                float thickness = hfmin;
+                if (thickness < 0)
+                    thickness = 1;
+
+                GCHandle _heightmaphandler = GCHandle.Alloc(_heightmap, GCHandleType.Pinned);
+
+                d.GeomUbitTerrainDataBuild(HeightmapData, _heightmaphandler.AddrOfPinnedObject(), 0, 1.0f,
+                                                 (int)heightmapWidthSamples, (int)heightmapHeightSamples,
+                                                 thickness, wrap);
+
+//                d.GeomUbitTerrainDataSetBounds(HeightmapData, hfmin - 1, hfmax + 1);
+                GroundGeom = d.CreateUbitTerrain(GroundSpace, HeightmapData, 1);
+                if (GroundGeom != IntPtr.Zero)
+                {
+                    d.GeomSetCategoryBits(GroundGeom, (uint)(CollisionCategories.Land));
+                    d.GeomSetCollideBits(GroundGeom, 0);
+
+
+                    PhysicsActor pa = new NullPhysicsActor();
+                    pa.Name = "Terrain";
+                    pa.PhysicsActorType = (int)ActorTypes.Ground;
+                    actor_name_map[GroundGeom] = pa;
+
+//                    geom_name_map[GroundGeom] = "Terrain";
+
+                    d.GeomSetPosition(GroundGeom, pOffset.X + (float)Constants.RegionSize * 0.5f, pOffset.Y + (float)Constants.RegionSize * 0.5f, 0);
+                    RegionTerrain.Add(pOffset, GroundGeom);
+                    TerrainHeightFieldHeights.Add(GroundGeom, _heightmap);
+                    TerrainHeightFieldHeightsHandlers.Add(GroundGeom, _heightmaphandler);
+                }
+            }
+        }
+
+
+        public override void DeleteTerrain()
+        {
+        }
+
+        public float GetWaterLevel()
+        {
+            return waterlevel;
+        }
+
+        public override bool SupportsCombining()
+        {
+            return true;
+        }
+/*
+        public override void UnCombine(PhysicsScene pScene)
+        {
+            IntPtr localGround = IntPtr.Zero;
+//            float[] localHeightfield;
+            bool proceed = false;
+            List<IntPtr> geomDestroyList = new List<IntPtr>();
+
+            lock (OdeLock)
+            {
+                if (RegionTerrain.TryGetValue(Vector3.Zero, out localGround))
+                {
+                    foreach (IntPtr geom in TerrainHeightFieldHeights.Keys)
+                    {
+                        if (geom == localGround)
+                        {
+//                            localHeightfield = TerrainHeightFieldHeights[geom];
+                            proceed = true;
+                        }
+                        else
+                        {
+                            geomDestroyList.Add(geom);
+                        }
+                    }
+
+                    if (proceed)
+                    {
+                        m_worldOffset = Vector3.Zero;
+                        WorldExtents = new Vector2((int)Constants.RegionSize, (int)Constants.RegionSize);
+                        m_parentScene = null;
+
+                        foreach (IntPtr g in geomDestroyList)
+                        {
+                            // removingHeightField needs to be done or the garbage collector will
+                            // collect the terrain data before we tell ODE to destroy it causing 
+                            // memory corruption
+                            if (TerrainHeightFieldHeights.ContainsKey(g))
+                            {
+//                                float[] removingHeightField = TerrainHeightFieldHeights[g];
+                                TerrainHeightFieldHeights.Remove(g);
+
+                                if (RegionTerrain.ContainsKey(g))
+                                {
+                                    RegionTerrain.Remove(g);
+                                }
+
+                                d.GeomDestroy(g);
+                                //removingHeightField = new float[0];
+                            }
+                        }
+
+                    }
+                    else
+                    {
+                        m_log.Warn("[PHYSICS]: Couldn't proceed with UnCombine.  Region has inconsistant data.");
+                    }
+                }
+            }
+        }
+*/
+        public override void SetWaterLevel(float baseheight)
+        {
+            waterlevel = baseheight;
+//            randomizeWater(waterlevel);
+        }
+/*
+        public void randomizeWater(float baseheight)
+        {
+            const uint heightmapWidth = Constants.RegionSize + 2;
+            const uint heightmapHeight = Constants.RegionSize + 2;
+            const uint heightmapWidthSamples = heightmapWidth + 1;
+            const uint heightmapHeightSamples = heightmapHeight + 1;
+
+            const float scale = 1.0f;
+            const float offset = 0.0f;
+            const int wrap = 0;
+
+            float[] _watermap = new float[heightmapWidthSamples * heightmapWidthSamples];
+
+            float maxheigh = float.MinValue;
+            float minheigh = float.MaxValue;
+            float val;
+            for (int i = 0; i < (heightmapWidthSamples * heightmapHeightSamples); i++)
+            {
+
+                val = (baseheight - 0.1f) + ((float)fluidRandomizer.Next(1, 9) / 10f);
+                _watermap[i] = val;
+                if (maxheigh < val)
+                    maxheigh = val;
+                if (minheigh > val)
+                    minheigh = val;
+            }
+
+            float thickness = minheigh;
+
+            lock (OdeLock)
+            {
+                if (WaterGeom != IntPtr.Zero)
+                {
+                    actor_name_map.Remove(WaterGeom);
+                    d.GeomDestroy(WaterGeom);
+                    d.GeomHeightfieldDataDestroy(WaterHeightmapData);
+                    WaterGeom = IntPtr.Zero;
+                    WaterHeightmapData = IntPtr.Zero;
+                    if(WaterMapHandler.IsAllocated)
+                        WaterMapHandler.Free();
+                }
+
+                WaterHeightmapData = d.GeomHeightfieldDataCreate();
+
+                WaterMapHandler = GCHandle.Alloc(_watermap, GCHandleType.Pinned);
+
+                d.GeomHeightfieldDataBuildSingle(WaterHeightmapData, WaterMapHandler.AddrOfPinnedObject(), 0, heightmapWidth, heightmapHeight,
+                                                 (int)heightmapWidthSamples, (int)heightmapHeightSamples, scale,
+                                                 offset, thickness, wrap);
+                d.GeomHeightfieldDataSetBounds(WaterHeightmapData, minheigh, maxheigh);
+                WaterGeom = d.CreateHeightfield(StaticSpace, WaterHeightmapData, 1);
+                if (WaterGeom != IntPtr.Zero)
+                {
+                    d.GeomSetCategoryBits(WaterGeom, (uint)(CollisionCategories.Water));
+                    d.GeomSetCollideBits(WaterGeom, 0);
+
+
+                    PhysicsActor pa = new NullPhysicsActor();
+                    pa.Name = "Water";
+                    pa.PhysicsActorType = (int)ActorTypes.Water;
+
+                    actor_name_map[WaterGeom] = pa;
+//                    geom_name_map[WaterGeom] = "Water";
+
+                    d.Matrix3 R = new d.Matrix3();
+
+                    Quaternion q1 = Quaternion.CreateFromAxisAngle(new Vector3(1, 0, 0), 1.5707f);
+                    Quaternion q2 = Quaternion.CreateFromAxisAngle(new Vector3(0, 1, 0), 1.5707f);
+
+                    q1 = q1 * q2;
+                    Vector3 v3;
+                    float angle;
+                    q1.GetAxisAngle(out v3, out angle);
+
+                    d.RFromAxisAndAngle(out R, v3.X, v3.Y, v3.Z, angle);
+                    d.GeomSetRotation(WaterGeom, ref R);
+                    d.GeomSetPosition(WaterGeom, (float)Constants.RegionSize * 0.5f, (float)Constants.RegionSize * 0.5f, 0);
+                }
+            }
+        }
+*/
+        public override void Dispose()
+        {
+            if (m_meshWorker != null)
+                m_meshWorker.Stop();
+
+            lock (OdeLock)
+            {
+                m_rayCastManager.Dispose();
+                m_rayCastManager = null;
+
+                lock (_prims)
+                {
+                    ChangesQueue.Clear();
+                    foreach (OdePrim prm in _prims)
+                    {
+                        prm.DoAChange(changes.Remove, null);
+                        _collisionEventPrim.Remove(prm);
+                    }
+                    _prims.Clear();
+                }
+
+                OdeCharacter[] chtorem;
+                lock (_characters)
+                {
+                    chtorem = new OdeCharacter[_characters.Count];
+                    _characters.CopyTo(chtorem);
+                }
+
+                ChangesQueue.Clear();
+                foreach (OdeCharacter ch in chtorem)
+                    ch.DoAChange(changes.Remove, null);
+
+                               
+                foreach (IntPtr GroundGeom in RegionTerrain.Values)
+                {
+                    if (GroundGeom != IntPtr.Zero)
+                        d.GeomDestroy(GroundGeom);
+                }
+
+
+                RegionTerrain.Clear();
+
+                if (TerrainHeightFieldHeightsHandlers.Count > 0)
+                {
+                    foreach (GCHandle gch in TerrainHeightFieldHeightsHandlers.Values)
+                    {
+                        if (gch.IsAllocated)
+                            gch.Free();
+                    }
+                }
+
+                TerrainHeightFieldHeightsHandlers.Clear();
+                TerrainHeightFieldHeights.Clear();
+/*
+                if (WaterGeom != IntPtr.Zero)
+                {
+                    d.GeomDestroy(WaterGeom);
+                        WaterGeom = IntPtr.Zero;
+                    if (WaterHeightmapData != IntPtr.Zero)
+                        d.GeomHeightfieldDataDestroy(WaterHeightmapData);
+                    WaterHeightmapData = IntPtr.Zero;
+
+                    if (WaterMapHandler.IsAllocated)
+                        WaterMapHandler.Free();
+                }
+*/
+                if (ContactgeomsArray != IntPtr.Zero)
+                    Marshal.FreeHGlobal(ContactgeomsArray);
+                if (GlobalContactsArray != IntPtr.Zero)
+                    Marshal.FreeHGlobal(GlobalContactsArray);
+
+
+                d.WorldDestroy(world);
+                world = IntPtr.Zero;
+                //d.CloseODE();
+            }
+        }
+
+        public override Dictionary<uint, float> GetTopColliders()
+        {
+            Dictionary<uint, float> returncolliders = new Dictionary<uint, float>();
+            int cnt = 0;
+            lock (_prims)
+            {
+                foreach (OdePrim prm in _prims)
+                {
+                    if (prm.CollisionScore > 0)
+                    {
+                        returncolliders.Add(prm.LocalID, prm.CollisionScore);
+                        cnt++;
+                        prm.CollisionScore = 0f;
+                        if (cnt > 25)
+                        {
+                            break;
+                        }
+                    }
+                }
+            }
+            return returncolliders;
+        }
+
+        public override bool SupportsRayCast()
+        {
+            return true;
+        }
+
+        public override void RaycastWorld(Vector3 position, Vector3 direction, float length, RaycastCallback retMethod)
+        {
+            if (retMethod != null)
+            {
+                ODERayRequest req = new ODERayRequest();
+                req.actor = null;
+                req.callbackMethod = retMethod;
+                req.length = length;
+                req.Normal = direction;
+                req.Origin = position;
+                req.Count = 0;
+                req.filter = RayFilterFlags.AllPrims;
+
+                m_rayCastManager.QueueRequest(req);
+            }
+        }
+
+        public override void RaycastWorld(Vector3 position, Vector3 direction, float length, int Count, RayCallback retMethod)
+        {
+            if (retMethod != null)
+            {
+                ODERayRequest req = new ODERayRequest();
+                req.actor = null;
+                req.callbackMethod = retMethod;
+                req.length = length;
+                req.Normal = direction;
+                req.Origin = position;
+                req.Count = Count;
+                req.filter = RayFilterFlags.AllPrims;
+
+                m_rayCastManager.QueueRequest(req);
+            }
+        }
+
+       
+        public override List<ContactResult> RaycastWorld(Vector3 position, Vector3 direction, float length, int Count)
+        {
+            List<ContactResult> ourresults = new List<ContactResult>();
+            object SyncObject = new object();
+
+            RayCallback retMethod = delegate(List<ContactResult> results)
+            {
+                lock (SyncObject)
+                {
+                    ourresults = results;
+                    Monitor.PulseAll(SyncObject);
+                }
+            };
+
+            ODERayRequest req = new ODERayRequest();
+            req.actor = null;
+            req.callbackMethod = retMethod;
+            req.length = length;
+            req.Normal = direction;
+            req.Origin = position;
+            req.Count = Count;
+            req.filter = RayFilterFlags.AllPrims;
+
+            lock (SyncObject)
+            {
+                m_rayCastManager.QueueRequest(req);
+                if (!Monitor.Wait(SyncObject, 500))
+                    return null;
+                else
+                    return ourresults;
+            }
+        }
+
+        public override bool SupportsRaycastWorldFiltered()
+        {
+            return true;
+        }
+
+        public override object RaycastWorld(Vector3 position, Vector3 direction, float length, int Count, RayFilterFlags filter)
+        {
+            object SyncObject = new object();
+            List<ContactResult> ourresults = new List<ContactResult>();
+
+            RayCallback retMethod = delegate(List<ContactResult> results)
+            {
+                lock (SyncObject)
+                {
+                    ourresults = results;
+                    Monitor.PulseAll(SyncObject);
+                }
+            };
+
+            ODERayRequest req = new ODERayRequest();
+            req.actor = null;
+            req.callbackMethod = retMethod;
+            req.length = length;
+            req.Normal = direction;
+            req.Origin = position;
+            req.Count = Count;
+            req.filter = filter;
+
+            lock (SyncObject)
+            {
+                m_rayCastManager.QueueRequest(req);
+                if (!Monitor.Wait(SyncObject, 500))
+                    return null;
+                else
+                    return ourresults;
+            }
+        }
+
+        public override List<ContactResult> RaycastActor(PhysicsActor actor, Vector3 position, Vector3 direction, float length, int Count, RayFilterFlags flags)
+        {
+            if (actor == null)
+                return new List<ContactResult>();
+
+            IntPtr geom;
+            if (actor is OdePrim)
+                geom = ((OdePrim)actor).prim_geom;
+            else if (actor is OdeCharacter)
+                geom = ((OdePrim)actor).prim_geom;
+            else
+                return new List<ContactResult>();
+
+            if (geom == IntPtr.Zero)
+                return new List<ContactResult>();
+
+            List<ContactResult> ourResults = null;
+            object SyncObject = new object();
+
+            RayCallback retMethod = delegate(List<ContactResult> results)
+            {
+                lock (SyncObject)
+                {
+                    ourResults = results;
+                    Monitor.PulseAll(SyncObject);
+                }
+            };
+
+            ODERayRequest req = new ODERayRequest();
+            req.actor = actor;
+            req.callbackMethod = retMethod;
+            req.length = length;
+            req.Normal = direction;
+            req.Origin = position;
+            req.Count = Count;
+            req.filter = flags;
+
+            lock (SyncObject)
+            {
+                m_rayCastManager.QueueRequest(req);
+                if (!Monitor.Wait(SyncObject, 500))
+                    return new List<ContactResult>();
+            }
+
+            if (ourResults == null)
+                return new List<ContactResult>();
+            return ourResults;
+        }
+
+        public override List<ContactResult> BoxProbe(Vector3 position, Vector3 size, Quaternion orientation, int Count, RayFilterFlags flags)
+        {
+            List<ContactResult> ourResults = null;
+            object SyncObject = new object();
+
+            ProbeBoxCallback retMethod = delegate(List<ContactResult> results)
+            {
+                lock (SyncObject)
+                {
+                    ourResults = results;
+                    Monitor.PulseAll(SyncObject);
+                }
+            };
+
+            ODERayRequest req = new ODERayRequest();
+            req.actor = null;
+            req.callbackMethod = retMethod;
+            req.Normal = size;
+            req.Origin = position;
+            req.orientation = orientation;
+            req.Count = Count;
+            req.filter = flags;
+
+            lock (SyncObject)
+            {
+                m_rayCastManager.QueueRequest(req);
+                if (!Monitor.Wait(SyncObject, 500))
+                    return new List<ContactResult>();
+            }
+
+            if (ourResults == null)
+                return new List<ContactResult>();
+            return ourResults;
+        }
+
+        public override List<ContactResult> SphereProbe(Vector3 position, float radius, int Count, RayFilterFlags flags)
+        {
+            List<ContactResult> ourResults = null;
+            object SyncObject = new object();
+
+            ProbeSphereCallback retMethod = delegate(List<ContactResult> results)
+            {
+                ourResults = results;
+                Monitor.PulseAll(SyncObject);
+            };
+
+            ODERayRequest req = new ODERayRequest();
+            req.actor = null;
+            req.callbackMethod = retMethod;
+            req.length = radius;
+            req.Origin = position;
+            req.Count = Count;
+            req.filter = flags;
+
+
+            lock (SyncObject)
+            {
+                m_rayCastManager.QueueRequest(req);
+                if (!Monitor.Wait(SyncObject, 500))
+                    return new List<ContactResult>();
+            }
+
+            if (ourResults == null)
+                return new List<ContactResult>();
+            return ourResults;
+        }
+
+        public override List<ContactResult> PlaneProbe(PhysicsActor actor, Vector4 plane, int Count, RayFilterFlags flags)
+        {
+            IntPtr geom = IntPtr.Zero;;
+
+            if (actor != null)
+            {
+                if (actor is OdePrim)
+                    geom = ((OdePrim)actor).prim_geom;
+                else if (actor is OdeCharacter)
+                    geom = ((OdePrim)actor).prim_geom;
+            }
+
+            List<ContactResult> ourResults = null;
+            object SyncObject = new object();
+
+            ProbePlaneCallback retMethod = delegate(List<ContactResult> results)
+            {
+                ourResults = results;
+                Monitor.PulseAll(SyncObject);
+            };
+
+            ODERayRequest req = new ODERayRequest();
+            req.actor = null;
+            req.callbackMethod = retMethod;
+            req.length = plane.W;
+            req.Normal.X = plane.X;
+            req.Normal.Y = plane.Y;
+            req.Normal.Z = plane.Z;
+            req.Count = Count;
+            req.filter = flags;
+
+            lock (SyncObject)
+            {
+                m_rayCastManager.QueueRequest(req);
+                if (!Monitor.Wait(SyncObject, 500))
+                    return new List<ContactResult>();
+            }
+
+            if (ourResults == null)
+                return new List<ContactResult>();
+            return ourResults;
+        }
+
+        public override int SitAvatar(PhysicsActor actor, Vector3 AbsolutePosition, Vector3 CameraPosition, Vector3 offset, Vector3 AvatarSize, SitAvatarCallback PhysicsSitResponse)
+        {
+            Util.FireAndForget( delegate
+            {
+                ODESitAvatar sitAvatar = new ODESitAvatar(this, m_rayCastManager);
+                if(sitAvatar != null)
+                    sitAvatar.Sit(actor, AbsolutePosition, CameraPosition, offset, AvatarSize, PhysicsSitResponse);
+            });
+            return 1;
+        }
+
+    }
+}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
index 47a9cdc..6879ebb 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
@@ -305,6 +305,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return null;
         }
 
+        public static void StateChange(IScriptEngine engine, uint localID, UUID itemID)
+        {
+            // Remove a specific script
+
+            // Remove dataserver events
+            m_Dataserver[engine].RemoveEvents(localID, itemID);
+
+            IWorldComm comms = engine.World.RequestModuleInterface<IWorldComm>();
+            if (comms != null)
+                comms.DeleteListener(itemID);
+
+            IXMLRPC xmlrpc = engine.World.RequestModuleInterface<IXMLRPC>();
+            if (xmlrpc != null)
+            {
+                xmlrpc.DeleteChannels(itemID);
+                xmlrpc.CancelSRDRequests(itemID);
+            }
+
+            // Remove Sensors
+            m_SensorRepeat[engine].UnSetSenseRepeaterEvents(localID, itemID);
+
+        }
+
         public static Object[] GetSerializationData(IScriptEngine engine, UUID itemID)
         {
             List<Object> data = new List<Object>();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
new file mode 100644
index 0000000..fce8ff8
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
@@ -0,0 +1,117 @@
+/*
+ * 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.Threading;
+using System.Reflection;
+using System.Collections;
+using System.Collections.Generic;
+using System.Runtime.Remoting.Lifetime;
+using OpenMetaverse;
+using Nini.Config;
+using OpenSim;
+using OpenSim.Framework;
+using OpenSim.Region.CoreModules.World.LightShare;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.ScriptEngine.Shared;
+using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
+using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
+using OpenSim.Region.ScriptEngine.Interfaces;
+using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces;
+using OpenSim.Services.Interfaces;
+
+using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
+using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
+using LSL_Key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
+using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
+using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
+using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
+using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
+
+namespace OpenSim.Region.ScriptEngine.Shared.Api
+{
+    [Serializable]
+    public class CM_Api : MarshalByRefObject, ICM_Api, IScriptApi
+    {
+        internal IScriptEngine m_ScriptEngine;
+        internal SceneObjectPart m_host;
+        internal TaskInventoryItem m_item;
+        internal bool m_CMFunctionsEnabled = false;
+
+        public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle)
+        {
+            m_ScriptEngine = ScriptEngine;
+            m_host = host;
+            m_item = item;
+
+            if (m_ScriptEngine.Config.GetBoolean("AllowCareminsterFunctions", false))
+                m_CMFunctionsEnabled = true;
+        }
+
+        public override Object InitializeLifetimeService()
+        {
+            ILease lease = (ILease)base.InitializeLifetimeService();
+
+            if (lease.CurrentState == LeaseState.Initial)
+            {
+                lease.InitialLeaseTime = TimeSpan.FromMinutes(0);
+                //                lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0);
+                //                lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0);
+            }
+            return lease;
+        }
+
+        public Scene World
+        {
+            get { return m_ScriptEngine.World; }
+        }
+
+        public string cmDetectedCountry(int number)
+        {
+            m_host.AddScriptLPS(1);
+            DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, number);
+            if (detectedParams == null)
+                return String.Empty;
+            return detectedParams.Country;
+        }
+
+        public string cmGetAgentCountry(LSL_Key key)
+        {
+            if (!World.Permissions.IsGod(m_host.OwnerID))
+                return String.Empty;
+
+            UUID uuid;
+
+            if (!UUID.TryParse(key, out uuid))
+                return String.Empty;
+
+            UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid);
+            return account.UserCountry;
+        }
+    }
+}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 96f650e..4c6950d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -24,14 +24,16 @@
  * (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;
+using System.Diagnostics; //for [DebuggerNonUserCode]
 using System.Runtime.Remoting.Lifetime;
 using System.Text;
 using System.Threading;
 using System.Text.RegularExpressions;
+using System.Timers;
 using Nini.Config;
 using log4net;
 using OpenMetaverse;
@@ -44,6 +46,7 @@ using OpenSim.Region.CoreModules.World.Land;
 using OpenSim.Region.CoreModules.World.Terrain;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Region.Framework.Scenes.Animation;
 using OpenSim.Region.Framework.Scenes.Scripting;
 using OpenSim.Region.Physics.Manager;
@@ -67,6 +70,7 @@ using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
 using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
 using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
 using System.Reflection;
+using Timer = System.Timers.Timer;
 
 namespace OpenSim.Region.ScriptEngine.Shared.Api
 {
@@ -113,17 +117,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         protected int m_notecardLineReadCharsMax = 255;
         protected int m_scriptConsoleChannel = 0;
         protected bool m_scriptConsoleChannelEnabled = false;
+        protected bool m_debuggerSafe = false;
         protected IUrlModule m_UrlModule = null;
-        protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache = new Dictionary<UUID, UserInfoCacheEntry>();
-        protected int EMAIL_PAUSE_TIME = 20;  // documented delay value for smtp.
+        protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache =
+                new Dictionary<UUID, UserInfoCacheEntry>();
+            protected int EMAIL_PAUSE_TIME = 20;  // documented delay value for smtp.
         protected ISoundModule m_SoundModule = null;
 
+//        protected Timer m_ShoutSayTimer;
+        protected int m_SayShoutCount = 0;
+        DateTime m_lastSayShoutCheck;
+
+        private Dictionary<string, string> MovementAnimationsForLSL =
+                new Dictionary<string, string> {
+                        {"FLY", "Flying"},
+                        {"FLYSLOW", "FlyingSlow"},
+                        {"HOVER_UP", "Hovering Up"},
+                        {"HOVER_DOWN", "Hovering Down"},
+                        {"HOVER", "Hovering"},
+                        {"LAND", "Landing"},
+                        {"FALLDOWN", "Falling Down"},
+                        {"PREJUMP", "PreJumping"},
+                        {"JUMP", "Jumping"},
+                        {"STANDUP", "Standing Up"},
+                        {"SOFT_LAND", "Soft Landing"},
+                        {"STAND", "Standing"},
+                        {"CROUCHWALK", "CrouchWalking"},
+                        {"RUN", "Running"},
+                        {"WALK", "Walking"},
+                        {"CROUCH", "Crouching"},
+                        {"TURNLEFT", "Turning Left"},
+                        {"TURNRIGHT", "Turning Right"}
+                };
+
         public void Initialize(
             IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item, WaitHandle coopSleepHandle)
         {
+            m_lastSayShoutCheck = DateTime.UtcNow;
+
             m_ScriptEngine = scriptEngine;
             m_host = host;
             m_item = item;
+            m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false);
             m_coopSleepHandle = coopSleepHandle;
 
             LoadConfig();
@@ -212,6 +247,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             get { return m_ScriptEngine.World; }
         }
 
+        [DebuggerNonUserCode]
         public void state(string newState)
         {
             m_ScriptEngine.SetState(m_item.ItemID, newState);
@@ -221,6 +257,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// Reset the named script. The script must be present
         /// in the same prim.
         /// </summary>
+        [DebuggerNonUserCode]
         public void llResetScript()
         {
             m_host.AddScriptLPS(1);
@@ -283,6 +320,57 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
+        public List<ScenePresence> GetLinkAvatars(int linkType)
+        {
+            List<ScenePresence> ret = new List<ScenePresence>();
+            if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
+                return ret;
+            
+            List<ScenePresence> avs = m_host.ParentGroup.GetLinkedAvatars();
+
+            switch (linkType)
+            {
+                case ScriptBaseClass.LINK_SET:
+                    return avs;
+
+                case ScriptBaseClass.LINK_ROOT:
+                    return ret;
+
+                case ScriptBaseClass.LINK_ALL_OTHERS:
+                    return avs;
+
+                case ScriptBaseClass.LINK_ALL_CHILDREN:
+                    return avs;
+
+                case ScriptBaseClass.LINK_THIS:
+                    return ret;
+
+                default:
+                    if (linkType < 0)
+                        return ret;
+
+                    int partCount = m_host.ParentGroup.GetPartCount();
+
+                    if (linkType <= partCount)
+                    {
+                        return ret;
+                    }
+                    else
+                    {
+                        linkType = linkType - partCount;
+                        if (linkType > avs.Count)
+                        {
+                            return ret;
+                        }
+                        else
+                        {
+                            ret.Add(avs[linkType-1]);
+                            return ret;
+                        }
+                    }
+            }
+        }
+
         public List<SceneObjectPart> GetLinkParts(int linkType)
         {
             return GetLinkParts(m_host, linkType);
@@ -291,6 +379,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public static List<SceneObjectPart> GetLinkParts(SceneObjectPart part, int linkType)
         {
             List<SceneObjectPart> ret = new List<SceneObjectPart>();
+            if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
+                return ret;
             ret.Add(part);
 
             switch (linkType)
@@ -444,31 +534,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         //Now we start getting into quaternions which means sin/cos, matrices and vectors. ckrinke
 
-        /// <summary>
-        /// Convert an LSL rotation to a Euler vector.
-        /// </summary>
-        /// <remarks>
-        /// Using algorithm based off http://www.euclideanspace.com/maths/geometry/rotations/conversions/quaternionToEuler/quat_2_euler_paper_ver2-1.pdf
-        /// to avoid issues with singularity and rounding with Y rotation of +/- PI/2
-        /// </remarks>
-        /// <param name="r"></param>
-        /// <returns></returns>
-        public LSL_Vector llRot2Euler(LSL_Rotation r)
+        // Utility function for llRot2Euler
+
+        // normalize an angle between -PI and PI (-180 to +180 degrees)
+        protected double NormalizeAngle(double angle)
         {
-            m_host.AddScriptLPS(1);
+            if (angle > -Math.PI && angle < Math.PI)
+                return angle;
 
-            LSL_Vector v = new LSL_Vector(0.0, 0.0, 1.0) * r;   // Z axis unit vector unaffected by Z rotation component of r.
-            double m = LSL_Vector.Mag(v);                       // Just in case v isn't normalized, need magnitude for Asin() operation later.
-            if (m == 0.0) return new LSL_Vector();
-            double x = Math.Atan2(-v.y, v.z);
-            double sin = v.x / m;
-            if (sin < -0.999999 || sin > 0.999999) x = 0.0;     // Force X rotation to 0 at the singularities.
-            double y = Math.Asin(sin);
-            // Rotate X axis unit vector by r and unwind the X and Y rotations leaving only the Z rotation
-            v = new LSL_Vector(1.0, 0.0, 0.0) * ((r * new LSL_Rotation(Math.Sin(-x / 2.0), 0.0, 0.0, Math.Cos(-x / 2.0))) * new LSL_Rotation(0.0, Math.Sin(-y / 2.0), 0.0, Math.Cos(-y / 2.0)));
-            double z = Math.Atan2(v.y, v.x);
+            int numPis = (int)(Math.PI / angle);
+            double remainder = angle - Math.PI * numPis;
+            if (numPis % 2 == 1)
+                return Math.PI - angle;
+            return remainder;
+        }
 
-            return new LSL_Vector(x, y, z);
+        public LSL_Vector llRot2Euler(LSL_Rotation q1)
+        {
+            m_host.AddScriptLPS(1);
+            LSL_Vector eul = new LSL_Vector();
+
+            double sqw = q1.s*q1.s;
+            double sqx = q1.x*q1.x;
+            double sqy = q1.z*q1.z;
+            double sqz = q1.y*q1.y;
+            double unit = sqx + sqy + sqz + sqw; // if normalised is one, otherwise is correction factor
+            double test = q1.x*q1.z + q1.y*q1.s;
+            if (test > 0.4999*unit) { // singularity at north pole
+                eul.z = 2 * Math.Atan2(q1.x,q1.s);
+                eul.y = Math.PI/2;
+                eul.x = 0;
+                return eul;
+            }
+            if (test < -0.4999*unit) { // singularity at south pole
+                eul.z = -2 * Math.Atan2(q1.x,q1.s);
+                eul.y = -Math.PI/2;
+                eul.x = 0;
+                return eul;
+            }
+            eul.z = Math.Atan2(2*q1.z*q1.s-2*q1.x*q1.y , sqx - sqy - sqz + sqw);
+            eul.y = Math.Asin(2*test/unit);
+            eul.x = Math.Atan2(2*q1.x*q1.s-2*q1.z*q1.y , -sqx + sqy - sqz + sqw);
+            return eul;
         }
 
         /* From wiki:
@@ -521,18 +628,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
 
             double x,y,z,s;
-
-            double c1 = Math.Cos(v.x * 0.5);
-            double c2 = Math.Cos(v.y * 0.5);
-            double c3 = Math.Cos(v.z * 0.5);
-            double s1 = Math.Sin(v.x * 0.5);
-            double s2 = Math.Sin(v.y * 0.5);
-            double s3 = Math.Sin(v.z * 0.5);
-
-            x = s1 * c2 * c3 + c1 * s2 * s3;
-            y = c1 * s2 * c3 - s1 * c2 * s3;
-            z = s1 * s2 * c3 + c1 * c2 * s3;
-            s = c1 * c2 * c3 - s1 * s2 * s3;
+            v.x *= 0.5;
+            v.y *= 0.5;
+            v.z *= 0.5;
+            double c1 = Math.Cos(v.x);
+            double c2 = Math.Cos(v.y);
+            double c1c2 = c1 * c2;
+            double s1 = Math.Sin(v.x);
+            double s2 = Math.Sin(v.y);
+            double s1s2 = s1 * s2;
+            double c1s2 = c1 * s2;
+            double s1c2 = s1 * c2;
+            double c3 = Math.Cos(v.z);
+            double s3 = Math.Sin(v.z);
+
+            x = s1c2 * c3 + c1s2 * s3;
+            y = c1s2 * c3 - s1c2 * s3;
+            z = s1s2 * c3 + c1c2 * s3;
+            s = c1c2 * c3 - s1s2 * s3;
 
             return new LSL_Rotation(x, y, z, s);
         }
@@ -670,77 +783,76 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             //A and B should both be normalized
             m_host.AddScriptLPS(1);
-            LSL_Rotation rotBetween;
-            // Check for zero vectors. If either is zero, return zero rotation. Otherwise,
-            // continue calculation.
-            if (a == new LSL_Vector(0.0f, 0.0f, 0.0f) || b == new LSL_Vector(0.0f, 0.0f, 0.0f))
+            /*  This method is more accurate than the SL one, and thus causes problems
+                for scripts that deal with the SL inaccuracy around 180-degrees -.- .._.
+                
+            double dotProduct = LSL_Vector.Dot(a, b);
+            LSL_Vector crossProduct = LSL_Vector.Cross(a, b);
+            double magProduct = LSL_Vector.Mag(a) * LSL_Vector.Mag(b);
+            double angle = Math.Acos(dotProduct / magProduct);
+            LSL_Vector axis = LSL_Vector.Norm(crossProduct);
+            double s = Math.Sin(angle / 2);
+
+            double x = axis.x * s;
+            double y = axis.y * s;
+            double z = axis.z * s;
+            double w = Math.Cos(angle / 2);
+
+            if (Double.IsNaN(x) || Double.IsNaN(y) || Double.IsNaN(z) || Double.IsNaN(w))
+                return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
+
+            return new LSL_Rotation((float)x, (float)y, (float)z, (float)w);
+            */
+            
+            // This method mimics the 180 errors found in SL
+            // See www.euclideanspace.com... angleBetween
+            LSL_Vector vec_a = a;
+            LSL_Vector vec_b = b;
+            
+            // Eliminate zero length
+            LSL_Float vec_a_mag = LSL_Vector.Mag(vec_a);
+            LSL_Float vec_b_mag = LSL_Vector.Mag(vec_b);
+            if (vec_a_mag < 0.00001 ||
+                vec_b_mag < 0.00001)
             {
-                rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
+                return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
             }
-            else
+            
+            // Normalize
+            vec_a = llVecNorm(vec_a);
+            vec_b = llVecNorm(vec_b);
+
+            // Calculate axis and rotation angle
+            LSL_Vector axis = vec_a % vec_b;
+            LSL_Float cos_theta  = vec_a * vec_b;
+    
+            // Check if parallel
+            if (cos_theta > 0.99999)
             {
-                a = LSL_Vector.Norm(a);
-                b = LSL_Vector.Norm(b);
-                double dotProduct = LSL_Vector.Dot(a, b);
-                // There are two degenerate cases possible. These are for vectors 180 or
-                // 0 degrees apart. These have to be detected and handled individually.
-                //
-                // Check for vectors 180 degrees apart.
-                // A dot product of -1 would mean the angle between vectors is 180 degrees.
-                if (dotProduct < -0.9999999f)
-                {
-                    // First assume X axis is orthogonal to the vectors.
-                    LSL_Vector orthoVector = new LSL_Vector(1.0f, 0.0f, 0.0f);
-                    orthoVector = orthoVector - a * (a.x / LSL_Vector.Dot(a, a));
-                    // Check for near zero vector. A very small non-zero number here will create
-                    // a rotation in an undesired direction.
-                    if (LSL_Vector.Mag(orthoVector) > 0.0001)
-                    {
-                        rotBetween = new LSL_Rotation(orthoVector.x, orthoVector.y, orthoVector.z, 0.0f);
-                    }
-                    // If the magnitude of the vector was near zero, then assume the X axis is not
-                    // orthogonal and use the Z axis instead.
-                    else
-                    {
-                        // Set 180 z rotation.
-                        rotBetween = new LSL_Rotation(0.0f, 0.0f, 1.0f, 0.0f);
-                    }
-                }
-                // Check for parallel vectors.
-                // A dot product of 1 would mean the angle between vectors is 0 degrees.
-                else if (dotProduct > 0.9999999f)
-                {
-                    // Set zero rotation.
-                    rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
-                }
-                else
-                {
-                    // All special checks have been performed so get the axis of rotation.
-                    LSL_Vector crossProduct = LSL_Vector.Cross(a, b);
-                    // Quarternion s value is the length of the unit vector + dot product.
-                    double qs = 1.0 + dotProduct;
-                    rotBetween = new LSL_Rotation(crossProduct.x, crossProduct.y, crossProduct.z, qs);
-                    // Normalize the rotation.
-                    double mag = LSL_Rotation.Mag(rotBetween);
-                    // We shouldn't have to worry about a divide by zero here. The qs value will be
-                    // non-zero because we already know if we're here, then the dotProduct is not -1 so
-                    // qs will not be zero. Also, we've already handled the input vectors being zero so the
-                    // crossProduct vector should also not be zero.
-                    rotBetween.x = rotBetween.x / mag;
-                    rotBetween.y = rotBetween.y / mag;
-                    rotBetween.z = rotBetween.z / mag;
-                    rotBetween.s = rotBetween.s / mag;
-                    // Check for undefined values and set zero rotation if any found. This code might not actually be required
-                    // any longer since zero vectors are checked for at the top.
-                    if (Double.IsNaN(rotBetween.x) || Double.IsNaN(rotBetween.y) || Double.IsNaN(rotBetween.z) || Double.IsNaN(rotBetween.s))
-                    {
-                        rotBetween = new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
-                    }
-                }
+                return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
+            }
+            
+            // Check if anti-parallel
+            else if (cos_theta < -0.99999)
+            {
+                LSL_Vector orthog_axis = new LSL_Vector(1.0, 0.0, 0.0) - (vec_a.x / (vec_a * vec_a) * vec_a);
+                if (LSL_Vector.Mag(orthog_axis)  < 0.000001)  orthog_axis = new LSL_Vector(0.0, 0.0, 1.0);
+                return new LSL_Rotation((float)orthog_axis.x, (float)orthog_axis.y, (float)orthog_axis.z, 0.0);
+            }
+            else // other rotation
+            {
+                LSL_Float theta = (LSL_Float)Math.Acos(cos_theta) * 0.5f;
+                axis = llVecNorm(axis);
+                double x, y, z, s, t;
+                s = Math.Cos(theta);
+                t = Math.Sin(theta);
+                x = axis.x * t;
+                y = axis.y * t;
+                z = axis.z * t;
+                return new LSL_Rotation(x,y,z,s);
             }
-            return rotBetween;
         }
-
+                
         public void llWhisper(int channelID, string text)
         {
             m_host.AddScriptLPS(1);
@@ -756,10 +868,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 wComm.DeliverMessage(ChatTypeEnum.Whisper, channelID, m_host.Name, m_host.UUID, text);
         }
 
+        private void CheckSayShoutTime()
+        {
+            DateTime now = DateTime.UtcNow;
+            if ((now - m_lastSayShoutCheck).Ticks > 10000000) // 1sec
+            {
+                m_lastSayShoutCheck = now;
+                m_SayShoutCount = 0;
+            }
+            else
+                m_SayShoutCount++;
+        }
+
         public void llSay(int channelID, string text)
         {
             m_host.AddScriptLPS(1);
 
+            if (channelID == 0)
+//                m_SayShoutCount++;
+                CheckSayShoutTime();
+
+            if (m_SayShoutCount >= 11)
+                ScriptSleep(2000);
+
             if (m_scriptConsoleChannelEnabled && (channelID == m_scriptConsoleChannel))
             {
                 Console.WriteLine(text);
@@ -782,6 +913,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
+            if (channelID == 0)
+//                m_SayShoutCount++;
+                CheckSayShoutTime();
+
+            if (m_SayShoutCount >= 11)
+                ScriptSleep(2000);
+
             if (text.Length > 1023)
                 text = text.Substring(0, 1023);
 
@@ -813,22 +951,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public void  llRegionSayTo(string target, int channel, string msg)
         {
+            string error = String.Empty;
+
             if (msg.Length > 1023)
                 msg = msg.Substring(0, 1023);
 
             m_host.AddScriptLPS(1);
 
-            if (channel == ScriptBaseClass.DEBUG_CHANNEL)
-            {
-                return;
-            }
-
             UUID TargetID;
             UUID.TryParse(target, out TargetID);
 
             IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
             if (wComm != null)
-                wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg);
+                if (!wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg, out error))
+                    LSLError(error);
         }
 
         public LSL_Integer llListen(int channelID, string name, string ID, string msg)
@@ -1084,10 +1220,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return detectedParams.TouchUV;
         }
 
+        [DebuggerNonUserCode]
         public virtual void llDie()
         {
             m_host.AddScriptLPS(1);
-            throw new SelfDeleteException();
+            if (!m_host.ParentGroup.IsAttachment) throw new SelfDeleteException();
         }
 
         public LSL_Float llGround(LSL_Vector offset)
@@ -1158,6 +1295,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public void llSetStatus(int status, int value)
         {
+            if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
+                return;
             m_host.AddScriptLPS(1);
 
             int statusrotationaxis = 0;
@@ -1181,6 +1320,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     if (!allow)
                         return;
 
+                    if (m_host.ParentGroup.RootPart.PhysActor != null &&
+                        m_host.ParentGroup.RootPart.PhysActor.IsPhysical)
+                        return;
+
                     m_host.ScriptSetPhysicsStatus(true);
                 }
                 else
@@ -1381,6 +1524,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
+            SetColor(m_host, color, face);
+        }
+
+        protected void SetColor(SceneObjectPart part, LSL_Vector color, int face)
+        {
+            if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
+                return;
+
+            Primitive.TextureEntry tex = part.Shape.Textures;
+            Color4 texcolor;
+            if (face >= 0 && face < GetNumberOfSides(part))
+            {
+                texcolor = tex.CreateFace((uint)face).RGBA;
+                texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
+                texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
+                texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
+                tex.FaceTextures[face].RGBA = texcolor;
+                part.UpdateTextureEntry(tex.GetBytes());
+                return;
+            }
+            else if (face == ScriptBaseClass.ALL_SIDES)
+            {
+                for (uint i = 0; i < GetNumberOfSides(part); i++)
+                {
+                    if (tex.FaceTextures[i] != null)
+                    {
+                        texcolor = tex.FaceTextures[i].RGBA;
+                        texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
+                        texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
+                        texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
+                        tex.FaceTextures[i].RGBA = texcolor;
+                    }
+                    texcolor = tex.DefaultTexture.RGBA;
+                    texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
+                    texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
+                    texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
+                    tex.DefaultTexture.RGBA = texcolor;
+                }
+                part.UpdateTextureEntry(tex.GetBytes());
+                return;
+            }
+
             if (face == ScriptBaseClass.ALL_SIDES)
                 face = SceneObjectPart.ALL_SIDES;
 
@@ -1389,6 +1574,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public void SetTexGen(SceneObjectPart part, int face,int style)
         {
+            if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
+                return;
+
             Primitive.TextureEntry tex = part.Shape.Textures;
             MappingType textype;
             textype = MappingType.Default;
@@ -1419,6 +1607,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public void SetGlow(SceneObjectPart part, int face, float glow)
         {
+            if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
+                return;
+
             Primitive.TextureEntry tex = part.Shape.Textures;
             if (face >= 0 && face < GetNumberOfSides(part))
             {
@@ -1444,6 +1635,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump)
         {
+            if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
+                return;
 
             Shininess sval = new Shininess();
 
@@ -1494,6 +1687,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public void SetFullBright(SceneObjectPart part, int face, bool bright)
         {
+            if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
+                return;
+
              Primitive.TextureEntry tex = part.Shape.Textures;
              if (face >= 0 && face < GetNumberOfSides(part))
              {
@@ -1554,13 +1750,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
 
             List<SceneObjectPart> parts = GetLinkParts(linknumber);
-
-            foreach (SceneObjectPart part in parts)
-                SetAlpha(part, alpha, face);
+            if (parts.Count > 0)
+            {
+                try
+                {
+                    foreach (SceneObjectPart part in parts)
+                        SetAlpha(part, alpha, face);
+                }
+                finally
+                {
+                }
+            }
         }
 
         protected void SetAlpha(SceneObjectPart part, double alpha, int face)
         {
+            if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
+                return;
+
             Primitive.TextureEntry tex = part.Shape.Textures;
             Color4 texcolor;
             if (face >= 0 && face < GetNumberOfSides(part))
@@ -1613,7 +1820,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         protected void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction,
             float wind, float tension, LSL_Vector Force)
         {
-            if (part == null)
+            if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
                 return;
 
             if (flexi)
@@ -1654,7 +1861,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// <param name="falloff"></param>
         protected void SetPointLight(SceneObjectPart part, bool light, LSL_Vector color, float intensity, float radius, float falloff)
         {
-            if (part == null)
+            if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
                 return;
 
             if (light)
@@ -1687,11 +1894,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             Primitive.TextureEntry tex = part.Shape.Textures;
             Color4 texcolor;
             LSL_Vector rgb = new LSL_Vector();
+            int nsides = GetNumberOfSides(part);
+
             if (face == ScriptBaseClass.ALL_SIDES)
             {
                 int i;
-
-                for (i = 0 ; i < GetNumberOfSides(part); i++)
+                for (i = 0; i < nsides; i++)
                 {
                     texcolor = tex.GetFace((uint)i).RGBA;
                     rgb.x += texcolor.R;
@@ -1699,14 +1907,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     rgb.z += texcolor.B;
                 }
 
-                rgb.x /= (float)GetNumberOfSides(part);
-                rgb.y /= (float)GetNumberOfSides(part);
-                rgb.z /= (float)GetNumberOfSides(part);
+                float invnsides = 1.0f / (float)nsides;
+
+                rgb.x *= invnsides;
+                rgb.y *= invnsides;
+                rgb.z *= invnsides;
 
                 return rgb;
             }
-
-            if (face >= 0 && face < GetNumberOfSides(part))
+            if (face >= 0 && face < nsides)
             {
                 texcolor = tex.GetFace((uint)face).RGBA;
                 rgb.x = texcolor.R;
@@ -1733,15 +1942,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
 
             List<SceneObjectPart> parts = GetLinkParts(linknumber);
-
-            foreach (SceneObjectPart part in parts)
-              SetTexture(part, texture, face);
-
+            if (parts.Count > 0)
+            {
+                try
+                {
+                    foreach (SceneObjectPart part in parts)
+                        SetTexture(part, texture, face);
+                }
+                finally
+                {
+                }
+            }
             ScriptSleep(200);
         }
 
         protected void SetTexture(SceneObjectPart part, string texture, int face)
         {
+            if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
+                return;
+
             UUID textureID = new UUID();
 
                     textureID = ScriptUtils.GetAssetIdFromItemName(m_host, texture, (int)AssetType.Texture);
@@ -1786,6 +2005,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         protected void ScaleTexture(SceneObjectPart part, double u, double v, int face)
         {
+            if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
+                return;
+
             Primitive.TextureEntry tex = part.Shape.Textures;
             if (face >= 0 && face < GetNumberOfSides(part))
             {
@@ -1822,6 +2044,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         protected void OffsetTexture(SceneObjectPart part, double u, double v, int face)
         {
+            if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
+                return;
+
             Primitive.TextureEntry tex = part.Shape.Textures;
             if (face >= 0 && face < GetNumberOfSides(part))
             {
@@ -1858,6 +2083,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         protected void RotateTexture(SceneObjectPart part, double rotation, int face)
         {
+            if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
+                return;
+
             Primitive.TextureEntry tex = part.Shape.Textures;
             if (face >= 0 && face < GetNumberOfSides(part))
             {
@@ -1999,7 +2227,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return end;
         }
 
-        protected LSL_Vector GetSetPosTarget(SceneObjectPart part, LSL_Vector targetPos, LSL_Vector fromPos)
+        protected LSL_Vector GetSetPosTarget(SceneObjectPart part, LSL_Vector targetPos, LSL_Vector fromPos, bool adjust)
         {
             if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
                 return fromPos;
@@ -2015,9 +2243,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 if ((targetPos.z < ground) && disable_underground_movement && m_host.ParentGroup.AttachmentPoint == 0)
                     targetPos.z = ground;
             }
-            LSL_Vector real_vec = SetPosAdjust(fromPos, targetPos);
+            if (adjust)
+                return SetPosAdjust(fromPos, targetPos);
 
-            return real_vec;
+            return targetPos;
         }
 
         /// <summary>
@@ -2028,27 +2257,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// <param name="adjust">if TRUE, will cap the distance to 10m.</param>
         protected void SetPos(SceneObjectPart part, LSL_Vector targetPos, bool adjust)
         {
-            // Capped movemment if distance > 10m (http://wiki.secondlife.com/wiki/LlSetPos)
+            if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
+                return;
+
             LSL_Vector currentPos = GetPartLocalPos(part);
+            LSL_Vector toPos = GetSetPosTarget(part, targetPos, currentPos, adjust);
 
-            float ground = World.GetGroundHeight((float)targetPos.x, (float)targetPos.y);
-            bool disable_underground_movement = m_ScriptEngine.Config.GetBoolean("DisableUndergroundMovement", true);
 
             if (part.ParentGroup.RootPart == part)
             {
-                if ((targetPos.z < ground) && disable_underground_movement && m_host.ParentGroup.AttachmentPoint == 0)
-                    targetPos.z = ground;
                 SceneObjectGroup parent = part.ParentGroup;
-                parent.UpdateGroupPosition(!adjust ? targetPos :
-                    SetPosAdjust(currentPos, targetPos));
+                if (!World.Permissions.CanObjectEntry(parent.UUID, false, (Vector3)toPos))
+                    return;
+                Util.FireAndForget(delegate(object x) {
+                    parent.UpdateGroupPosition((Vector3)toPos);
+                });
             }
             else
             {
-                part.OffsetPosition = !adjust ? targetPos :
-                    SetPosAdjust(currentPos, targetPos);
-                SceneObjectGroup parent = part.ParentGroup;
-                parent.HasGroupChanged = true;
-                parent.ScheduleGroupForTerseUpdate();
+                part.OffsetPosition = (Vector3)toPos;
+//                SceneObjectGroup parent = part.ParentGroup;
+//                parent.HasGroupChanged = true;
+//                parent.ScheduleGroupForTerseUpdate();
+                part.ScheduleTerseUpdate();
             }
         }
 
@@ -2077,13 +2308,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             else
             {
                 if (part.ParentGroup.IsAttachment)
-                {
                     pos = part.AttachedPos;
-                }
                 else
-                {
                     pos = part.AbsolutePosition;
-                }
             }
 
 //            m_log.DebugFormat("[LSL API]: Returning {0} in GetPartLocalPos()", pos);
@@ -2095,8 +2322,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
+
+            // Teravus:  if (m_host.ParentID == 0) is bug code because the ParentID for the Avatar will cause this to be nonzero for root prim attachments
+            // which is then treated like a child prim rotation and it's offset gets cumulatively multiplied against.
+            // to fix the scripted rotations we also have to check to see if the root part localid is the same as the host's localid.
+            // RootPart != null should shortcircuit
+            
             // try to let this work as in SL...
-            if (m_host.ParentID == 0)
+            if (m_host.ParentID == 0 || (m_host.ParentGroup != null && m_host == m_host.ParentGroup.RootPart))
             {
                 // special case: If we are root, rotate complete SOG to new rotation
                 SetRot(m_host, rot);
@@ -2123,25 +2356,46 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         protected void SetRot(SceneObjectPart part, Quaternion rot)
         {
-            part.UpdateRotation(rot);
-            // Update rotation does not move the object in the physics scene if it's a linkset.
-
-//KF:  Do NOT use this next line if using ODE physics engine. This need a switch based on .ini Phys Engine type
-//          part.ParentGroup.AbsolutePosition = part.ParentGroup.AbsolutePosition;
-
-            // So, after thinking about this for a bit, the issue with the part.ParentGroup.AbsolutePosition = part.ParentGroup.AbsolutePosition line
-            // is it isn't compatible with vehicles because it causes the vehicle body to have to be broken down and rebuilt
-            // It's perfectly okay when the object is not an active physical body though.
-            // So, part.ParentGroup.ResetChildPrimPhysicsPositions(); does the thing that Kitto is warning against
-            // but only if the object is not physial and active.   This is important for rotating doors.
-            // without the absoluteposition = absoluteposition happening, the doors do not move in the physics
-            // scene
+            if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
+                return;
+
+            bool isroot = (part == part.ParentGroup.RootPart);
+            bool isphys;
+
             PhysicsActor pa = part.PhysActor;
 
-            if (pa != null && !pa.IsPhysical)
+            // keep using physactor ideia of isphysical
+            // it should be SOP ideia of that
+            // not much of a issue with ubitODE
+            if (pa != null && pa.IsPhysical)
+                isphys = true;
+            else
+                isphys = false;
+
+            // SL doesn't let scripts rotate root of physical linksets
+            if (isroot && isphys)
+                return;
+
+            part.UpdateRotation(rot);
+
+            // Update rotation does not move the object in the physics engine if it's a non physical linkset
+            // so do a nasty update of parts positions if is a root part rotation
+            if (isroot && pa != null) // with if above implies non physical  root part
             {
                 part.ParentGroup.ResetChildPrimPhysicsPositions();
             }
+            else // fix sitting avatars. This is only needed bc of how we link avas to child parts, not root part
+            {
+                List<ScenePresence> sittingavas = part.ParentGroup.GetLinkedAvatars();
+                if (sittingavas.Count > 0)
+                {
+                    foreach (ScenePresence av in sittingavas)
+                    {
+                        if (isroot || part.LocalId == av.ParentID)
+                            av.SendTerseUpdateToAllClients();
+                    }
+                }
+            }
         }
 
         /// <summary>
@@ -2158,6 +2412,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             
             m_host.AddScriptLPS(1);
             Quaternion q = m_host.GetWorldRotation();
+
+            if (m_host.ParentGroup != null && m_host.ParentGroup.AttachmentPoint != 0)
+            {
+                ScenePresence avatar = World.GetScenePresence(m_host.ParentGroup.AttachedAvatar);
+                if (avatar != null)
+                {
+                    if ((avatar.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0)
+                        q = avatar.CameraRotation * q; // Mouselook
+                    else
+                        q = avatar.Rotation * q; // Currently infrequently updated so may be inaccurate
+                }
+            }
+
             return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
         }
 
@@ -2183,14 +2450,33 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     q = part.ParentGroup.GroupRotation; // just the group rotation
                 return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
             }
+
             q = part.GetWorldRotation();
+            if (part.ParentGroup.AttachmentPoint != 0)
+            {
+                ScenePresence avatar = World.GetScenePresence(part.ParentGroup.AttachedAvatar);
+                if (avatar != null)
+                {
+                    if ((avatar.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0)
+                        q = avatar.CameraRotation * q; // Mouselook
+                    else
+                        q = avatar.Rotation * q; // Currently infrequently updated so may be inaccurate
+                }
+            }
+
             return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
         }
 
         public LSL_Rotation llGetLocalRot()
         {
+            return GetPartLocalRot(m_host);
+        }
+
+        private LSL_Rotation GetPartLocalRot(SceneObjectPart part)
+        {
             m_host.AddScriptLPS(1);
-            return new LSL_Rotation(m_host.RotationOffset.X, m_host.RotationOffset.Y, m_host.RotationOffset.Z, m_host.RotationOffset.W);
+            Quaternion rot = part.RotationOffset;
+            return new LSL_Rotation(rot.X, rot.Y, rot.Z, rot.W);
         }
 
         public void llSetForce(LSL_Vector force, int local)
@@ -2270,16 +2556,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.ApplyImpulse(v, local != 0);
         }
 
+
         public void llApplyRotationalImpulse(LSL_Vector force, int local)
         {
             m_host.AddScriptLPS(1);
-            m_host.ApplyAngularImpulse(force, local != 0);
+            m_host.ParentGroup.RootPart.ApplyAngularImpulse(force, local != 0);
         }
 
         public void llSetTorque(LSL_Vector torque, int local)
         {
             m_host.AddScriptLPS(1);
-            m_host.SetAngularImpulse(torque, local != 0);
+            m_host.ParentGroup.RootPart.SetAngularImpulse(torque, local != 0);
         }
 
         public LSL_Vector llGetTorque()
@@ -2296,20 +2583,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             llSetTorque(torque, local);
         }
 
+        public void llSetVelocity(LSL_Vector vel, int local)
+        {
+            m_host.AddScriptLPS(1);
+            m_host.SetVelocity(new Vector3((float)vel.x, (float)vel.y, (float)vel.z), local != 0);
+        }
+
         public LSL_Vector llGetVel()
         {
             m_host.AddScriptLPS(1);
 
-            Vector3 vel;
+            Vector3 vel = Vector3.Zero;
 
             if (m_host.ParentGroup.IsAttachment)
             {
                 ScenePresence avatar = m_host.ParentGroup.Scene.GetScenePresence(m_host.ParentGroup.AttachedAvatar);
-                vel = avatar.Velocity;
+                if (avatar != null)
+                    vel = avatar.Velocity;
             }
             else
             {
-                vel = m_host.Velocity;
+                vel = m_host.ParentGroup.RootPart.Velocity;
             }
 
             return new LSL_Vector(vel.X, vel.Y, vel.Z);
@@ -2321,10 +2615,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return new LSL_Vector(m_host.Acceleration.X, m_host.Acceleration.Y, m_host.Acceleration.Z);
         }
 
+        public void llSetAngularVelocity(LSL_Vector avel, int local)
+        {
+            m_host.AddScriptLPS(1);
+            m_host.SetAngularVelocity(new Vector3((float)avel.x, (float)avel.y, (float)avel.z), local != 0);
+        }
+
         public LSL_Vector llGetOmega()
         {
             m_host.AddScriptLPS(1);
-            return new LSL_Vector(m_host.AngularVelocity.X, m_host.AngularVelocity.Y, m_host.AngularVelocity.Z);
+            Vector3 avel = m_host.AngularVelocity;
+            return new LSL_Vector(avel.X, avel.Y, avel.Z);
         }
 
         public LSL_Float llGetTimeOfDay()
@@ -2683,7 +2984,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return src.ToLower();
         }
 
-        public void llGiveMoney(string destination, int amount)
+        public LSL_Integer llGiveMoney(string destination, int amount)
         {
             Util.FireAndForget(x =>
             {
@@ -2715,8 +3016,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 }
 
                 money.ObjectGiveMoney(
-                    m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount);
+                    m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount,UUID.Zero);
             });
+
+            return 0;
         }
 
         public void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
@@ -2795,13 +3098,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         new_group.RootPart.UUID.ToString()) },
                         new DetectParams[0]));
 
-                float groupmass = new_group.GetMass();
+                // do recoil
+                SceneObjectGroup hostgrp = m_host.ParentGroup;
+                if (hostgrp == null)
+                    return;
+
+                if (hostgrp.IsAttachment) // don't recoil avatars
+                    return;
 
                 PhysicsActor pa = new_group.RootPart.PhysActor;
 
                 //Recoil.
                 if (pa != null && pa.IsPhysical && (Vector3)vel != Vector3.Zero)
                 {
+                    float groupmass = new_group.GetMass();
                     Vector3 recoil = -vel * groupmass * m_recoilScaleFactor;
                     if (recoil != Vector3.Zero)
                     {
@@ -2809,6 +3119,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                 }
                 // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay)
+                return;
+
             });
 
             //ScriptSleep((int)((groupmass * velmag) / 10));
@@ -2823,35 +3135,39 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llLookAt(LSL_Vector target, double strength, double damping)
         {
             m_host.AddScriptLPS(1);
-            // Determine where we are looking from
-            LSL_Vector from = llGetPos();
 
-            // Work out the normalised vector from the source to the target
-            LSL_Vector delta = llVecNorm(target - from);
-            LSL_Vector angle = new LSL_Vector(0,0,0);
+            // Get the normalized vector to the target
+            LSL_Vector d1 = llVecNorm(target - llGetPos());
 
-            // Calculate the yaw
-            // subtracting PI_BY_TWO is required to compensate for the odd SL co-ordinate system
-            angle.x = llAtan2(delta.z, delta.y) - ScriptBaseClass.PI_BY_TWO;
+            // Get the bearing (yaw)
+            LSL_Vector a1 = new LSL_Vector(0,0,0);
+            a1.z = llAtan2(d1.y, d1.x);
 
-            // Calculate pitch
-            angle.y = llAtan2(delta.x, llSqrt((delta.y * delta.y) + (delta.z * delta.z)));
+            // Get the elevation (pitch)
+            LSL_Vector a2 = new LSL_Vector(0,0,0);
+            a2.y= -llAtan2(d1.z, llSqrt((d1.x * d1.x) + (d1.y * d1.y)));
 
-            // we need to convert from a vector describing
-            // the angles of rotation in radians into rotation value
-            LSL_Rotation rot = llEuler2Rot(angle);
-            
-            // Per discussion with Melanie, for non-physical objects llLookAt appears to simply
-            // set the rotation of the object, copy that behavior
-            PhysicsActor pa = m_host.PhysActor;
+            LSL_Rotation r1 = llEuler2Rot(a1);
+            LSL_Rotation r2 = llEuler2Rot(a2);
+            LSL_Rotation r3 = new LSL_Rotation(0.000000, 0.707107, 0.000000, 0.707107);
 
-            if (strength == 0 || pa == null || !pa.IsPhysical)
+            if (m_host.PhysActor == null || !m_host.PhysActor.IsPhysical)
             {
-                llSetRot(rot);
+                // Do nothing if either value is 0 (this has been checked in SL)
+                if (strength <= 0.0 || damping <= 0.0)
+                    return;
+
+                llSetRot(r3 * r2 * r1);
             }
             else
             {
-                m_host.StartLookAt(rot, (float)strength, (float)damping);
+                if (strength == 0)
+                {
+                    llSetRot(r3 * r2 * r1);
+                    return;
+                }
+
+                m_host.StartLookAt((Quaternion)(r3 * r2 * r1), (float)strength, (float)damping);
             }
         }
 
@@ -2898,17 +3214,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
             else
             {
-                if (m_host.IsRoot)
-                {
+                // new SL always returns object mass
+//                if (m_host.IsRoot)
+//                {
                     return m_host.ParentGroup.GetMass();
-                }
-                else
-                {
-                    return m_host.GetMass();
-                }
+//                }
+//                else
+//                {
+//                    return m_host.GetMass();
+//                }
             }
         }
 
+ 
+        public LSL_Float llGetMassMKS()
+        {
+            return 100f * llGetMass();
+        }
+
         public void llCollisionFilter(string name, string id, int accept)
         {
             m_host.AddScriptLPS(1);
@@ -2956,8 +3279,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     {
                         // Unregister controls from Presence
                         presence.UnRegisterControlEventsToScript(m_host.LocalId, m_item.ItemID);
-                        // Remove Take Control permission.
-                        m_item.PermsMask &= ~ScriptBaseClass.PERMISSION_TAKE_CONTROLS;
                     }
                 }
             }
@@ -2985,7 +3306,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
 
             if (attachmentsModule != null)
-                return attachmentsModule.AttachObject(presence, grp, (uint)attachmentPoint, false, false);
+                return attachmentsModule.AttachObject(presence, grp, (uint)attachmentPoint, false, true, false);
             else
                 return false;
         }
@@ -3015,9 +3336,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-//            if (m_host.ParentGroup.RootPart.AttachmentPoint == 0)
-//                return;
-
             if (m_item.PermsGranter != m_host.OwnerID)
                 return;
 
@@ -3060,6 +3378,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public void llInstantMessage(string user, string message)
         {
+            UUID result;
+            if (!UUID.TryParse(user, out result) || result == UUID.Zero)
+            {
+                ShoutError("An invalid key  was passed to llInstantMessage");
+                ScriptSleep(2000);
+                return;
+            }
+            
+
             m_host.AddScriptLPS(1);
 
             // We may be able to use ClientView.SendInstantMessage here, but we need a client instance.
@@ -3074,14 +3401,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             UUID friendTransactionID = UUID.Random();
 
             //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID);
-
+            
             GridInstantMessage msg = new GridInstantMessage();
             msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid;
             msg.toAgentID = new Guid(user); // toAgentID.Guid;
             msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here
 //            m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message);
 //            m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString());
-            msg.timestamp = (uint)Util.UnixTimeSinceEpoch();// timestamp;
+//            DateTime dt = DateTime.UtcNow;
+//
+//            // Ticks from UtcNow, but make it look like local. Evil, huh?
+//            dt = DateTime.SpecifyKind(dt, DateTimeKind.Local);
+//
+//            try
+//            {
+//                // Convert that to the PST timezone
+//                TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles");
+//                dt = TimeZoneInfo.ConvertTime(dt, timeZoneInfo);
+//            }
+//            catch
+//            {
+//                // No logging here, as it could be VERY spammy
+//            }
+//
+//            // And make it look local again to fool the unix time util
+//            dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc);
+
+            msg.timestamp = (uint)Util.UnixTimeSinceEpoch();
+
             //if (client != null)
             //{
                 msg.fromAgentName = m_host.Name;//client.FirstName + " " + client.LastName;// fromAgentName;
@@ -3095,12 +3442,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 msg.message = message.Substring(0, 1024);
             else
                 msg.message = message;
-            msg.dialog = (byte)19; // messgage from script ??? // dialog;
+            msg.dialog = (byte)19; // MessageFromObject
             msg.fromGroup = false;// fromGroup;
             msg.offline = (byte)0; //offline;
-            msg.ParentEstateID = 0; //ParentEstateID;
+            msg.ParentEstateID = World.RegionInfo.EstateSettings.EstateID;
             msg.Position = new Vector3(m_host.AbsolutePosition);
-            msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid;
+            msg.RegionID = World.RegionInfo.RegionID.Guid;
             msg.binaryBucket 
                 = Util.StringToBytes256(
                     "{0}/{1}/{2}/{3}", 
@@ -3128,7 +3475,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
 
             emailModule.SendEmail(m_host.UUID, address, subject, message);
-            llSleep(EMAIL_PAUSE_TIME);
+            ScriptSleep(EMAIL_PAUSE_TIME * 1000);
         }
 
         public void llGetNextEmail(string address, string subject)
@@ -3374,7 +3721,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS |
                         ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
                         ScriptBaseClass.PERMISSION_CONTROL_CAMERA |
+                        ScriptBaseClass.PERMISSION_TRACK_CAMERA |
                         ScriptBaseClass.PERMISSION_ATTACH;
+
             }
             else
             {
@@ -3391,15 +3740,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     if (World.GetExtraSetting("auto_grant_attach_perms") == "true")
                         implicitPerms = ScriptBaseClass.PERMISSION_ATTACH;
                 }
+                if (World.GetExtraSetting("auto_grant_all_perms") == "true")
+                {
+                    implicitPerms = perm;
+                }
             }
 
             if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
             {
-                lock (m_host.TaskInventory)
-                {
-                    m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID;
-                    m_host.TaskInventory[m_item.ItemID].PermsMask = perm;
-                }
+                m_host.TaskInventory.LockItemsForWrite(true);
+                m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID;
+                m_host.TaskInventory[m_item.ItemID].PermsMask = perm;
+                m_host.TaskInventory.LockItemsForWrite(false);
 
                 m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams(
                         "run_time_permissions", new Object[] {
@@ -3442,11 +3794,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 if (!m_waitingForScriptAnswer)
                 {
-                    lock (m_host.TaskInventory)
-                    {
-                        m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID;
-                        m_host.TaskInventory[m_item.ItemID].PermsMask = 0;
-                    }
+                    m_host.TaskInventory.LockItemsForWrite(true);
+                    m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID;
+                    m_host.TaskInventory[m_item.ItemID].PermsMask = 0;
+                    m_host.TaskInventory.LockItemsForWrite(false);
 
                     presence.ControllingClient.OnScriptAnswer += handleScriptAnswer;
                     m_waitingForScriptAnswer=true;
@@ -3475,14 +3826,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0)
                 llReleaseControls();
 
-            lock (m_host.TaskInventory)
-            {
-                m_host.TaskInventory[m_item.ItemID].PermsMask = answer;
-            }
-
-            m_ScriptEngine.PostScriptEvent(
-                m_item.ItemID,
-                new EventParams("run_time_permissions", new Object[] { new LSL_Integer(answer) }, new DetectParams[0]));
+            m_host.TaskInventory.LockItemsForWrite(true);
+            m_host.TaskInventory[m_item.ItemID].PermsMask = answer;
+            m_host.TaskInventory.LockItemsForWrite(false);
+            
+            m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams(
+                    "run_time_permissions", new Object[] {
+                    new LSL_Integer(answer) },
+                    new DetectParams[0]));
         }
 
         public LSL_String llGetPermissionsKey()
@@ -3521,14 +3872,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llSetLinkColor(int linknumber, LSL_Vector color, int face)
         {
             List<SceneObjectPart> parts = GetLinkParts(linknumber);
-
-            foreach (SceneObjectPart part in parts)
-                part.SetFaceColorAlpha(face, color, null);
+            if (parts.Count > 0)
+            {
+                try
+                {
+                    foreach (SceneObjectPart part in parts)
+                        part.SetFaceColorAlpha(face, color, null);
+                }
+                finally
+                {
+                }
+            }
         }
 
         public void llCreateLink(string target, int parent)
         {
             m_host.AddScriptLPS(1);
+
             UUID targetID;
 
             if (!UUID.TryParse(target, out targetID))
@@ -3634,10 +3994,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 // Restructuring Multiple Prims.
                 List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Parts);
                 parts.Remove(parentPrim.RootPart);
-                foreach (SceneObjectPart part in parts)
+                if (parts.Count > 0)
                 {
-                    parentPrim.DelinkFromGroup(part.LocalId, true);
+                    try
+                    {
+                        foreach (SceneObjectPart part in parts)
+                        {
+                            parentPrim.DelinkFromGroup(part.LocalId, true);
+                        }
+                    }
+                    finally
+                    {
+                    }
                 }
+
                 parentPrim.HasGroupChanged = true;
                 parentPrim.ScheduleGroupForFullUpdate();
                 parentPrim.TriggerScriptChangedEvent(Changed.LINK);
@@ -3646,12 +4016,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 {
                     SceneObjectPart newRoot = parts[0];
                     parts.Remove(newRoot);
-                    foreach (SceneObjectPart part in parts)
+
+                    try
                     {
-                        // Required for linking
-                        part.ClearUpdateSchedule();
-                        newRoot.ParentGroup.LinkToGroup(part.ParentGroup);
+                        foreach (SceneObjectPart part in parts)
+                        {
+                            part.ClearUpdateSchedule();
+                            newRoot.ParentGroup.LinkToGroup(part.ParentGroup);
+                        }
                     }
+                    finally
+                    {
+                    }                    
+                    
+                    
                     newRoot.ParentGroup.HasGroupChanged = true;
                     newRoot.ParentGroup.ScheduleGroupForFullUpdate();
                 }
@@ -3671,6 +4049,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llBreakAllLinks()
         {
             m_host.AddScriptLPS(1);
+
+            TaskInventoryItem item = m_item;
+             
+            if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
+                && !m_automaticLinkPermission)
+            {
+                ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
+                return;
+            }
+
             SceneObjectGroup parentPrim = m_host.ParentGroup;
             if (parentPrim.AttachmentPoint != 0)
                 return; // Fail silently if attached
@@ -3690,47 +4078,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_String llGetLinkKey(int linknum)
         {
             m_host.AddScriptLPS(1);
-
-            if (linknum < 0)
-            {
-                if (linknum == ScriptBaseClass.LINK_THIS)
-                    return m_host.UUID.ToString();
-                else
-                    return ScriptBaseClass.NULL_KEY;
-            }
-
-            int actualPrimCount = m_host.ParentGroup.PrimCount;
-            List<UUID> sittingAvatarIds = m_host.ParentGroup.GetSittingAvatars();
-            int adjustedPrimCount = actualPrimCount + sittingAvatarIds.Count;
-
-            // Special case for a single prim.  In this case the linknum is zero.  However, this will not match a single
-            // prim that has any avatars sat upon it (in which case the root prim is link 1).
-            if (linknum == 0)
-            {
-                if (actualPrimCount == 1 && sittingAvatarIds.Count == 0)
-                    return m_host.UUID.ToString();
-
-                return ScriptBaseClass.NULL_KEY;
-            }
-            // Special case to handle a single prim with sitting avatars.  GetLinkPart() would only match zero but
-            // here we must match 1 (ScriptBaseClass.LINK_ROOT).
-            else if (linknum == 1 && actualPrimCount == 1)
-            {
-                if (sittingAvatarIds.Count > 0)
-                    return m_host.ParentGroup.RootPart.UUID.ToString();
-                else
-                    return ScriptBaseClass.NULL_KEY;
-            }
-            else if (linknum <= adjustedPrimCount)
+            SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknum);
+            if (part != null)
             {
-                if (linknum <= actualPrimCount)
-                    return m_host.ParentGroup.GetLinkNumPart(linknum).UUID.ToString();
-                else
-                    return sittingAvatarIds[linknum - actualPrimCount - 1].ToString();
+                return part.UUID.ToString();
             }
             else
             {
-                return ScriptBaseClass.NULL_KEY;
+                if (linknum > m_host.ParentGroup.PrimCount || (linknum == 1 && m_host.ParentGroup.PrimCount == 1))
+                {
+                    linknum -= (m_host.ParentGroup.PrimCount) + 1;
+
+                    if (linknum < 0)
+                        return UUID.Zero.ToString();
+
+                    List<ScenePresence> avatars = GetLinkAvatars(ScriptBaseClass.LINK_SET);
+                    if (avatars.Count > linknum)
+                    {
+                        return avatars[linknum].UUID.ToString();
+                    }
+                }
+                return UUID.Zero.ToString();
             }
         }
 
@@ -3833,17 +4201,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             int count = 0;
 
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+            foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
             {
-                foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
+                if (inv.Value.Type == type || type == -1)
                 {
-                    if (inv.Value.Type == type || type == -1)
-                    {
-                        count = count + 1;
-                    }
+                    count = count + 1;
                 }
             }
-
+            
+            m_host.TaskInventory.LockItemsForRead(false);
             return count;
         }
 
@@ -3852,16 +4219,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             ArrayList keys = new ArrayList();
 
-            lock (m_host.TaskInventory)
+            m_host.TaskInventory.LockItemsForRead(true);
+            foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
             {
-                foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
+                if (inv.Value.Type == type || type == -1)
                 {
-                    if (inv.Value.Type == type || type == -1)
-                    {
-                        keys.Add(inv.Value.Name);
-                    }
+                    keys.Add(inv.Value.Name);
                 }
             }
+            m_host.TaskInventory.LockItemsForRead(false);
 
             if (keys.Count == 0)
             {
@@ -3899,7 +4265,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (item == null)
             {
                 llSay(0, String.Format("Could not find object '{0}'", inventory));
-                throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory));
+                return;
+//                throw new Exception(String.Format("The inventory object '{0}' could not be found", inventory));
             }
 
             UUID objId = item.ItemID;
@@ -3927,33 +4294,45 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         return;
                     }
                 }
+
                 // destination is an avatar
                 InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId);
 
                 if (agentItem == null)
                     return;
 
-                if (m_TransferModule != null)
-                {
-                    byte[] bucket = new byte[1];
-                    bucket[0] = (byte)item.Type;
+                byte[] bucket = new byte[1];
+                bucket[0] = (byte)item.Type;
+                //byte[] objBytes = agentItem.ID.GetBytes();
+                //Array.Copy(objBytes, 0, bucket, 1, 16);
+
+                GridInstantMessage msg = new GridInstantMessage(World,
+                        m_host.OwnerID, m_host.Name, destId,
+                        (byte)InstantMessageDialog.TaskInventoryOffered,
+                        false, item.Name+". "+m_host.Name+" is located at "+
+                        World.RegionInfo.RegionName+" "+
+                        m_host.AbsolutePosition.ToString(),
+                        agentItem.ID, true, m_host.AbsolutePosition,
+                        bucket, true);
 
-                    GridInstantMessage msg = new GridInstantMessage(World,
-                            m_host.OwnerID, m_host.Name, destId,
-                            (byte)InstantMessageDialog.TaskInventoryOffered,
-                            false, item.Name+". "+m_host.Name+" is located at "+
-                            World.RegionInfo.RegionName+" "+
-                            m_host.AbsolutePosition.ToString(),
-                            agentItem.ID, true, m_host.AbsolutePosition,
-                            bucket, true);
+                ScenePresence sp;
 
-                    m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
+                if (World.TryGetScenePresence(destId, out sp))
+                {
+                    sp.ControllingClient.SendInstantMessage(msg);
                 }
-
+                else
+                {
+                    if (m_TransferModule != null)
+                        m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
+                }
+                
+                //This delay should only occur when giving inventory to avatars.
                 ScriptSleep(3000);
             }
         }
 
+        [DebuggerNonUserCode]
         public void llRemoveInventory(string name)
         {
             m_host.AddScriptLPS(1);
@@ -4008,109 +4387,115 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            UUID uuid = (UUID)id;
-            PresenceInfo pinfo = null;
-            UserAccount account;
-
-            UserInfoCacheEntry ce;
-            if (!m_userInfoCache.TryGetValue(uuid, out ce))
+            UUID uuid;
+            if (UUID.TryParse(id, out uuid))
             {
-                account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid);
-                if (account == null)
+                PresenceInfo pinfo = null;
+                UserAccount account;
+
+                UserInfoCacheEntry ce;
+                if (!m_userInfoCache.TryGetValue(uuid, out ce))
                 {
-                    m_userInfoCache[uuid] = null; // Cache negative
-                    return UUID.Zero.ToString();
-                }
+                    account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid);
+                    if (account == null)
+                    {
+                        m_userInfoCache[uuid] = null; // Cache negative
+                        return UUID.Zero.ToString();
+                    }
 
 
-                PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
-                if (pinfos != null && pinfos.Length > 0)
-                {
-                    foreach (PresenceInfo p in pinfos)
+                    PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
+                    if (pinfos != null && pinfos.Length > 0)
                     {
-                        if (p.RegionID != UUID.Zero)
+                        foreach (PresenceInfo p in pinfos)
                         {
-                            pinfo = p;
+                            if (p.RegionID != UUID.Zero)
+                            {
+                                pinfo = p;
+                            }
                         }
                     }
-                }
 
-                ce = new UserInfoCacheEntry();
-                ce.time = Util.EnvironmentTickCount();
-                ce.account = account;
-                ce.pinfo = pinfo;
-            }
-            else
-            {
-                if (ce == null)
-                    return UUID.Zero.ToString();
+                    ce = new UserInfoCacheEntry();
+                    ce.time = Util.EnvironmentTickCount();
+                    ce.account = account;
+                    ce.pinfo = pinfo;
+                    m_userInfoCache[uuid] = ce;
+                }
+                else
+                {
+                    if (ce == null)
+                        return UUID.Zero.ToString();
 
-                account = ce.account;
-                pinfo = ce.pinfo;
-            }
+                    account = ce.account;
+                    pinfo = ce.pinfo;
+                }
 
-            if (Util.EnvironmentTickCount() < ce.time || (Util.EnvironmentTickCount() - ce.time) >= 20000)
-            {
-                PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
-                if (pinfos != null && pinfos.Length > 0)
+                if (Util.EnvironmentTickCount() < ce.time || (Util.EnvironmentTickCount() - ce.time) >= 20000)
                 {
-                    foreach (PresenceInfo p in pinfos)
+                    PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
+                    if (pinfos != null && pinfos.Length > 0)
                     {
-                        if (p.RegionID != UUID.Zero)
+                        foreach (PresenceInfo p in pinfos)
                         {
-                            pinfo = p;
+                            if (p.RegionID != UUID.Zero)
+                            {
+                                pinfo = p;
+                            }
                         }
                     }
-                }
-                else
-                    pinfo = null;
+                    else
+                        pinfo = null;
 
-                ce.time = Util.EnvironmentTickCount();
-                ce.pinfo = pinfo;
-            }
+                    ce.time = Util.EnvironmentTickCount();
+                    ce.pinfo = pinfo;
+                }
 
-            string reply = String.Empty;
+                string reply = String.Empty;
 
-            switch (data)
-            {
-            case 1: // DATA_ONLINE (0|1)
-                if (pinfo != null && pinfo.RegionID != UUID.Zero)
-                    reply = "1";
-                else
-                    reply = "0";
-                break;
-            case 2: // DATA_NAME (First Last)
-                reply = account.FirstName + " " + account.LastName;
-                break;
-            case 3: // DATA_BORN (YYYY-MM-DD)
-                DateTime born = new DateTime(1970, 1, 1, 0, 0, 0, 0);
-                born = born.AddSeconds(account.Created);
-                reply = born.ToString("yyyy-MM-dd");
-                break;
-            case 4: // DATA_RATING (0,0,0,0,0,0)
-                reply = "0,0,0,0,0,0";
-                break;
-            case 7: // DATA_USERLEVEL (integer)
-                reply = account.UserLevel.ToString();
-                break;
-            case 8: // DATA_PAYINFO (0|1|2|3)
-                reply = "0";
-                break;
-            default:
-                return UUID.Zero.ToString(); // Raise no event
-            }
+                switch (data)
+                {
+                    case 1: // DATA_ONLINE (0|1)
+                        if (pinfo != null && pinfo.RegionID != UUID.Zero)
+                            reply = "1";
+                        else
+                            reply = "0";
+                        break;
+                    case 2: // DATA_NAME (First Last)
+                        reply = account.FirstName + " " + account.LastName;
+                        break;
+                    case 3: // DATA_BORN (YYYY-MM-DD)
+                        DateTime born = new DateTime(1970, 1, 1, 0, 0, 0, 0);
+                        born = born.AddSeconds(account.Created);
+                        reply = born.ToString("yyyy-MM-dd");
+                        break;
+                    case 4: // DATA_RATING (0,0,0,0,0,0)
+                        reply = "0,0,0,0,0,0";
+                        break;
+                    case 8: // DATA_PAYINFO (0|1|2|3)
+                        reply = "0";
+                        break;
+                    default:
+                        return UUID.Zero.ToString(); // Raise no event
+                }
 
-            UUID rq = UUID.Random();
+                UUID rq = UUID.Random();
 
-            UUID tid = AsyncCommands.
-                DataserverPlugin.RegisterRequest(m_host.LocalId,
-                                             m_item.ItemID, rq.ToString());
+                UUID tid = AsyncCommands.
+                    DataserverPlugin.RegisterRequest(m_host.LocalId,
+                                                 m_item.ItemID, rq.ToString());
 
-            AsyncCommands.
-            DataserverPlugin.DataserverReply(rq.ToString(), reply);
+                AsyncCommands.
+                DataserverPlugin.DataserverReply(rq.ToString(), reply);
 
-            ScriptSleep(100);
-            return tid.ToString();
+                ScriptSleep(100);
+                return tid.ToString();
+            }
+            else
+            {
+                ShoutError("Invalid UUID passed to llRequestAgentData.");
+            }
+            return "";
         }
 
         public LSL_String llRequestInventoryData(string name)
@@ -4167,13 +4552,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (UUID.TryParse(agent, out agentId))
             {
                 ScenePresence presence = World.GetScenePresence(agentId);
-                if (presence != null)
+                if (presence != null && presence.PresenceType != PresenceType.Npc)
                 {
+                    // agent must not be a god
+                    if (presence.UserLevel >= 200) return;
+
                     // agent must be over the owners land
                     if (m_host.OwnerID == World.LandChannel.GetLandObject(
                             presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID)
                     {
-                        World.TeleportClientHome(agentId, presence.ControllingClient);
+                        if (!World.TeleportClientHome(agentId, presence.ControllingClient))
+                        {
+                            // They can't be teleported home for some reason
+                            GridRegion regionInfo = World.GridService.GetRegionByUUID(UUID.Zero, new UUID("2b02daac-e298-42fa-9a75-f488d37896e6"));
+                            if (regionInfo != null)
+                            {
+                                World.RequestTeleportLocation(
+                                    presence.ControllingClient, regionInfo.RegionHandle, new Vector3(128, 128, 23), Vector3.Zero,
+                                    (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome));
+                            }
+                        }
                     }
                 }
             }
@@ -4280,7 +4678,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             UUID av = new UUID();
             if (!UUID.TryParse(agent,out av))
             {
-                LSLError("First parameter to llDialog needs to be a key");
                 return;
             }
 
@@ -4312,10 +4709,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llCollisionSound(string impact_sound, double impact_volume)
         {
             m_host.AddScriptLPS(1);
-            
+
+            if(impact_sound == "")
+            {
+                m_host.CollisionSoundVolume = (float)impact_volume;
+                m_host.CollisionSound = m_host.invalidCollisionSoundUUID;
+                m_host.CollisionSoundType = 0;
+                return;
+            }
             // TODO: Parameter check logic required.
             m_host.CollisionSound = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, impact_sound, AssetType.Sound);
             m_host.CollisionSoundVolume = (float)impact_volume;
+            m_host.CollisionSoundType = 1;
         }
 
         public LSL_String llGetAnimation(string id)
@@ -4329,14 +4734,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             if (m_host.RegionHandle == presence.RegionHandle)
             {
-                Dictionary<UUID, string> animationstateNames = DefaultAvatarAnimations.AnimStateNames;
-
                 if (presence != null)
                 {
-                    AnimationSet currentAnims = presence.Animator.Animations;
-                    string currentAnimationState = String.Empty;
-                    if (animationstateNames.TryGetValue(currentAnims.ImplicitDefaultAnimation.AnimID, out currentAnimationState))
-                        return currentAnimationState;
+                    if (presence.SitGround)
+                        return "Sitting on Ground";
+                    if (presence.ParentID != 0 || presence.ParentUUID != UUID.Zero)
+                        return "Sitting";
+
+                    string movementAnimation = presence.Animator.CurrentMovementAnimation;
+                    string lslMovementAnimation;
+                    
+                    if (MovementAnimationsForLSL.TryGetValue(movementAnimation, out lslMovementAnimation))
+                        return lslMovementAnimation;
                 }
             }
 
@@ -4484,7 +4893,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 float distance = (PusheePos - m_host.AbsolutePosition).Length();
                 float distance_term = distance * distance * distance; // Script Energy
-                float pusher_mass = m_host.GetMass();
+                // use total object mass and not part
+                float pusher_mass = m_host.ParentGroup.GetMass();
 
                 float PUSH_ATTENUATION_DISTANCE = 17f;
                 float PUSH_ATTENUATION_SCALE = 5f;
@@ -4738,6 +5148,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 return item.AssetID.ToString();
             }
+            m_host.TaskInventory.LockItemsForRead(false);
 
             return UUID.Zero.ToString();
         }
@@ -4890,14 +5301,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            if (src == null)
-            {
-                return 0;
-            }
-            else
-            {
-                return src.Length;
-            }
+            return src.Length;
         }
 
         public LSL_Integer llList2Integer(LSL_List src, int index)
@@ -4968,7 +5372,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 else if (src.Data[index] is LSL_Float)
                     return Convert.ToDouble(((LSL_Float)src.Data[index]).value);
                 else if (src.Data[index] is LSL_String)
-                    return Convert.ToDouble(((LSL_String)src.Data[index]).m_string);
+                {
+                    string str = ((LSL_String) src.Data[index]).m_string;
+                    Match m = Regex.Match(str, "^\\s*(-?\\+?[,0-9]+\\.?[0-9]*)");
+                    if (m != Match.Empty)
+                    {
+                        str = m.Value;
+                        double d = 0.0;
+                        if (!Double.TryParse(str, out d))
+                            return 0.0;
+
+                        return d;
+                    }
+                    return 0.0;
+                }
                 return Convert.ToDouble(src.Data[index]);
             }
             catch (FormatException)
@@ -5010,7 +5427,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // for completion and should LSL_Key ever be implemented 
             // as it's own struct
             else if (!(src.Data[index] is LSL_String ||
-                    src.Data[index] is LSL_Key))
+                    src.Data[index] is LSL_Key ||
+                    src.Data[index] is String))
             {
                 return "";
             }
@@ -5268,7 +5686,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                 }
             }
-            else {
+            else
+            {
                 object[] array = new object[src.Length];
                 Array.Copy(src.Data, 0, array, 0, src.Length);
                 result = new LSL_List(array);
@@ -5375,7 +5794,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Integer llGetRegionAgentCount()
         {
             m_host.AddScriptLPS(1);
-            return new LSL_Integer(World.GetRootAgentCount());
+
+            int count = 0;
+            World.ForEachRootScenePresence(delegate(ScenePresence sp) {
+                count++;
+            });
+
+            return new LSL_Integer(count);
         }
 
         public LSL_Vector llGetRegionCorner()
@@ -5616,6 +6041,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 flags |= ScriptBaseClass.AGENT_AWAY;
             }
 
+            UUID busy = new UUID("efcf670c-2d18-8128-973a-034ebc806b67");
+            UUID[] anims = agent.Animator.GetAnimationArray();
+            if (Array.Exists<UUID>(anims, a => { return a == busy; }))
+            {
+                flags |= ScriptBaseClass.AGENT_BUSY;
+            }
+
             // seems to get unset, even if in mouselook, when avatar is sitting on a prim???
             if ((agent.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0)
             {
@@ -5663,6 +6095,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                  flags |= ScriptBaseClass.AGENT_SITTING;
              }
 
+             if (agent.Appearance.VisualParams[(int)AvatarAppearance.VPElement.SHAPE_MALE] > 0)
+             {
+                 flags |= ScriptBaseClass.AGENT_MALE;
+             }
+
             return flags;
         }
 
@@ -5810,9 +6247,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             List<SceneObjectPart> parts = GetLinkParts(linknumber);
 
-            foreach (SceneObjectPart part in parts)
+            try
+            {
+                foreach (SceneObjectPart part in parts)
+                {
+                    SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate);
+                }
+            }
+            finally
             {
-                SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate);
             }
         }
 
@@ -5866,13 +6309,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                     if (m_host.OwnerID == land.LandData.OwnerID)
                     {
-                        World.TeleportClientHome(agentID, presence.ControllingClient);
+                        Vector3 pos = World.GetNearestAllowedPosition(presence, land);
+                        presence.TeleportWithMomentum(pos, null);
+                        presence.ControllingClient.SendAlertMessage("You have been ejected from this land");
                     }
                 }
             }
             ScriptSleep(5000);
         }
 
+        public LSL_List llParseString2List(string str, LSL_List separators, LSL_List in_spacers)
+        {
+            return ParseString2List(str, separators, in_spacers, false);
+        }
+
         public LSL_Integer llOverMyLand(string id)
         {
             m_host.AddScriptLPS(1);
@@ -5926,25 +6376,55 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
             else
             {
-                agentSize = new LSL_Vector(0.45, 0.6, avatar.Appearance.AvatarHeight);
+//                agentSize = new LSL_Vector(0.45f, 0.6f, avatar.Appearance.AvatarHeight);
+                Vector3 s = avatar.Appearance.AvatarSize;
+                agentSize = new LSL_Vector(s.X, s.Y, s.Z);
             }
             return agentSize;
         }
 
-        public LSL_Integer llSameGroup(string agent)
+        public LSL_Integer llSameGroup(string id)
         {
             m_host.AddScriptLPS(1);
-            UUID agentId = new UUID();
-            if (!UUID.TryParse(agent, out agentId))
+            UUID uuid = new UUID();
+            if (!UUID.TryParse(id, out uuid))
                 return new LSL_Integer(0);
-            ScenePresence presence = World.GetScenePresence(agentId);
-            if (presence == null || presence.IsChildAgent) // Return flase for child agents
-                return new LSL_Integer(0);
-            IClientAPI client = presence.ControllingClient;
-            if (m_host.GroupID == client.ActiveGroupId)
+
+            // Check if it's a group key
+            if (uuid == m_host.ParentGroup.RootPart.GroupID)
                 return new LSL_Integer(1);
-            else
+
+            // We got passed a UUID.Zero
+            if (uuid == UUID.Zero)
+                return new LSL_Integer(0);
+
+            // Handle the case where id names an avatar
+            ScenePresence presence = World.GetScenePresence(uuid);
+            if (presence != null)
+            {
+                if (presence.IsChildAgent)
+                    return new LSL_Integer(0);
+
+                IClientAPI client = presence.ControllingClient;
+                if (m_host.ParentGroup.RootPart.GroupID == client.ActiveGroupId)
+                    return new LSL_Integer(1);
+
+                return new LSL_Integer(0);
+            }
+
+            // Handle object case
+            SceneObjectPart part = World.GetSceneObjectPart(uuid);
+            if (part != null)
+            {
+                // This will handle both deed and non-deed and also the no
+                // group case
+                if (part.ParentGroup.RootPart.GroupID == m_host.ParentGroup.RootPart.GroupID)
+                    return new LSL_Integer(1);
+
                 return new LSL_Integer(0);
+            }
+
+            return new LSL_Integer(0);
         }
 
         public void llUnSit(string id)
@@ -6069,7 +6549,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return m_host.ParentGroup.AttachmentPoint;
         }
 
-        public LSL_Integer llGetFreeMemory()
+        public virtual LSL_Integer llGetFreeMemory()
         {
             m_host.AddScriptLPS(1);
             // Make scripts designed for LSO happy
@@ -6501,6 +6981,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         protected void SitTarget(SceneObjectPart part, LSL_Vector offset, LSL_Rotation rot)
         {
+            // LSL quaternions can normalize to 0, normal Quaternions can't.
+            if (rot.s == 0 && rot.x == 0 && rot.y == 0 && rot.z == 0)
+                rot.s = 1; // ZERO_ROTATION = 0,0,0,1
+
             part.SitTargetPosition = offset;
             part.SitTargetOrientation = rot;
             part.ParentGroup.HasGroupChanged = true;
@@ -6686,30 +7170,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             UUID av = new UUID();
             if (!UUID.TryParse(avatar,out av))
             {
-                LSLError("First parameter to llDialog needs to be a key");
+                //LSLError("First parameter to llDialog needs to be a key");
                 return;
             }
             if (buttons.Length < 1)
             {
-                LSLError("No less than 1 button can be shown");
-                return;
+                buttons.Add("OK");
             }
             if (buttons.Length > 12)
             {
-                LSLError("No more than 12 buttons can be shown");
-                return;
+                ShoutError("button list too long, must be 12 or fewer entries");
             }
-            string[] buts = new string[buttons.Length];
-            for (int i = 0; i < buttons.Length; i++)
+            int length = buttons.Length;
+            if (length > 12)
+                length = 12;
+
+            string[] buts = new string[length];
+            for (int i = 0; i < length; i++)
             {
                 if (buttons.Data[i].ToString() == String.Empty)
                 {
-                    LSLError("button label cannot be blank");
+                    ShoutError("button label cannot be blank");
                     return;
                 }
                 if (buttons.Data[i].ToString().Length > 24)
                 {
-                    LSLError("button label cannot be longer than 24 characters");
+                    ShoutError("button label cannot be longer than 24 characters");
                     return;
                 }
                 buts[i] = buttons.Data[i].ToString();
@@ -6776,9 +7262,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return;
             }
 
-            // the rest of the permission checks are done in RezScript, so check the pin there as well
-            World.RezScriptFromPrim(item.ItemID, m_host, destId, pin, running, start_param);
+            SceneObjectPart dest = World.GetSceneObjectPart(destId);
+            if (dest != null)
+            {
+                if ((item.BasePermissions & (uint)PermissionMask.Transfer) != 0 || dest.ParentGroup.RootPart.OwnerID == m_host.ParentGroup.RootPart.OwnerID)
+                {
+                    // the rest of the permission checks are done in RezScript, so check the pin there as well
+                    World.RezScriptFromPrim(item.ItemID, m_host, destId, pin, running, start_param);
 
+                    if ((item.BasePermissions & (uint)PermissionMask.Copy) == 0)
+                        m_host.Inventory.RemoveInventoryItem(item.ItemID);
+                }
+            }
             // this will cause the delay even if the script pin or permissions were wrong - seems ok
             ScriptSleep(3000);
         }
@@ -6852,19 +7347,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_String llMD5String(string src, int nonce)
         {
             m_host.AddScriptLPS(1);
-            return Util.Md5Hash(String.Format("{0}:{1}", src, nonce.ToString()));
+            return Util.Md5Hash(String.Format("{0}:{1}", src, nonce.ToString()), Encoding.UTF8);
         }
 
         public LSL_String llSHA1String(string src)
         {
             m_host.AddScriptLPS(1);
-            return Util.SHA1Hash(src).ToLower();
+            return Util.SHA1Hash(src, Encoding.UTF8).ToLower();
         }
 
         protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, byte profileshape, byte pathcurve)
         {
             float tempFloat;                                    // Use in float expressions below to avoid byte cast precision issues.
             ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
+            if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
+                return shapeBlock;
 
             if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT &&
                 holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE &&
@@ -6969,6 +7466,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         // Prim type box, cylinder and prism.
         protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector taper_b, LSL_Vector topshear, byte profileshape, byte pathcurve)
         {
+            if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
+                return;
+
             float tempFloat;                                    // Use in float expressions below to avoid byte cast precision issues.
             ObjectShapePacket.ObjectDataBlock shapeBlock;
 
@@ -7022,6 +7522,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         // Prim type sphere.
         protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte profileshape, byte pathcurve)
         {
+            if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
+                return;
+
             ObjectShapePacket.ObjectDataBlock shapeBlock;
 
             shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist, profileshape, pathcurve);
@@ -7063,6 +7566,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         // Prim type torus, tube and ring.
         protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector holesize, LSL_Vector topshear, LSL_Vector profilecut, LSL_Vector taper_a, float revolutions, float radiusoffset, float skew, byte profileshape, byte pathcurve)
         {
+            if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
+                return;
+
             float tempFloat;                                    // Use in float expressions below to avoid byte cast precision issues.
             ObjectShapePacket.ObjectDataBlock shapeBlock;
 
@@ -7198,6 +7704,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         // Prim type sculpt.
         protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type, byte pathcurve)
         {
+            if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
+                return;
+
             ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
             UUID sculptId;
 
@@ -7220,7 +7729,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 type != (ScriptBaseClass.PRIM_SCULPT_TYPE_TORUS | flag))
             {
                 // default
-                type = (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE;
+                type = type | (int)ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE;
             }
 
             part.Shape.SetSculptProperties((byte)type, sculptId);
@@ -7237,48 +7746,130 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             ScriptSleep(200);
         }
 
-        public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules)
+        public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules)
         {
             m_host.AddScriptLPS(1);
 
-            setLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParams");
+            setLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParamsFast");
+        }
 
-            ScriptSleep(200);
+        private void setLinkPrimParams(int linknumber, LSL_List rules, string originFunc)
+        {
+            List<object> parts = new List<object>();
+            List<SceneObjectPart> prims = GetLinkParts(linknumber);
+            List<ScenePresence> avatars = GetLinkAvatars(linknumber);
+            foreach (SceneObjectPart p in prims)
+                parts.Add(p);
+            foreach (ScenePresence p in avatars)
+                parts.Add(p);
+
+            LSL_List remaining = null;
+            uint rulesParsed = 0;
+
+            if (parts.Count > 0)
+            {
+                foreach (object part in parts)
+                {
+                    if (part is SceneObjectPart)
+                        remaining = SetPrimParams((SceneObjectPart)part, rules, originFunc, ref rulesParsed);
+                    else
+                        remaining = SetPrimParams((ScenePresence)part, rules, originFunc, ref rulesParsed);
+                }
+
+                while ((object)remaining != null && remaining.Length > 2)
+                {
+                    linknumber = remaining.GetLSLIntegerItem(0);
+                    rules = remaining.GetSublist(1, -1);
+                    parts.Clear();
+                    prims = GetLinkParts(linknumber);
+                    avatars = GetLinkAvatars(linknumber);
+                    foreach (SceneObjectPart p in prims)
+                        parts.Add(p);
+                    foreach (ScenePresence p in avatars)
+                        parts.Add(p);
+
+                    remaining = null;
+                    foreach (object part in parts)
+                    {
+                        if (part is SceneObjectPart)
+                            remaining = SetPrimParams((SceneObjectPart)part, rules, originFunc, ref rulesParsed);
+                        else
+                            remaining = SetPrimParams((ScenePresence)part, rules, originFunc, ref rulesParsed);
+                    }
+                }
+            }
         }
 
-        public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules)
+        private void SetPhysicsMaterial(SceneObjectPart part, int material_bits,
+                float material_density, float material_friction,
+                float material_restitution, float material_gravity_modifier)
         {
-            m_host.AddScriptLPS(1);
+            ExtraPhysicsData physdata = new ExtraPhysicsData();
+            physdata.PhysShapeType = (PhysShapeType)part.PhysicsShapeType;
+            physdata.Density = part.Density;
+            physdata.Friction = part.Friction;
+            physdata.Bounce = part.Restitution;
+            physdata.GravitationModifier = part.GravityModifier;
 
-            setLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParamsFast");
+            if ((material_bits & (int)ScriptBaseClass.DENSITY) != 0)
+                physdata.Density = material_density;
+            if ((material_bits & (int)ScriptBaseClass.FRICTION) != 0)
+                physdata.Friction = material_friction;
+            if ((material_bits & (int)ScriptBaseClass.RESTITUTION) != 0)
+                physdata.Bounce = material_restitution;
+            if ((material_bits & (int)ScriptBaseClass.GRAVITY_MULTIPLIER) != 0)
+                physdata.GravitationModifier = material_gravity_modifier;
+
+            part.UpdateExtraPhysics(physdata);
         }
 
-        protected void setLinkPrimParams(int linknumber, LSL_List rules, string originFunc)
+        public void llSetPhysicsMaterial(int material_bits,
+                float material_gravity_modifier, float material_restitution,
+                float material_friction, float material_density)
         {
-            List<SceneObjectPart> parts = GetLinkParts(linknumber);
+            SetPhysicsMaterial(m_host, material_bits, material_density, material_friction, material_restitution, material_gravity_modifier);
+        }
 
-            LSL_List remaining = null;
-            uint rulesParsed = 0;
+        public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules)
+        {
+            setLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParams");
+            llSetLinkPrimitiveParamsFast(linknumber, rules);
+            ScriptSleep(200);
+        }
 
-            foreach (SceneObjectPart part in parts)
-                remaining = SetPrimParams(part, rules, originFunc, ref rulesParsed);
+        // vector up using libomv (c&p from sop )
+        // vector up rotated by r
+        private Vector3 Zrot(Quaternion r)
+        {
+            double x, y, z, m;
 
-            while (remaining != null && remaining.Length > 2)
+            m = r.X * r.X + r.Y * r.Y + r.Z * r.Z + r.W * r.W;
+            if (Math.Abs(1.0 - m) > 0.000001)
             {
-                linknumber = remaining.GetLSLIntegerItem(0);
-                rules = remaining.GetSublist(1, -1);
-                parts = GetLinkParts(linknumber);
-
-                foreach (SceneObjectPart part in parts)
-                    remaining = SetPrimParams(part, rules, originFunc, ref rulesParsed);
+                m = 1.0 / Math.Sqrt(m);
+                r.X *= (float)m;
+                r.Y *= (float)m;
+                r.Z *= (float)m;
+                r.W *= (float)m;
             }
+
+            x = 2 * (r.X * r.Z + r.Y * r.W);
+            y = 2 * (-r.X * r.W + r.Y * r.Z);
+            z = -r.X * r.X - r.Y * r.Y + r.Z * r.Z + r.W * r.W;
+
+            return new Vector3((float)x, (float)y, (float)z);
         }
 
         protected LSL_List SetPrimParams(SceneObjectPart part, LSL_List rules, string originFunc, ref uint rulesParsed)
         {
+            if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
+                return null;
+
             int idx = 0;
             int idxStart = 0;
 
+            SceneObjectGroup parentgrp = part.ParentGroup;
+
             bool positionChanged = false;
             LSL_Vector currentPosition = GetPartLocalPos(part);
 
@@ -7303,8 +7894,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 return null;
 
                             v=rules.GetVector3Item(idx++);
+                            if (part.IsRoot && !part.ParentGroup.IsAttachment)
+                                currentPosition = GetSetPosTarget(part, v, currentPosition, true);
+                            else
+                                currentPosition = GetSetPosTarget(part, v, currentPosition, false);
                             positionChanged = true;
-                            currentPosition = GetSetPosTarget(part, v, currentPosition);
 
                             break;
                         case (int)ScriptBaseClass.PRIM_SIZE:
@@ -7321,7 +7915,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                             LSL_Rotation q = rules.GetQuaternionItem(idx++);
                             // try to let this work as in SL...
-                            if (part.ParentID == 0)
+                            if (part.ParentID == 0 || (part.ParentGroup != null && part == part.ParentGroup.RootPart))
                             {
                                 // special case: If we are root, rotate complete SOG to new rotation
                                 SetRot(part, q);
@@ -7581,7 +8175,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                  return null;
 
                              string ph = rules.Data[idx++].ToString();
-                             m_host.ParentGroup.ScriptSetPhantomStatus(ph.Equals("1"));
+                             parentgrp.ScriptSetPhantomStatus(ph.Equals("1"));
 
                              break;
 
@@ -7615,12 +8209,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                             break;
 
+                        case (int)ScriptBaseClass.PRIM_PHYSICS_MATERIAL:
+                            if (remain < 5)
+                                return null;
+
+                            int material_bits = rules.GetLSLIntegerItem(idx++);
+                            float material_density = (float)rules.GetLSLFloatItem(idx++);
+                            float material_friction = (float)rules.GetLSLFloatItem(idx++);
+                            float material_restitution = (float)rules.GetLSLFloatItem(idx++);
+                            float material_gravity_modifier = (float)rules.GetLSLFloatItem(idx++);
+
+                            SetPhysicsMaterial(part, material_bits, material_density, material_friction, material_restitution, material_gravity_modifier);
+
+                            break;
+
                         case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ:
                             if (remain < 1)
                                 return null;
                             string temp = rules.Data[idx++].ToString();
 
-                            m_host.ParentGroup.ScriptSetTemporaryStatus(temp.Equals("1"));
+                            parentgrp.ScriptSetTemporaryStatus(temp.Equals("1"));
 
                             break;
 
@@ -7694,14 +8302,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     if (part.ParentGroup.RootPart == part)
                     {
                         SceneObjectGroup parent = part.ParentGroup;
-                        parent.UpdateGroupPosition(currentPosition);
+                        Util.FireAndForget(delegate(object x) {
+                            parent.UpdateGroupPosition(currentPosition);
+                        });
                     }
                     else
                     {
                         part.OffsetPosition = currentPosition;
-                        SceneObjectGroup parent = part.ParentGroup;
-                        parent.HasGroupChanged = true;
-                        parent.ScheduleGroupForTerseUpdate();
+//                        SceneObjectGroup parent = part.ParentGroup;
+//                        parent.HasGroupChanged = true;
+//                        parent.ScheduleGroupForTerseUpdate();
+                        part.ScheduleTerseUpdate();
                     }
                 }
             }
@@ -7739,10 +8350,91 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public LSL_String llXorBase64Strings(string str1, string str2)
         {
-            m_host.AddScriptLPS(1);
-            Deprecated("llXorBase64Strings");
+            string b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
             ScriptSleep(300);
-            return String.Empty;
+            m_host.AddScriptLPS(1);
+
+            if (str1 == String.Empty)
+                return String.Empty;
+            if (str2 == String.Empty)
+                return str1;
+
+            int len = str2.Length;
+            if ((len % 4) != 0) // LL is EVIL!!!!
+            {
+                while (str2.EndsWith("="))
+                    str2 = str2.Substring(0, str2.Length - 1);
+
+                len = str2.Length;
+                int mod = len % 4;
+
+                if (mod == 1)
+                    str2 = str2.Substring(0, str2.Length - 1);
+                else if (mod == 2)
+                    str2 += "==";
+                else if (mod == 3)
+                    str2 += "=";
+            }
+
+            byte[] data1;
+            byte[] data2;
+            try
+            {
+                data1 = Convert.FromBase64String(str1);
+                data2 = Convert.FromBase64String(str2);
+            }
+            catch (Exception)
+            {
+                return new LSL_String(String.Empty);
+            }
+
+            // For cases where the decoded length of s2 is greater
+            // than the decoded length of s1, simply perform a normal
+            // decode and XOR
+            //
+            if (data2.Length >= data1.Length)
+            {
+                for (int pos = 0 ; pos < data1.Length ; pos++ )
+                    data1[pos] ^= data2[pos];
+
+                return Convert.ToBase64String(data1);
+            }
+
+            // Remove padding
+            while (str1.EndsWith("="))
+                str1 = str1.Substring(0, str1.Length - 1);
+            while (str2.EndsWith("="))
+                str2 = str2.Substring(0, str2.Length - 1);
+            
+            byte[] d1 = new byte[str1.Length];
+            byte[] d2 = new byte[str2.Length];
+
+            for (int i = 0 ; i < str1.Length ; i++)
+            {
+                int idx = b64.IndexOf(str1.Substring(i, 1));
+                if (idx == -1)
+                    idx = 0;
+                d1[i] = (byte)idx;
+            }
+
+            for (int i = 0 ; i < str2.Length ; i++)
+            {
+                int idx = b64.IndexOf(str2.Substring(i, 1));
+                if (idx == -1)
+                    idx = 0;
+                d2[i] = (byte)idx;
+            }
+
+            string output = String.Empty;
+
+            for (int pos = 0 ; pos < d1.Length ; pos++)
+                output += b64[d1[pos] ^ d2[pos % d2.Length]];
+
+            while (output.Length % 3 > 0)
+                output += "=";
+
+            return output;
         }
 
         public void llRemoteDataSetRegion()
@@ -7866,8 +8558,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Integer llGetNumberOfPrims()
         {
             m_host.AddScriptLPS(1);
-
-            return m_host.ParentGroup.PrimCount + m_host.ParentGroup.GetSittingAvatarsCount();
+            int avatarCount = m_host.ParentGroup.GetLinkedAvatars().Count;
+            
+            return m_host.ParentGroup.PrimCount + avatarCount;
         }
 
         /// <summary>
@@ -7882,55 +8575,114 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             UUID objID = UUID.Zero;
             LSL_List result = new LSL_List();
+
+            // If the ID is not valid, return null result
             if (!UUID.TryParse(obj, out objID))
             {
                 result.Add(new LSL_Vector());
                 result.Add(new LSL_Vector());
                 return result;
             }
+
+            // Check if this is an attached prim. If so, replace
+            // the UUID with the avatar UUID and report it's bounding box
+            SceneObjectPart part = World.GetSceneObjectPart(objID);
+            if (part != null && part.ParentGroup.IsAttachment)
+                objID = part.ParentGroup.AttachedAvatar;
+
+            // Find out if this is an avatar ID. If so, return it's box
             ScenePresence presence = World.GetScenePresence(objID);
             if (presence != null)
             {
-                if (presence.ParentID == 0) // not sat on an object
+                // As per LSL Wiki, there is no difference between sitting
+                // and standing avatar since server 1.36
+                LSL_Vector lower;
+                LSL_Vector upper;
+
+                Vector3 box = presence.Appearance.AvatarBoxSize * 0.5f;
+
+                if (presence.Animator.Animations.ImplicitDefaultAnimation.AnimID 
+                    == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"])
+/*
                 {
-                    LSL_Vector lower;
-                    LSL_Vector upper;
-                    if (presence.Animator.Animations.ImplicitDefaultAnimation.AnimID
-                        == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"])
-                    {
-                        // This is for ground sitting avatars
-                        float height = presence.Appearance.AvatarHeight / 2.66666667f;
-                        lower = new LSL_Vector(-0.3375f, -0.45f, height * -1.0f);
-                        upper = new LSL_Vector(0.3375f, 0.45f, 0.0f);
-                    }
-                    else
-                    {
-                        // This is for standing/flying avatars
-                        float height = presence.Appearance.AvatarHeight / 2.0f;
-                        lower = new LSL_Vector(-0.225f, -0.3f, height * -1.0f);
-                        upper = new LSL_Vector(0.225f, 0.3f, height + 0.05f);
-                    }
-                    result.Add(lower);
-                    result.Add(upper);
-                    return result;
+                    // This is for ground sitting avatars
+                    float height = presence.Appearance.AvatarHeight / 2.66666667f;
+                    lower = new LSL_Vector(-0.3375f, -0.45f, height * -1.0f);
+                    upper = new LSL_Vector(0.3375f, 0.45f, 0.0f);
                 }
                 else
                 {
-                    // sitting on an object so we need the bounding box of that
-                    // which should include the avatar so set the UUID to the
-                    // UUID of the object the avatar is sat on and allow it to fall through
-                    // to processing an object
-                    SceneObjectPart p = World.GetSceneObjectPart(presence.ParentID);
-                    objID = p.UUID;
+                    // This is for standing/flying avatars
+                    float height = presence.Appearance.AvatarHeight / 2.0f;
+                    lower = new LSL_Vector(-0.225f, -0.3f, height * -1.0f);
+                    upper = new LSL_Vector(0.225f, 0.3f, height + 0.05f);
                 }
+
+                // Adjust to the documented error offsets (see LSL Wiki)
+                lower += new LSL_Vector(0.05f, 0.05f, 0.05f);
+                upper -= new LSL_Vector(0.05f, 0.05f, 0.05f);
+*/
+                {
+                    // This is for ground sitting avatars TODO!
+                    lower = new LSL_Vector(-box.X - 0.1125, -box.Y, box.Z * -1.0f);
+                    upper = new LSL_Vector(box.X + 0.1125, box.Y, box.Z * -1.0f);
+                }
+                else
+                {
+                    // This is for standing/flying avatars
+                    lower = new LSL_Vector(-box.X, -box.Y, -box.Z);
+                    upper = new LSL_Vector(box.X, box.Y, box.Z);
+                }
+
+                if (lower.x > upper.x)
+                    lower.x = upper.x;
+                if (lower.y > upper.y)
+                    lower.y = upper.y;
+                if (lower.z > upper.z)
+                    lower.z = upper.z;
+
+                result.Add(lower);
+                result.Add(upper);
+                return result;
             }
-            SceneObjectPart part = World.GetSceneObjectPart(objID);
+
+            part = World.GetSceneObjectPart(objID);
             // Currently only works for single prims without a sitting avatar
             if (part != null)
             {
-                Vector3 halfSize = part.Scale / 2.0f;
-                LSL_Vector lower = (new LSL_Vector(halfSize)) * -1.0f;
-                LSL_Vector upper = new LSL_Vector(halfSize);
+                float minX;
+                float maxX;
+                float minY;
+                float maxY;
+                float minZ;
+                float maxZ;
+
+                // This BBox is in sim coordinates, with the offset being
+                // a contained point.
+                Vector3[] offsets = Scene.GetCombinedBoundingBox(new List<SceneObjectGroup> { part.ParentGroup },
+                        out minX, out maxX, out minY, out maxY, out minZ, out maxZ);
+
+                minX -= offsets[0].X;
+                maxX -= offsets[0].X;
+                minY -= offsets[0].Y;
+                maxY -= offsets[0].Y;
+                minZ -= offsets[0].Z;
+                maxZ -= offsets[0].Z;
+
+                LSL_Vector lower;
+                LSL_Vector upper;
+
+                // Adjust to the documented error offsets (see LSL Wiki)
+                lower = new LSL_Vector(minX + 0.05f, minY + 0.05f, minZ + 0.05f);
+                upper = new LSL_Vector(maxX - 0.05f, maxY - 0.05f, maxZ - 0.05f);
+
+                if (lower.x > upper.x)
+                    lower.x = upper.x;
+                if (lower.y > upper.y)
+                    lower.y = upper.y;
+                if (lower.z > upper.z)
+                    lower.z = upper.z;
+
                 result.Add(lower);
                 result.Add(upper);
                 return result;
@@ -7944,7 +8696,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public LSL_Vector llGetGeometricCenter()
         {
-            return new LSL_Vector(m_host.GetGeometricCenter().X, m_host.GetGeometricCenter().Y, m_host.GetGeometricCenter().Z);
+            Vector3 tmp = m_host.GetGeometricCenter();
+            return new LSL_Vector(tmp.X, tmp.Y, tmp.Z);
         }
 
         public LSL_List llGetPrimitiveParams(LSL_List rules)
@@ -7955,7 +8708,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             LSL_List remaining = GetPrimParams(m_host, rules, ref result);
 
-            while (remaining != null && remaining.Length > 2)
+            while ((object)remaining != null && remaining.Length > 2)
             {
                 int linknumber = remaining.GetLSLIntegerItem(0);
                 rules = remaining.GetSublist(1, -1);
@@ -7972,24 +8725,37 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            List<SceneObjectPart> parts = GetLinkParts(linknumber);
+            // acording to SL wiki this must indicate a single link number or link_root or link_this.
+            // keep other options as before
 
+            List<SceneObjectPart> parts;
+            List<ScenePresence> avatars;
+            
             LSL_List res = new LSL_List();
             LSL_List remaining = null;
 
-            foreach (SceneObjectPart part in parts)
-            {
-                remaining = GetPrimParams(part, rules, ref res);
-            }
-
-            while (remaining != null && remaining.Length > 2)
+            while (rules.Length > 0)
             {
-                linknumber = remaining.GetLSLIntegerItem(0);
-                rules = remaining.GetSublist(1, -1);
                 parts = GetLinkParts(linknumber);
+                avatars = GetLinkAvatars(linknumber);
 
+                remaining = null;
                 foreach (SceneObjectPart part in parts)
+                {
                     remaining = GetPrimParams(part, rules, ref res);
+                }
+                foreach (ScenePresence avatar in avatars)
+                {
+                    remaining = GetPrimParams(avatar, rules, ref res);
+                }
+
+                if ((object)remaining != null && remaining.Length > 0)
+                {
+                    linknumber = remaining.GetLSLIntegerItem(0);
+                    rules = remaining.GetSublist(1, -1);
+                }
+                else
+                    break;
             }
 
             return res;
@@ -8034,13 +8800,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         LSL_Vector v = new LSL_Vector(part.AbsolutePosition.X,
                                                       part.AbsolutePosition.Y,
                                                       part.AbsolutePosition.Z);
-                        // For some reason, the part.AbsolutePosition.* values do not change if the
-                        // linkset is rotated; they always reflect the child prim's world position
-                        // as though the linkset is unrotated. This is incompatible behavior with SL's
-                        // implementation, so will break scripts imported from there (not to mention it
-                        // makes it more difficult to determine a child prim's actual inworld position).
-                        if (part.ParentID != 0)
-                            v = ((v - llGetRootPosition()) * llGetRootRotation()) + llGetRootPosition();
                         res.Add(v);
                         break;
 
@@ -8212,30 +8971,56 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         if (remain < 1)
                             return null;
 
-                        face=(int)rules.GetLSLIntegerItem(idx++);
+                        face = (int)rules.GetLSLIntegerItem(idx++);
 
                         tex = part.Shape.Textures;
+                        int shiny;
                         if (face == ScriptBaseClass.ALL_SIDES)
                         {
                             for (face = 0; face < GetNumberOfSides(part); face++)
                             {
-                                Primitive.TextureEntryFace texface = tex.GetFace((uint)face);
-                                // Convert Shininess to PRIM_SHINY_*
-                                res.Add(new LSL_Integer((uint)texface.Shiny >> 6));
-                                // PRIM_BUMP_*
-                                res.Add(new LSL_Integer((int)texface.Bump));
+                                Shininess shinyness = tex.GetFace((uint)face).Shiny;
+                                if (shinyness == Shininess.High)
+                                {
+                                    shiny = ScriptBaseClass.PRIM_SHINY_HIGH;
+                                }
+                                else if (shinyness == Shininess.Medium)
+                                {
+                                    shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM;
+                                }
+                                else if (shinyness == Shininess.Low)
+                                {
+                                    shiny = ScriptBaseClass.PRIM_SHINY_LOW;
+                                }
+                                else
+                                {
+                                    shiny = ScriptBaseClass.PRIM_SHINY_NONE;
+                                }
+                                res.Add(new LSL_Integer(shiny));
+                                res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump));
                             }
                         }
                         else
                         {
-                            if (face >= 0 && face < GetNumberOfSides(part))
+                            Shininess shinyness = tex.GetFace((uint)face).Shiny;
+                            if (shinyness == Shininess.High)
                             {
-                                Primitive.TextureEntryFace texface = tex.GetFace((uint)face);
-                                // Convert Shininess to PRIM_SHINY_*
-                                res.Add(new LSL_Integer((uint)texface.Shiny >> 6));
-                                // PRIM_BUMP_*
-                                res.Add(new LSL_Integer((int)texface.Bump));
+                                shiny = ScriptBaseClass.PRIM_SHINY_HIGH; 
+                            }
+                            else if (shinyness == Shininess.Medium)
+                            {
+                                shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM;
+                            }
+                            else if (shinyness == Shininess.Low)
+                            {
+                                shiny = ScriptBaseClass.PRIM_SHINY_LOW;
+                            }
+                            else
+                            {
+                                shiny = ScriptBaseClass.PRIM_SHINY_NONE;
                             }
+                            res.Add(new LSL_Integer(shiny));
+                            res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump));
                         }
                         break;
 
@@ -8243,24 +9028,36 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         if (remain < 1)
                             return null;
 
-                        face=(int)rules.GetLSLIntegerItem(idx++);
+                        face = (int)rules.GetLSLIntegerItem(idx++);
 
                         tex = part.Shape.Textures;
+                        int fullbright;
                         if (face == ScriptBaseClass.ALL_SIDES)
                         {
                             for (face = 0; face < GetNumberOfSides(part); face++)
                             {
-                                Primitive.TextureEntryFace texface = tex.GetFace((uint)face);
-                                res.Add(new LSL_Integer(texface.Fullbright ? 1 : 0));
+                                if (tex.GetFace((uint)face).Fullbright == true)
+                                {
+                                    fullbright = ScriptBaseClass.TRUE;
+                                }
+                                else
+                                {
+                                    fullbright = ScriptBaseClass.FALSE;
+                                }
+                                res.Add(new LSL_Integer(fullbright));
                             }
                         }
                         else
                         {
-                            if (face >= 0 && face < GetNumberOfSides(part))
+                            if (tex.GetFace((uint)face).Fullbright == true)
                             {
-                                Primitive.TextureEntryFace texface = tex.GetFace((uint)face);
-                                res.Add(new LSL_Integer(texface.Fullbright ? 1 : 0));
+                                fullbright = ScriptBaseClass.TRUE;
+                            }
+                            else
+                            {
+                                fullbright = ScriptBaseClass.FALSE;
                             }
+                            res.Add(new LSL_Integer(fullbright));
                         }
                         break;
 
@@ -8282,27 +9079,36 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         break;
 
                     case (int)ScriptBaseClass.PRIM_TEXGEN:
+                        // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR)
                         if (remain < 1)
                             return null;
 
-                        face=(int)rules.GetLSLIntegerItem(idx++);
+                        face = (int)rules.GetLSLIntegerItem(idx++);
 
                         tex = part.Shape.Textures;
                         if (face == ScriptBaseClass.ALL_SIDES)
                         {
                             for (face = 0; face < GetNumberOfSides(part); face++)
                             {
-                                MappingType texgen = tex.GetFace((uint)face).TexMapType;
-                                // Convert MappingType to PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR etc.
-                                res.Add(new LSL_Integer((uint)texgen >> 1));
+                                if (tex.GetFace((uint)face).TexMapType == MappingType.Planar)
+                                {
+                                    res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR));
+                                }
+                                else
+                                {
+                                    res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
+                                }
                             }
                         }
                         else
                         {
-                            if (face >= 0 && face < GetNumberOfSides(part))
+                            if (tex.GetFace((uint)face).TexMapType == MappingType.Planar)
                             {
-                                MappingType texgen = tex.GetFace((uint)face).TexMapType;
-                                res.Add(new LSL_Integer((uint)texgen >> 1));
+                                res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR));
+                            }
+                            else
+                            {
+                                res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
                             }
                         }
                         break;
@@ -8326,24 +9132,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         if (remain < 1)
                             return null;
 
-                        face=(int)rules.GetLSLIntegerItem(idx++);
+                        face = (int)rules.GetLSLIntegerItem(idx++);
 
                         tex = part.Shape.Textures;
+                        float primglow;
                         if (face == ScriptBaseClass.ALL_SIDES)
                         {
                             for (face = 0; face < GetNumberOfSides(part); face++)
                             {
-                                Primitive.TextureEntryFace texface = tex.GetFace((uint)face);
-                                res.Add(new LSL_Float(texface.Glow));
+                                primglow = tex.GetFace((uint)face).Glow;
+                                res.Add(new LSL_Float(primglow));
                             }
                         }
                         else
                         {
-                            if (face >= 0 && face < GetNumberOfSides(part))
-                            {
-                                Primitive.TextureEntryFace texface = tex.GetFace((uint)face);
-                                res.Add(new LSL_Float(texface.Glow));
-                            }
+                            primglow = tex.GetFace((uint)face).Glow;
+                            res.Add(new LSL_Float(primglow));
                         }
                         break;
 
@@ -8355,15 +9159,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                                textColor.B));
                         res.Add(new LSL_Float(textColor.A));
                         break;
+
                     case (int)ScriptBaseClass.PRIM_NAME:
                         res.Add(new LSL_String(part.Name));
                         break;
+
                     case (int)ScriptBaseClass.PRIM_DESC:
                         res.Add(new LSL_String(part.Description));
                         break;
+
                     case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
                         res.Add(new LSL_Rotation(part.RotationOffset.X, part.RotationOffset.Y, part.RotationOffset.Z, part.RotationOffset.W));
                         break;
+
                     case (int)ScriptBaseClass.PRIM_POS_LOCAL:
                         res.Add(new LSL_Vector(GetPartLocalPos(part)));
                         break;
@@ -8974,8 +9782,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         //  The function returns an ordered list
         //  representing the tokens found in the supplied
         //  sources string. If two successive tokenizers
-        //  are encountered, then a NULL entry is added
-        //  to the list.
+        //  are encountered, then a null-string entry is
+        //  added to the list.
         //
         //  It is a precondition that the source and
         //  toekizer lisst are non-null. If they are null,
@@ -8983,7 +9791,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         //  while their lengths are being determined.
         //
         //  A small amount of working memoryis required
-        //  of approximately 8*#tokenizers.
+        //  of approximately 8*#tokenizers + 8*srcstrlen.
         //
         //  There are many ways in which this function
         //  can be implemented, this implementation is
@@ -8999,155 +9807,124 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         //  and eliminates redundant tokenizers as soon
         //  as is possible.
         //
-        //  The implementation tries to avoid any copying
-        //  of arrays or other objects.
+        //  The implementation tries to minimize temporary
+        //  garbage generation.
         //  </remarks>
 
-        private LSL_List ParseString(string src, LSL_List separators, LSL_List spacers, bool keepNulls)
+        public LSL_List llParseStringKeepNulls(string src, LSL_List separators, LSL_List spacers)
         {
-            int         beginning = 0;
-            int         srclen    = src.Length;
-            int         seplen    = separators.Length;
-            object[]    separray  = separators.Data;
-            int         spclen    = spacers.Length;
-            object[]    spcarray  = spacers.Data;
-            int         mlen      = seplen+spclen;
-
-            int[]       offset    = new int[mlen+1];
-            bool[]      active    = new bool[mlen];
-
-            int         best;
-            int         j;
-
-            //    Initial capacity reduces resize cost
+            return ParseString2List(src, separators, spacers, true);
+        }
 
-            LSL_List tokens = new LSL_List();
+        private LSL_List ParseString2List(string src, LSL_List separators, LSL_List spacers, bool keepNulls)
+        {
+            int          srclen    = src.Length;
+            int          seplen    = separators.Length;
+            object[]     separray  = separators.Data;
+            int          spclen    = spacers.Length;
+            object[]     spcarray  = spacers.Data;
+            int          dellen    = 0;
+            string[]     delarray  = new string[seplen+spclen];
 
-            //    All entries are initially valid
+            int          outlen    = 0;
+            string[]     outarray  = new string[srclen*2+1];
 
-            for (int i = 0; i < mlen; i++)
-                active[i] = true;
+            int          i, j;
+            string       d;
 
-            offset[mlen] = srclen;
+            m_host.AddScriptLPS(1);
 
-            while (beginning < srclen)
+            /*
+             * Convert separator and spacer lists to C# strings.
+             * Also filter out null strings so we don't hang.
+             */
+            for (i = 0; i < seplen; i ++)
             {
+                d = separray[i].ToString();
+                if (d.Length > 0)
+                {
+                    delarray[dellen++] = d;
+                }
+            }
+            seplen = dellen;
 
-                best = mlen;    // as bad as it gets
+            for (i = 0; i < spclen; i ++)
+            {
+                d = spcarray[i].ToString();
+                if (d.Length > 0)
+                {
+                    delarray[dellen++] = d;
+                }
+            }
 
-                //    Scan for separators
+            /*
+             * Scan through source string from beginning to end.
+             */
+            for (i = 0;;)
+            {
 
-                for (j = 0; j < seplen; j++)
+                /*
+                 * Find earliest delimeter in src starting at i (if any).
+                 */
+                int    earliestDel = -1;
+                int    earliestSrc = srclen;
+                string earliestStr = null;
+                for (j = 0; j < dellen; j ++)
                 {
-                    if (separray[j].ToString() == String.Empty)
-                        active[j] = false;
-
-                    if (active[j])
+                    d = delarray[j];
+                    if (d != null)
                     {
-                        // scan all of the markers
-                        if ((offset[j] = src.IndexOf(separray[j].ToString(), beginning)) == -1)
+                        int index = src.IndexOf(d, i);
+                        if (index < 0)
                         {
-                            // not present at all
-                            active[j] = false;
+                            delarray[j] = null;     // delim nowhere in src, don't check it anymore
                         }
-                        else
+                        else if (index < earliestSrc)
                         {
-                            // present and correct
-                            if (offset[j] < offset[best])
-                            {
-                                // closest so far
-                                best = j;
-                                if (offset[best] == beginning)
-                                    break;
-                            }
+                            earliestSrc = index;    // where delimeter starts in source string
+                            earliestDel = j;        // where delimeter is in delarray[]
+                            earliestStr = d;        // the delimeter string from delarray[]
+                            if (index == i) break;  // can't do any better than found at beg of string
                         }
                     }
                 }
 
-                //    Scan for spacers
-
-                if (offset[best] != beginning)
+                /*
+                 * Output source string starting at i through start of earliest delimeter.
+                 */
+                if (keepNulls || (earliestSrc > i))
                 {
-                    for (j = seplen; (j < mlen) && (offset[best] > beginning); j++)
-                    {
-                        if (spcarray[j-seplen].ToString() == String.Empty)
-                            active[j] = false;
-
-                        if (active[j])
-                        {
-                            // scan all of the markers
-                            if ((offset[j] = src.IndexOf(spcarray[j-seplen].ToString(), beginning)) == -1)
-                            {
-                                // not present at all
-                                active[j] = false;
-                            }
-                            else
-                            {
-                                // present and correct
-                                if (offset[j] < offset[best])
-                                {
-                                    // closest so far
-                                    best = j;
-                                }
-                            }
-                        }
-                    }
+                    outarray[outlen++] = src.Substring(i, earliestSrc - i);
                 }
 
-                //    This is the normal exit from the scanning loop
+                /*
+                 * If no delimeter found at or after i, we're done scanning.
+                 */
+                if (earliestDel < 0) break;
 
-                if (best == mlen)
+                /*
+                 * If delimeter was a spacer, output the spacer.
+                 */
+                if (earliestDel >= seplen)
                 {
-                    // no markers were found on this pass
-                    // so we're pretty much done
-                    if ((keepNulls) || ((!keepNulls) && (srclen - beginning) > 0))
-                        tokens.Add(new LSL_String(src.Substring(beginning, srclen - beginning)));
-                    break;
+                    outarray[outlen++] = earliestStr;
                 }
 
-                //    Otherwise we just add the newly delimited token
-                //    and recalculate where the search should continue.
-                if ((keepNulls) || ((!keepNulls) && (offset[best] - beginning) > 0))
-                    tokens.Add(new LSL_String(src.Substring(beginning,offset[best]-beginning)));
-
-                if (best < seplen)
-                {
-                    beginning = offset[best] + (separray[best].ToString()).Length;
-                }
-                else
-                {
-                    beginning = offset[best] + (spcarray[best - seplen].ToString()).Length;
-                    string str = spcarray[best - seplen].ToString();
-                    if ((keepNulls) || ((!keepNulls) && (str.Length > 0)))
-                        tokens.Add(new LSL_String(str));
-                }
+                /*
+                 * Look at rest of src string following delimeter.
+                 */
+                i = earliestSrc + earliestStr.Length;
             }
 
-            //    This an awkward an not very intuitive boundary case. If the
-            //    last substring is a tokenizer, then there is an implied trailing
-            //    null list entry. Hopefully the single comparison will not be too
-            //    arduous. Alternatively the 'break' could be replced with a return
-            //    but that's shabby programming.
-
-            if ((beginning == srclen) && (keepNulls))
+            /*
+             * Make up an exact-sized output array suitable for an LSL_List object.
+             */
+            object[] outlist = new object[outlen];
+            for (i = 0; i < outlen; i ++)
             {
-                if (srclen != 0)
-                    tokens.Add(new LSL_String(""));
+                outlist[i] = new LSL_String(outarray[i]);
             }
-
-            return tokens;
-        }
-
-        public LSL_List llParseString2List(string src, LSL_List separators, LSL_List spacers)
-        {
-            m_host.AddScriptLPS(1);
-            return this.ParseString(src, separators, spacers, false);
-        }
-
-        public LSL_List llParseStringKeepNulls(string src, LSL_List separators, LSL_List spacers)
-        {
-            m_host.AddScriptLPS(1);
-            return this.ParseString(src, separators, spacers, true);
+            return new LSL_List(outlist);
         }
 
         public LSL_Integer llGetObjectPermMask(int mask)
@@ -9242,6 +10019,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 case 4:
                     return (int)item.NextPermissions;
             }
+            m_host.TaskInventory.LockItemsForRead(false);
 
             return -1;
         }
@@ -9444,31 +10222,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             UUID key = new UUID();
             if (UUID.TryParse(id, out key))
             {
-                try
-                {
-                    SceneObjectPart obj = World.GetSceneObjectPart(World.Entities[key].LocalId);
-                    if (obj != null)
-                        return (double)obj.GetMass();
-                    // the object is null so the key is for an avatar
-                    ScenePresence avatar = World.GetScenePresence(key);
-                    if (avatar != null)
-                        if (avatar.IsChildAgent)
-                            // reference http://www.lslwiki.net/lslwiki/wakka.php?wakka=llGetObjectMass
-                            // child agents have a mass of 1.0
-                            return 1;
-                        else
-                            return (double)avatar.GetMass();
-                }
-                catch (KeyNotFoundException)
+                // return total object mass
+                SceneObjectPart part = World.GetSceneObjectPart(key);
+                if (part != null)
+                    return part.ParentGroup.GetMass();
+
+                // the object is null so the key is for an avatar
+                ScenePresence avatar = World.GetScenePresence(key);
+                if (avatar != null)
                 {
-                    return 0; // The Object/Agent not in the region so just return zero
+                    if (avatar.IsChildAgent)
+                    {
+                        // reference http://www.lslwiki.net/lslwiki/wakka.php?wakka=llGetObjectMass
+                        // child agents have a mass of 1.0
+                        return 1;
+                    }
+                    else
+                    {
+                        return (double)avatar.GetMass();
+                    }
                 }
             }
             return 0;
         }
 
         /// <summary>
-        /// illListReplaceList removes the sub-list defined by the inclusive indices
+        /// llListReplaceList removes the sub-list defined by the inclusive indices
         /// start and end and inserts the src list in its place. The inclusive
         /// nature of the indices means that at least one element must be deleted
         /// if the indices are within the bounds of the existing list. I.e. 2,2
@@ -9525,16 +10304,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 // based upon end. Note that if end exceeds the upper
                 // bound in this case, the entire destination list
                 // is removed.
-                else
+                else if (start == 0)
                 {
                     if (end + 1 < dest.Length)
-                    {
                         return src + dest.GetSublist(end + 1, -1);
-                    }
                     else
-                    {
                         return src;
-                    }
+                }
+                else // Start < 0
+                {
+                    if (end + 1 < dest.Length)
+                        return dest.GetSublist(end + 1, -1);
+                    else
+                        return new LSL_List();
                 }
             }
             // Finally, if start > end, we strip away a prefix and
@@ -9585,17 +10367,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             int width = 0;
             int height = 0;
 
-            ParcelMediaCommandEnum? commandToSend = null;
+            uint commandToSend = 0;
             float time = 0.0f; // default is from start
 
             ScenePresence presence = null;
 
             for (int i = 0; i < commandList.Data.Length; i++)
             {
-                ParcelMediaCommandEnum command = (ParcelMediaCommandEnum)commandList.Data[i];
+                uint command = (uint)(commandList.GetLSLIntegerItem(i));
                 switch (command)
                 {
-                    case ParcelMediaCommandEnum.Agent:
+                    case (uint)ParcelMediaCommandEnum.Agent:
                         // we send only to one agent
                         if ((i + 1) < commandList.Length)
                         {
@@ -9612,25 +10394,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         }
                         break;
 
-                    case ParcelMediaCommandEnum.Loop:
+                    case (uint)ParcelMediaCommandEnum.Loop:
                         loop = 1;
                         commandToSend = command;
                         update = true; //need to send the media update packet to set looping
                         break;
 
-                    case ParcelMediaCommandEnum.Play:
+                    case (uint)ParcelMediaCommandEnum.Play:
                         loop = 0;
                         commandToSend = command;
                         update = true; //need to send the media update packet to make sure it doesn't loop
                         break;
 
-                    case ParcelMediaCommandEnum.Pause:
-                    case ParcelMediaCommandEnum.Stop:
-                    case ParcelMediaCommandEnum.Unload:
+                    case (uint)ParcelMediaCommandEnum.Pause:
+                    case (uint)ParcelMediaCommandEnum.Stop:
+                    case (uint)ParcelMediaCommandEnum.Unload:
                         commandToSend = command;
                         break;
 
-                    case ParcelMediaCommandEnum.Url:
+                    case (uint)ParcelMediaCommandEnum.Url:
                         if ((i + 1) < commandList.Length)
                         {
                             if (commandList.Data[i + 1] is LSL_String)
@@ -9643,7 +10425,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         }
                         break;
 
-                    case ParcelMediaCommandEnum.Texture:
+                    case (uint)ParcelMediaCommandEnum.Texture:
                         if ((i + 1) < commandList.Length)
                         {
                             if (commandList.Data[i + 1] is LSL_String)
@@ -9656,7 +10438,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         }
                         break;
 
-                    case ParcelMediaCommandEnum.Time:
+                    case (uint)ParcelMediaCommandEnum.Time:
                         if ((i + 1) < commandList.Length)
                         {
                             if (commandList.Data[i + 1] is LSL_Float)
@@ -9668,7 +10450,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         }
                         break;
 
-                    case ParcelMediaCommandEnum.AutoAlign:
+                    case (uint)ParcelMediaCommandEnum.AutoAlign:
                         if ((i + 1) < commandList.Length)
                         {
                             if (commandList.Data[i + 1] is LSL_Integer)
@@ -9682,7 +10464,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         }
                         break;
 
-                    case ParcelMediaCommandEnum.Type:
+                    case (uint)ParcelMediaCommandEnum.Type:
                         if ((i + 1) < commandList.Length)
                         {
                             if (commandList.Data[i + 1] is LSL_String)
@@ -9695,7 +10477,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         }
                         break;
 
-                    case ParcelMediaCommandEnum.Desc:
+                    case (uint)ParcelMediaCommandEnum.Desc:
                         if ((i + 1) < commandList.Length)
                         {
                             if (commandList.Data[i + 1] is LSL_String)
@@ -9708,7 +10490,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         }
                         break;
 
-                    case ParcelMediaCommandEnum.Size:
+                    case (uint)ParcelMediaCommandEnum.Size:
                         if ((i + 2) < commandList.Length)
                         {
                             if (commandList.Data[i + 1] is LSL_Integer)
@@ -9778,7 +10560,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 }
             }
 
-            if (commandToSend != null)
+            if (commandToSend != 0)
             {
                 // the commandList contained a start/stop/... command, too
                 if (presence == null)
@@ -9815,7 +10597,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 if (aList.Data[i] != null)
                 {
-                    switch ((ParcelMediaCommandEnum) aList.Data[i])
+                    switch ((ParcelMediaCommandEnum) Convert.ToInt32(aList.Data[i].ToString()))
                     {
                         case ParcelMediaCommandEnum.Url:
                             list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition).MediaURL));
@@ -9872,15 +10654,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             if (quick_pay_buttons.Data.Length < 4)
             {
-                LSLError("List must have at least 4 elements");
-                return;
+                int x;
+                for (x=quick_pay_buttons.Data.Length; x<= 4; x++)
+                {
+                    quick_pay_buttons.Add(ScriptBaseClass.PAY_HIDE);
+                }
             }
-            m_host.ParentGroup.RootPart.PayPrice[0]=price;
-
-            m_host.ParentGroup.RootPart.PayPrice[1]=(LSL_Integer)quick_pay_buttons.Data[0];
-            m_host.ParentGroup.RootPart.PayPrice[2]=(LSL_Integer)quick_pay_buttons.Data[1];
-            m_host.ParentGroup.RootPart.PayPrice[3]=(LSL_Integer)quick_pay_buttons.Data[2];
-            m_host.ParentGroup.RootPart.PayPrice[4]=(LSL_Integer)quick_pay_buttons.Data[3];
+            int[] nPrice = new int[5];
+            nPrice[0] = price;
+            nPrice[1] = quick_pay_buttons.GetLSLIntegerItem(0);
+            nPrice[2] = quick_pay_buttons.GetLSLIntegerItem(1);
+            nPrice[3] = quick_pay_buttons.GetLSLIntegerItem(2);
+            nPrice[4] = quick_pay_buttons.GetLSLIntegerItem(3);
+            m_host.ParentGroup.RootPart.PayPrice = nPrice;
             m_host.ParentGroup.HasGroupChanged = true;
         }
 
@@ -9897,7 +10683,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return new LSL_Vector();
             }
 
-            ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
+//            ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
+            ScenePresence presence = World.GetScenePresence(m_item.PermsGranter);
             if (presence != null)
             {
                 LSL_Vector pos = new LSL_Vector(presence.CameraPosition.X, presence.CameraPosition.Y, presence.CameraPosition.Z);
@@ -9919,7 +10706,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return new LSL_Rotation();
             }
 
-            ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
+//            ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
+            ScenePresence presence = World.GetScenePresence(m_item.PermsGranter);
             if (presence != null)
             {
                 return new LSL_Rotation(presence.CameraRotation.X, presence.CameraRotation.Y, presence.CameraRotation.Z, presence.CameraRotation.W);
@@ -9979,14 +10767,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_item.ItemID, 0);
-            if (detectedParams == null) return; // only works on the first detected avatar
-
+            if (detectedParams == null)
+            {
+                if (m_host.ParentGroup.IsAttachment == true)
+                {
+                    detectedParams = new DetectParams();
+                    detectedParams.Key = m_host.OwnerID;
+                }
+                else
+                {
+                    return;
+                }
+            }
+           
             ScenePresence avatar = World.GetScenePresence(detectedParams.Key);
             if (avatar != null)
             {
                 avatar.ControllingClient.SendScriptTeleportRequest(m_host.Name,
                     simname, pos, lookAt);
             }
+            
             ScriptSleep(1000);
         }
 
@@ -10110,12 +10910,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             SortedDictionary<int, float> parameters = new SortedDictionary<int, float>();
             object[] data = rules.Data;
-            for (int i = 0; i < data.Length; ++i) {
+            for (int i = 0; i < data.Length; ++i)
+            {
                 int type = Convert.ToInt32(data[i++].ToString());
                 if (i >= data.Length) break; // odd number of entries => ignore the last
 
                 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3)
-                switch (type) {
+                switch (type)
+                {
                 case ScriptBaseClass.CAMERA_FOCUS:
                 case ScriptBaseClass.CAMERA_FOCUS_OFFSET:
                 case ScriptBaseClass.CAMERA_POSITION:
@@ -10220,19 +11022,65 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_String llXorBase64StringsCorrect(string str1, string str2)
         {
             m_host.AddScriptLPS(1);
-            string ret = String.Empty;
-            string src1 = llBase64ToString(str1);
-            string src2 = llBase64ToString(str2);
-            int c = 0;
-            for (int i = 0; i < src1.Length; i++)
+
+            if (str1 == String.Empty)
+                return String.Empty;
+            if (str2 == String.Empty)
+                return str1;
+
+            int len = str2.Length;
+            if ((len % 4) != 0) // LL is EVIL!!!!
+            {
+                while (str2.EndsWith("="))
+                    str2 = str2.Substring(0, str2.Length - 1);
+
+                len = str2.Length;
+                int mod = len % 4;
+
+                if (mod == 1)
+                    str2 = str2.Substring(0, str2.Length - 1);
+                else if (mod == 2)
+                    str2 += "==";
+                else if (mod == 3)
+                    str2 += "=";
+            }
+
+            byte[] data1;
+            byte[] data2;
+            try
             {
-                ret += (char) (src1[i] ^ src2[c]);
+                data1 = Convert.FromBase64String(str1);
+                data2 = Convert.FromBase64String(str2);
+            }
+            catch (Exception)
+            {
+                return new LSL_String(String.Empty);
+            }
 
-                c++;
-                if (c >= src2.Length)
-                    c = 0;
+            byte[] d2 = new Byte[data1.Length];
+            int pos = 0;
+            
+            if (data1.Length <= data2.Length)
+            {
+                Array.Copy(data2, 0, d2, 0, data1.Length);
             }
-            return llStringToBase64(ret);
+            else
+            {
+                while (pos < data1.Length)
+                {
+                    len = data1.Length - pos;
+                    if (len > data2.Length)
+                        len = data2.Length;
+
+                    Array.Copy(data2, 0, d2, pos, len);
+                    pos += len;
+                }
+            }
+
+            for (pos = 0 ; pos < data1.Length ; pos++ )
+                data1[pos] ^= d2[pos];
+
+            return Convert.ToBase64String(data1);
         }
 
         public LSL_String llHTTPRequest(string url, LSL_List parameters, string body)
@@ -10285,16 +11133,72 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (userAgent != null)
                 httpHeaders["User-Agent"] = userAgent;
 
+            // See if the URL contains any header hacks
+            string[] urlParts = url.Split(new char[] {'\n'});
+            if (urlParts.Length > 1)
+            {
+                // Iterate the passed headers and parse them
+                for (int i = 1 ; i < urlParts.Length ; i++ )
+                {
+                    // The rest of those would be added to the body in SL.
+                    // Let's not do that.
+                    if (urlParts[i] == String.Empty)
+                        break;
+
+                    // See if this could be a valid header
+                    string[] headerParts = urlParts[i].Split(new char[] {':'}, 2);
+                    if (headerParts.Length != 2)
+                        continue;
+
+                    string headerName = headerParts[0].Trim();
+                    string headerValue = headerParts[1].Trim();
+
+                    // Filter out headers that could be used to abuse
+                    // another system or cloak the request
+                    if (headerName.ToLower() == "x-secondlife-shard" ||
+                        headerName.ToLower() == "x-secondlife-object-name" ||
+                        headerName.ToLower() == "x-secondlife-object-key" ||
+                        headerName.ToLower() == "x-secondlife-region" ||
+                        headerName.ToLower() == "x-secondlife-local-position" ||
+                        headerName.ToLower() == "x-secondlife-local-velocity" ||
+                        headerName.ToLower() == "x-secondlife-local-rotation" ||
+                        headerName.ToLower() == "x-secondlife-owner-name" ||
+                        headerName.ToLower() == "x-secondlife-owner-key" ||
+                        headerName.ToLower() == "connection" ||
+                        headerName.ToLower() == "content-length" ||
+                        headerName.ToLower() == "from" ||
+                        headerName.ToLower() == "host" ||
+                        headerName.ToLower() == "proxy-authorization" ||
+                        headerName.ToLower() == "referer" ||
+                        headerName.ToLower() == "trailer" ||
+                        headerName.ToLower() == "transfer-encoding" ||
+                        headerName.ToLower() == "via" ||
+                        headerName.ToLower() == "authorization")
+                        continue;
+
+                    httpHeaders[headerName] = headerValue;
+                }
+
+                // Finally, strip any protocol specifier from the URL
+                url = urlParts[0].Trim();
+                int idx = url.IndexOf(" HTTP/");
+                if (idx != -1)
+                    url = url.Substring(0, idx);
+            }
+
             string authregex = @"^(https?:\/\/)(\w+):(\w+)@(.*)$";
             Regex r = new Regex(authregex);
             int[] gnums = r.GetGroupNumbers();
             Match m = r.Match(url);
-            if (m.Success) {
-                for (int i = 1; i < gnums.Length; i++) {
+            if (m.Success)
+            {
+                for (int i = 1; i < gnums.Length; i++)
+                {
                     //System.Text.RegularExpressions.Group g = m.Groups[gnums[i]];
                     //CaptureCollection cc = g.Captures;
                 }
-                if (m.Groups.Count == 5) {
+                if (m.Groups.Count == 5)
+                {
                     httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString())));
                     url = m.Groups[1].ToString() + m.Groups[4].ToString();
                 }
@@ -10497,6 +11401,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             LSL_List ret = new LSL_List();
             UUID key = new UUID();
+            
+
             if (UUID.TryParse(id, out key))
             {
                 ScenePresence av = World.GetScenePresence(key);
@@ -10514,13 +11420,33 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 ret.Add(new LSL_String(""));
                                 break;
                             case ScriptBaseClass.OBJECT_POS:
-                                ret.Add(new LSL_Vector((double)av.AbsolutePosition.X, (double)av.AbsolutePosition.Y, (double)av.AbsolutePosition.Z));
+                                Vector3 avpos;
+
+                                if (av.ParentID != 0 && av.ParentPart != null)
+                                {
+                                    avpos = av.OffsetPosition;
+
+                                    Vector3 sitOffset = (Zrot(av.Rotation)) * (av.Appearance.AvatarHeight * 0.02638f *2.0f);
+                                    avpos -= sitOffset;
+
+                                    avpos = av.ParentPart.GetWorldPosition() + avpos * av.ParentPart.GetWorldRotation();
+                                }
+                                else
+                                    avpos = av.AbsolutePosition;
+                                
+                                ret.Add(new LSL_Vector((double)avpos.X, (double)avpos.Y, (double)avpos.Z));
                                 break;
                             case ScriptBaseClass.OBJECT_ROT:
-                                ret.Add(new LSL_Rotation((double)av.Rotation.X, (double)av.Rotation.Y, (double)av.Rotation.Z, (double)av.Rotation.W));
+                                Quaternion avrot = av.Rotation;
+                                if (av.ParentID != 0 && av.ParentPart != null)
+                                {
+                                    avrot = av.ParentPart.GetWorldRotation() * avrot;
+                                }
+                                ret.Add(new LSL_Rotation((double)avrot.X, (double)avrot.Y, (double)avrot.Z, (double)avrot.W));
                                 break;
                             case ScriptBaseClass.OBJECT_VELOCITY:
-                                ret.Add(new LSL_Vector(av.Velocity.X, av.Velocity.Y, av.Velocity.Z));
+                                Vector3 avvel = av.Velocity;
+                                ret.Add(new LSL_Vector((double)avvel.X, (double)avvel.Y, (double)avvel.Z));
                                 break;
                             case ScriptBaseClass.OBJECT_OWNER:
                                 ret.Add(new LSL_String(id));
@@ -10605,11 +11531,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             case ScriptBaseClass.OBJECT_NAME:
                                 ret.Add(new LSL_String(obj.Name));
                                 break;
-                            case ScriptBaseClass.OBJECT_DESC:
+                            case ScriptBaseClass.OBJECT_DESC:                               
                                 ret.Add(new LSL_String(obj.Description));
                                 break;
                             case ScriptBaseClass.OBJECT_POS:
-                                ret.Add(new LSL_Vector(obj.AbsolutePosition.X, obj.AbsolutePosition.Y, obj.AbsolutePosition.Z));
+                                Vector3 opos = obj.AbsolutePosition;
+                                ret.Add(new LSL_Vector(opos.X, opos.Y, opos.Z));
                                 break;
                             case ScriptBaseClass.OBJECT_ROT:
                                 {
@@ -10659,9 +11586,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 // The value returned in SL for normal prims is prim count
                                 ret.Add(new LSL_Integer(obj.ParentGroup.PrimCount));
                                 break;
-                            // The following 3 costs I have intentionaly coded to return zero. They are part of
-                            // "Land Impact" calculations. These calculations are probably not applicable
-                            // to OpenSim and are not yet complete in SL
+
+                            // costs below may need to be diferent for root parts, need to check
                             case ScriptBaseClass.OBJECT_SERVER_COST:
                                 // The linden calculation is here
                                 // http://wiki.secondlife.com/wiki/Mesh/Mesh_Server_Weight
@@ -10669,16 +11595,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 ret.Add(new LSL_Float(0));
                                 break;
                             case ScriptBaseClass.OBJECT_STREAMING_COST:
-                                // The linden calculation is here
-                                // http://wiki.secondlife.com/wiki/Mesh/Mesh_Streaming_Cost
-                                // The value returned in SL for normal prims looks like the prim count * 0.06
-                                ret.Add(new LSL_Float(0));
+                                // The value returned in SL for normal prims is prim count * 0.06
+                                ret.Add(new LSL_Float(obj.StreamingCost));
                                 break;
                             case ScriptBaseClass.OBJECT_PHYSICS_COST:
-                                // The linden calculation is here
-                                // http://wiki.secondlife.com/wiki/Mesh/Mesh_physics
-                                // The value returned in SL for normal prims looks like the prim count
-                                ret.Add(new LSL_Float(0));
+                                // The value returned in SL for normal prims is prim count
+                                ret.Add(new LSL_Float(obj.PhysicsCost));
                                 break;
                             case ScriptBaseClass.OBJECT_CHARACTER_TIME: // Pathfinding
                                 ret.Add(new LSL_Float(0));
@@ -10935,15 +11857,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return result;
         }
 
-        public void print(string str)
+        public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
         {
-            // yes, this is a real LSL function. See: http://wiki.secondlife.com/wiki/Print
-            IOSSL_Api ossl = (IOSSL_Api)m_ScriptEngine.GetApi(m_item.ItemID, "OSSL");
-            if (ossl != null)
-            {
-                ossl.CheckThreatLevel(ThreatLevel.High, "print");
-                m_log.Info("LSL print():" + str);
-            }
+            List<SceneObjectPart> parts = GetLinkParts(link);
+            if (parts.Count < 1)
+                return 0;
+
+            return GetNumberOfSides(parts[0]);
         }
 
         private string Name2Username(string name)
@@ -10988,7 +11908,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             return rq.ToString();
         }
-
+/*
+        private void SayShoutTimerElapsed(Object sender, ElapsedEventArgs args)
+        {
+            m_SayShoutCount = 0;
+        }
+*/
         private struct Tri
         {
             public Vector3 p1;
@@ -11137,9 +12062,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 ContactResult result = new ContactResult ();
                 result.ConsumerID = group.LocalId;
-                result.Depth = intersection.distance;
+//                result.Depth = intersection.distance;
                 result.Normal = intersection.normal;
                 result.Pos = intersection.ipoint;
+                result.Depth = Vector3.Mag(rayStart - result.Pos);
 
                 contacts.Add(result);
             });
@@ -11272,6 +12198,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             return contacts[0];
         }
+/*
+        // not done:
+        private ContactResult[] testRay2NonPhysicalPhantom(Vector3 rayStart, Vector3 raydir, float raylenght)
+        {
+            ContactResult[] contacts = null;
+            World.ForEachSOG(delegate(SceneObjectGroup group)
+            {
+                if (m_host.ParentGroup == group)
+                    return;
+
+                if (group.IsAttachment)
+                    return;
+
+                if(group.RootPart.PhysActor != null)
+                    return;
+
+                contacts = group.RayCastGroupPartsOBBNonPhysicalPhantom(rayStart, raydir, raylenght);
+            });
+            return contacts;
+        }
+*/
 
         public LSL_List llCastRay(LSL_Vector start, LSL_Vector end, LSL_List options)
         {
@@ -11395,18 +12342,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 }
             }
 
+            // Double check this
             if (checkTerrain)
             {
-                ContactResult? groundContact = GroundIntersection(rayStart, rayEnd);
-                if (groundContact != null)
-                    results.Add((ContactResult)groundContact);
+                bool skipGroundCheck = false;
+
+                foreach (ContactResult c in results)
+                {
+                    if (c.ConsumerID == 0) // Physics gave us a ground collision
+                        skipGroundCheck = true;
+                }
+
+                if (!skipGroundCheck)
+                {
+                    ContactResult? groundContact = GroundIntersection(rayStart, rayEnd);
+                    if (groundContact != null)
+                        results.Add((ContactResult)groundContact);
+                }
             }
 
             results.Sort(delegate(ContactResult a, ContactResult b)
             {
                 return a.Depth.CompareTo(b.Depth);
             });
-
+            
             int values = 0;
             SceneObjectGroup thisgrp = m_host.ParentGroup;
 
@@ -11499,7 +12458,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 case ScriptBaseClass.ESTATE_ACCESS_ALLOWED_AGENT_ADD:
                     if (!isAccount) return 0;
                     if (estate.HasAccess(id)) return 1;
-                    if (estate.IsBanned(id))
+                    if (estate.IsBanned(id, World.GetUserFlags(id)))
                         estate.RemoveBan(id);
                     estate.AddEstateUser(id);
                     break;
@@ -11518,14 +12477,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     break;
                 case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_ADD:
                     if (!isAccount) return 0;
-                    if (estate.IsBanned(id)) return 1;
+                    if (estate.IsBanned(id, World.GetUserFlags(id))) return 1;
                     EstateBan ban = new EstateBan();
                     ban.EstateID = estate.EstateID;
                     ban.BannedUserID = id;
                     estate.AddBan(ban);
                     break;
                 case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_REMOVE:
-                    if (!isAccount || !estate.IsBanned(id)) return 0;
+                    if (!isAccount || !estate.IsBanned(id, World.GetUserFlags(id))) return 0;
                     estate.RemoveBan(id);
                     break;
                 default: return 0;
@@ -11554,7 +12513,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return 16384;
         }
 
-        public LSL_Integer llGetUsedMemory()
+        public virtual LSL_Integer llGetUsedMemory()
         {
             m_host.AddScriptLPS(1);
             // The value returned for LSO scripts in SL
@@ -11582,19 +12541,68 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llSetSoundQueueing(int queue)
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llSetSoundQueueing");
         }
 
         public void llCollisionSprite(string impact_sprite)
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llCollisionSprite");
+            // Viewer 2.0 broke this and it's likely LL has no intention
+            // of fixing it. Therefore, letting this be a NOP seems appropriate.
         }
 
         public void llGodLikeRezObject(string inventory, LSL_Vector pos)
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llGodLikeRezObject");
+
+            if (!World.Permissions.IsGod(m_host.OwnerID))
+                NotImplemented("llGodLikeRezObject");
+
+            AssetBase rezAsset = World.AssetService.Get(inventory);
+            if (rezAsset == null)
+            {
+                llSay(0, "Asset not found");
+                return;
+            }
+
+            SceneObjectGroup group = null;
+
+            try
+            {
+                string xmlData = Utils.BytesToString(rezAsset.Data);
+                group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
+            }
+            catch
+            {
+                llSay(0, "Asset not found");
+                return;
+            }
+
+            if (group == null)
+            {
+                llSay(0, "Asset not found");
+                return;
+            }
+
+            group.RootPart.AttachPoint = group.RootPart.Shape.State;
+            group.RootPart.AttachOffset = group.AbsolutePosition;
+
+            group.ResetIDs();
+
+            Vector3 llpos = new Vector3((float)pos.x, (float)pos.y, (float)pos.z);
+            World.AddNewSceneObject(group, true, llpos, Quaternion.Identity, Vector3.Zero);
+            group.CreateScriptInstances(0, true, World.DefaultScriptEngine, 3);
+            group.ScheduleGroupForFullUpdate();
+
+            // objects rezzed with this method are die_at_edge by default.
+            group.RootPart.SetDieAtEdge(true);
+
+            group.ResumeScripts();
+
+            m_ScriptEngine.PostObjectEvent(m_host.LocalId, new EventParams(
+                    "object_rez", new Object[] {
+                    new LSL_String(
+                    group.RootPart.UUID.ToString()) },
+                    new DetectParams[0]));
         }
 
         public LSL_String llTransferLindenDollars(string destination, int amount)
@@ -11646,7 +12654,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
 
                     bool result = money.ObjectGiveMoney(
-                        m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount);
+                        m_host.ParentGroup.RootPart.UUID, m_host.ParentGroup.RootPart.OwnerID, toID, amount, txn);
 
                     if (result)
                     {
@@ -11671,6 +12679,598 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         }
 
         #endregion
+
+        public void llSetKeyframedMotion(LSL_List frames, LSL_List options)
+        {
+            SceneObjectGroup group = m_host.ParentGroup;
+
+            if (group.RootPart.PhysActor != null && group.RootPart.PhysActor.IsPhysical)
+                return;
+            if (group.IsAttachment)
+                return;
+
+            if (frames.Data.Length > 0) // We are getting a new motion
+            {
+                if (group.RootPart.KeyframeMotion != null)
+                    group.RootPart.KeyframeMotion.Delete();
+                group.RootPart.KeyframeMotion = null;
+
+                int idx = 0;
+
+                KeyframeMotion.PlayMode mode = KeyframeMotion.PlayMode.Forward;
+                KeyframeMotion.DataFormat data = KeyframeMotion.DataFormat.Translation | KeyframeMotion.DataFormat.Rotation;
+
+                while (idx < options.Data.Length)
+                {
+                    int option = (int)options.GetLSLIntegerItem(idx++);
+                    int remain = options.Data.Length - idx;
+
+                    switch (option)
+                    {
+                        case ScriptBaseClass.KFM_MODE:
+                            if (remain < 1)
+                                break;
+                            int modeval = (int)options.GetLSLIntegerItem(idx++);
+                            switch(modeval)
+                            {
+                                case ScriptBaseClass.KFM_FORWARD:
+                                    mode = KeyframeMotion.PlayMode.Forward;
+                                    break;
+                                case ScriptBaseClass.KFM_REVERSE:
+                                    mode = KeyframeMotion.PlayMode.Reverse;
+                                    break;
+                                case ScriptBaseClass.KFM_LOOP:
+                                    mode = KeyframeMotion.PlayMode.Loop;
+                                    break;
+                                case ScriptBaseClass.KFM_PING_PONG:
+                                    mode = KeyframeMotion.PlayMode.PingPong;
+                                    break;
+                            }
+                            break;
+                        case ScriptBaseClass.KFM_DATA:
+                            if (remain < 1)
+                                break;
+                            int dataval = (int)options.GetLSLIntegerItem(idx++);
+                            data = (KeyframeMotion.DataFormat)dataval;
+                            break;
+                    }
+                }
+
+                group.RootPart.KeyframeMotion = new KeyframeMotion(group, mode, data);
+
+                idx = 0;
+
+                int elemLength = 2;
+                if (data == (KeyframeMotion.DataFormat.Translation | KeyframeMotion.DataFormat.Rotation))
+                    elemLength = 3;
+
+                List<KeyframeMotion.Keyframe> keyframes = new List<KeyframeMotion.Keyframe>();
+                while (idx < frames.Data.Length)
+                {
+                    int remain = frames.Data.Length - idx;
+
+                    if (remain < elemLength)
+                        break;
+
+                    KeyframeMotion.Keyframe frame = new KeyframeMotion.Keyframe();
+                    frame.Position = null;
+                    frame.Rotation = null;
+
+                    if ((data & KeyframeMotion.DataFormat.Translation) != 0)
+                    {
+                        LSL_Types.Vector3 tempv = frames.GetVector3Item(idx++);
+                        frame.Position = new Vector3((float)tempv.x, (float)tempv.y, (float)tempv.z);
+                    }
+                    if ((data & KeyframeMotion.DataFormat.Rotation) != 0)
+                    {
+                        LSL_Types.Quaternion tempq = frames.GetQuaternionItem(idx++);
+                        Quaternion q = new Quaternion((float)tempq.x, (float)tempq.y, (float)tempq.z, (float)tempq.s);
+                        q.Normalize();
+                        frame.Rotation = q;
+                    }
+
+                    float tempf = (float)frames.GetLSLFloatItem(idx++);
+                    frame.TimeMS = (int)(tempf * 1000.0f);
+
+                    keyframes.Add(frame);
+                }
+
+                group.RootPart.KeyframeMotion.SetKeyframes(keyframes.ToArray());
+                group.RootPart.KeyframeMotion.Start();
+            }
+            else
+            {
+                if (group.RootPart.KeyframeMotion == null)
+                    return;
+
+                if (options.Data.Length == 0)
+                {
+                    group.RootPart.KeyframeMotion.Stop();
+                    return;
+                }
+                    
+                int code = (int)options.GetLSLIntegerItem(0);
+
+                int idx = 0;
+
+                while (idx < options.Data.Length)
+                {
+                    int option = (int)options.GetLSLIntegerItem(idx++);
+                    int remain = options.Data.Length - idx;
+
+                    switch (option)
+                    {
+                        case ScriptBaseClass.KFM_COMMAND:
+                            int cmd = (int)options.GetLSLIntegerItem(idx++);
+                            switch (cmd)
+                            {
+                                case ScriptBaseClass.KFM_CMD_PLAY:
+                                    group.RootPart.KeyframeMotion.Start();
+                                    break;
+                                case ScriptBaseClass.KFM_CMD_STOP:
+                                    group.RootPart.KeyframeMotion.Stop();
+                                    break;
+                                case ScriptBaseClass.KFM_CMD_PAUSE:
+                                    group.RootPart.KeyframeMotion.Pause();
+                                    break;
+                            }
+                            break;
+                    }
+                }
+            }
+        }
+
+        protected LSL_List SetPrimParams(ScenePresence av, LSL_List rules, string originFunc, ref uint rulesParsed)
+        {
+            //This is a special version of SetPrimParams to deal with avatars which are sat on the linkset.
+
+            int idx = 0;
+            int idxStart = 0;
+
+            bool positionChanged = false;
+            Vector3 finalPos = Vector3.Zero;
+
+            try
+            {
+                while (idx < rules.Length)
+                {
+                    ++rulesParsed;
+                    int code = rules.GetLSLIntegerItem(idx++);
+
+                    int remain = rules.Length - idx;
+                    idxStart = idx;
+
+                    switch (code)
+                    {
+                        case (int)ScriptBaseClass.PRIM_POSITION:
+                        case (int)ScriptBaseClass.PRIM_POS_LOCAL:
+                            {
+                                if (remain < 1)
+                                    return null;
+
+                                LSL_Vector v;
+                                v = rules.GetVector3Item(idx++);
+
+                                SceneObjectPart part = World.GetSceneObjectPart(av.ParentID);
+                                if (part == null)
+                                    break;
+
+                                LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION;
+                                LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR;
+                                if (part.LinkNum > 1)
+                                {
+                                    localRot = GetPartLocalRot(part);
+                                    localPos = GetPartLocalPos(part);
+                                }
+
+                                v -= localPos;
+                                v /= localRot;
+
+                                LSL_Vector sitOffset = (llRot2Up(new LSL_Rotation(av.Rotation.X, av.Rotation.Y, av.Rotation.Z, av.Rotation.W)) * av.Appearance.AvatarHeight * 0.02638f);
+
+                                v = v + 2 * sitOffset;
+
+                                av.OffsetPosition = new Vector3((float)v.x, (float)v.y, (float)v.z);
+                                av.SendAvatarDataToAllAgents();
+
+                            }
+                            break;
+
+                        case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
+                        case (int)ScriptBaseClass.PRIM_ROTATION:
+                            {
+                                if (remain < 1)
+                                    return null;
+
+                                LSL_Rotation r;
+                                r = rules.GetQuaternionItem(idx++);
+
+                                SceneObjectPart part = World.GetSceneObjectPart(av.ParentID);
+                                if (part == null)
+                                    break;
+
+                                LSL_Rotation localRot = ScriptBaseClass.ZERO_ROTATION;
+                                LSL_Vector localPos = ScriptBaseClass.ZERO_VECTOR;
+
+                                if (part.LinkNum > 1)
+                                    localRot = GetPartLocalRot(part);
+
+                                r = r * llGetRootRotation() / localRot;
+                                av.Rotation = new Quaternion((float)r.x, (float)r.y, (float)r.z, (float)r.s);
+                                av.SendAvatarDataToAllAgents();
+                            }
+                            break;
+
+                        // parse rest doing nothing but number of parameters error check
+                        case (int)ScriptBaseClass.PRIM_SIZE:
+                        case (int)ScriptBaseClass.PRIM_MATERIAL:
+                        case (int)ScriptBaseClass.PRIM_PHANTOM:
+                        case (int)ScriptBaseClass.PRIM_PHYSICS:
+                        case (int)ScriptBaseClass.PRIM_PHYSICS_SHAPE_TYPE:
+                        case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ:
+                        case (int)ScriptBaseClass.PRIM_NAME:
+                        case (int)ScriptBaseClass.PRIM_DESC:
+                            if (remain < 1)
+                                return null;
+                            idx++;
+                            break;
+
+                        case (int)ScriptBaseClass.PRIM_GLOW:
+                        case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
+                        case (int)ScriptBaseClass.PRIM_TEXGEN:
+                            if (remain < 2)
+                                return null;
+                            idx += 2;
+                            break;
+
+                        case (int)ScriptBaseClass.PRIM_TYPE:
+                            if (remain < 3)
+                                return null;
+                            code = (int)rules.GetLSLIntegerItem(idx++);
+                            remain = rules.Length - idx;
+                            switch (code)
+                            {
+                                case (int)ScriptBaseClass.PRIM_TYPE_BOX:
+                                case (int)ScriptBaseClass.PRIM_TYPE_CYLINDER:
+                                case (int)ScriptBaseClass.PRIM_TYPE_PRISM:
+                                    if (remain < 6)
+                                        return null;
+                                    idx += 6;
+                                    break;
+
+                                case (int)ScriptBaseClass.PRIM_TYPE_SPHERE:
+                                    if (remain < 5)
+                                        return null;
+                                    idx += 5;
+                                    break;
+
+                                case (int)ScriptBaseClass.PRIM_TYPE_TORUS:
+                                case (int)ScriptBaseClass.PRIM_TYPE_TUBE:
+                                case (int)ScriptBaseClass.PRIM_TYPE_RING:
+                                    if (remain < 11)
+                                        return null;
+                                    idx += 11;
+                                    break;
+
+                                case (int)ScriptBaseClass.PRIM_TYPE_SCULPT:
+                                    if (remain < 2)
+                                        return null;
+                                    idx += 2;
+                                    break;
+                            }
+                            break;
+
+                        case (int)ScriptBaseClass.PRIM_COLOR:
+                        case (int)ScriptBaseClass.PRIM_TEXT:
+                        case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
+                        case (int)ScriptBaseClass.PRIM_OMEGA:
+                            if (remain < 3)
+                                return null;
+                            idx += 3;
+                            break;
+
+                        case (int)ScriptBaseClass.PRIM_TEXTURE:
+                        case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
+                        case (int)ScriptBaseClass.PRIM_PHYSICS_MATERIAL:
+                            if (remain < 5)
+                                return null;
+                            idx += 5;
+                            break;
+
+                        case (int)ScriptBaseClass.PRIM_FLEXIBLE:
+                            if (remain < 7)
+                                return null;
+
+                            idx += 7;
+                            break;
+
+                        case (int)ScriptBaseClass.PRIM_LINK_TARGET:
+                            if (remain < 3) // setting to 3 on the basis that parsing any usage of PRIM_LINK_TARGET that has nothing following it is pointless.
+                                return null;
+
+                            return rules.GetSublist(idx, -1);
+                    }
+                }
+            }
+            catch (InvalidCastException e)
+            {
+                ShoutError(string.Format(
+                        "{0} error running rule #{1}: arg #{2} ",
+                        originFunc, rulesParsed, idx - idxStart) + e.Message);
+            }
+            finally
+            {
+                if (positionChanged)
+                {
+                    av.OffsetPosition = finalPos;
+//                    av.SendAvatarDataToAllAgents();
+                    av.SendTerseUpdateToAllClients();
+                    positionChanged = false;
+                }
+            }
+            return null;
+        }
+
+        public LSL_List GetPrimParams(ScenePresence avatar, LSL_List rules, ref LSL_List res)
+        {
+            // avatars case
+            // replies as SL wiki
+
+//            SceneObjectPart sitPart = avatar.ParentPart; // most likelly it will be needed
+            SceneObjectPart sitPart = World.GetSceneObjectPart(avatar.ParentID); // maybe better do this expensive search for it in case it's gone??
+
+            int idx = 0;
+            while (idx < rules.Length)
+            {
+                int code = (int)rules.GetLSLIntegerItem(idx++);
+                int remain = rules.Length - idx;
+
+                switch (code)
+                {
+                    case (int)ScriptBaseClass.PRIM_MATERIAL:
+                        res.Add(new LSL_Integer((int)SOPMaterialData.SopMaterial.Flesh));
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_PHYSICS:
+                            res.Add(new LSL_Integer(0));
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ:
+                            res.Add(new LSL_Integer(0));
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_PHANTOM:
+                            res.Add(new LSL_Integer(0));
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_POSITION:
+
+                        Vector3 pos = avatar.OffsetPosition;
+
+                        Vector3 sitOffset = (Zrot(avatar.Rotation)) * (avatar.Appearance.AvatarHeight * 0.02638f *2.0f);
+                        pos -= sitOffset;
+
+                        if( sitPart != null)
+                            pos = sitPart.GetWorldPosition() + pos * sitPart.GetWorldRotation();
+
+                        res.Add(new LSL_Vector(pos.X,pos.Y,pos.Z));
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_SIZE:
+                        // as in llGetAgentSize above
+//                        res.Add(new LSL_Vector(0.45f, 0.6f, avatar.Appearance.AvatarHeight));
+                        Vector3 s = avatar.Appearance.AvatarSize;
+                        res.Add(new LSL_Vector(s.X, s.Y, s.Z));
+
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_ROTATION:
+                        Quaternion rot = avatar.Rotation;
+                        if (sitPart != null)
+                        {
+                            rot = sitPart.GetWorldRotation() * rot; // apply sit part world rotation
+                        }
+
+                        res.Add(new LSL_Rotation (rot.X, rot.Y, rot.Z, rot.W));
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_TYPE:
+                        res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TYPE_BOX));
+                        res.Add(new LSL_Integer(ScriptBaseClass.PRIM_HOLE_DEFAULT));
+                        res.Add(new LSL_Vector(0f,1.0f,0f));
+                        res.Add(new LSL_Float(0.0f));
+                        res.Add(new LSL_Vector(0, 0, 0));
+                        res.Add(new LSL_Vector(1.0f,1.0f,0f));
+                        res.Add(new LSL_Vector(0, 0, 0));
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_TEXTURE:
+                        if (remain < 1)
+                            return null;
+
+                        int face = (int)rules.GetLSLIntegerItem(idx++);
+                        if (face == ScriptBaseClass.ALL_SIDES)
+                        {
+                            for (face = 0; face < 21; face++)
+                            {
+                                res.Add(new LSL_String(""));
+                                res.Add(new LSL_Vector(0,0,0));
+                                res.Add(new LSL_Vector(0,0,0));
+                                res.Add(new LSL_Float(0.0));
+                            }
+                        }
+                        else
+                        {
+                            if (face >= 0 && face < 21)
+                            {
+                                res.Add(new LSL_String(""));
+                                res.Add(new LSL_Vector(0,0,0));
+                                res.Add(new LSL_Vector(0,0,0));
+                                res.Add(new LSL_Float(0.0));
+                            }
+                        }
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_COLOR:
+                        if (remain < 1)
+                            return null;
+
+                        face = (int)rules.GetLSLIntegerItem(idx++);
+
+                        if (face == ScriptBaseClass.ALL_SIDES)
+                        {
+                            for (face = 0; face < 21; face++)
+                            {
+                                res.Add(new LSL_Vector(0,0,0));
+                                res.Add(new LSL_Float(0));
+                            }
+                        }
+                        else
+                        {
+                                res.Add(new LSL_Vector(0,0,0));
+                                res.Add(new LSL_Float(0));
+                        }
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
+                        if (remain < 1)
+                            return null;
+                        face = (int)rules.GetLSLIntegerItem(idx++);
+
+                        if (face == ScriptBaseClass.ALL_SIDES)
+                        {
+                            for (face = 0; face < 21; face++)
+                            {
+                                res.Add(new LSL_Integer(ScriptBaseClass.PRIM_SHINY_NONE));
+                                res.Add(new LSL_Integer(ScriptBaseClass.PRIM_BUMP_NONE));
+                            }
+                        }
+                        else
+                        {
+                                res.Add(new LSL_Integer(ScriptBaseClass.PRIM_SHINY_NONE));
+                                res.Add(new LSL_Integer(ScriptBaseClass.PRIM_BUMP_NONE));
+                        }
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
+                        if (remain < 1)
+                            return null;
+                        face = (int)rules.GetLSLIntegerItem(idx++);
+
+                        if (face == ScriptBaseClass.ALL_SIDES)
+                        {
+                            for (face = 0; face < 21; face++)
+                            {
+                                res.Add(new LSL_Integer(ScriptBaseClass.FALSE));
+                            }
+                        }
+                        else
+                        {
+                                res.Add(new LSL_Integer(ScriptBaseClass.FALSE));
+                        }
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_FLEXIBLE:
+                        res.Add(new LSL_Integer(0));
+                        res.Add(new LSL_Integer(0));// softness
+                        res.Add(new LSL_Float(0.0f));   // gravity
+                        res.Add(new LSL_Float(0.0f));      // friction
+                        res.Add(new LSL_Float(0.0f));      // wind
+                        res.Add(new LSL_Float(0.0f));   // tension
+                        res.Add(new LSL_Vector(0f,0f,0f));
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_TEXGEN:
+                        // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR)
+                        if (remain < 1)
+                            return null;
+                        face = (int)rules.GetLSLIntegerItem(idx++);
+
+                        if (face == ScriptBaseClass.ALL_SIDES)
+                        {
+                            for (face = 0; face < 21; face++)
+                            {
+                                    res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
+                            }
+                        }
+                        else
+                        {
+                                res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
+                        }
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
+                        res.Add(new LSL_Integer(0));
+                        res.Add(new LSL_Vector(0f,0f,0f));
+                        res.Add(new LSL_Float(0f)); // intensity
+                        res.Add(new LSL_Float(0f));    // radius
+                        res.Add(new LSL_Float(0f));   // falloff
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_GLOW:
+                        if (remain < 1)
+                            return null;
+                        face = (int)rules.GetLSLIntegerItem(idx++);
+
+                        if (face == ScriptBaseClass.ALL_SIDES)
+                        {
+                            for (face = 0; face < 21; face++)
+                            {
+                                res.Add(new LSL_Float(0f));
+                            }
+                        }
+                        else
+                        {
+                                res.Add(new LSL_Float(0f));
+                        }
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_TEXT:
+                        res.Add(new LSL_String(""));
+                        res.Add(new LSL_Vector(0f,0f,0f));
+                        res.Add(new LSL_Float(1.0f));
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_NAME:
+                        res.Add(new LSL_String(avatar.Name));
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_DESC:
+                        res.Add(new LSL_String(""));
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_ROT_LOCAL:                      
+                        Quaternion lrot = avatar.Rotation;
+
+                        if (sitPart != null && sitPart != sitPart.ParentGroup.RootPart)
+                        {
+                            lrot = sitPart.RotationOffset * lrot; // apply sit part rotation offset
+                        }
+                        res.Add(new LSL_Rotation(lrot.X, lrot.Y, lrot.Z, lrot.W));
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_POS_LOCAL:
+                        Vector3 lpos = avatar.OffsetPosition; // pos relative to sit part
+                        Vector3 lsitOffset = (Zrot(avatar.Rotation)) * (avatar.Appearance.AvatarHeight * 0.02638f * 2.0f);
+                        lpos -= lsitOffset;
+
+                        if (sitPart != null && sitPart != sitPart.ParentGroup.RootPart)
+                        {
+                            lpos = sitPart.OffsetPosition + (lpos * sitPart.RotationOffset); // make it relative to root prim
+                        }
+                        res.Add(new LSL_Vector(lpos.X,lpos.Y,lpos.Z));
+                        break;
+
+                    case (int)ScriptBaseClass.PRIM_LINK_TARGET:
+                        if (remain < 3) // setting to 3 on the basis that parsing any usage of PRIM_LINK_TARGET that has nothing following it is pointless.
+                            return null;
+
+                        return rules.GetSublist(idx, -1);
+                }
+            }
+
+            return null;
+        }
     }
 
     public class NotecardCache
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 1426070..6ff6b00 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -138,6 +138,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow;
         internal float m_ScriptDelayFactor = 1.0f;
         internal float m_ScriptDistanceFactor = 1.0f;
+        internal bool m_debuggerSafe = false;
         internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >();
 
         protected IUrlModule m_UrlModule = null;
@@ -148,6 +149,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_ScriptEngine = scriptEngine;
             m_host = host;
             m_item = item;
+            m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false);
 
             m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>();
 
@@ -211,7 +213,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         internal void OSSLError(string msg)
         {
-            throw new ScriptException("OSSL Runtime Error: " + msg);
+            if (m_debuggerSafe)
+            {
+                OSSLShoutError(msg);
+            }
+            else
+            {
+                throw new ScriptException("OSSL Runtime Error: " + msg);
+            }
         }
 
         /// <summary>
@@ -930,18 +939,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 if (target != null)
                 {
                     UUID animID=UUID.Zero;
-                    lock (m_host.TaskInventory)
+                    m_host.TaskInventory.LockItemsForRead(true);
+                    foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
                     {
-                        foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
+                        if (inv.Value.Name == animation)
                         {
-                            if (inv.Value.Name == animation)
-                            {
-                                if (inv.Value.Type == (int)AssetType.Animation)
-                                    animID = inv.Value.AssetID;
-                                continue;
-                            }
+                            if (inv.Value.Type == (int)AssetType.Animation)
+                                animID = inv.Value.AssetID;
+                            continue;
                         }
                     }
+                    m_host.TaskInventory.LockItemsForRead(false);
                     if (animID == UUID.Zero)
                         target.Animator.AddAnimation(animation, m_host.UUID);
                     else
@@ -982,6 +990,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         else
                             animID = UUID.Zero;
                     }
+                    m_host.TaskInventory.LockItemsForRead(false);
                     
                     if (animID == UUID.Zero)
                         target.Animator.RemoveAnimation(animation);
@@ -1848,15 +1857,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             UUID assetID = UUID.Zero;
 
-            if (!UUID.TryParse(notecardNameOrUuid, out assetID))
+            bool notecardNameIsUUID = UUID.TryParse(notecardNameOrUuid, out assetID);
+
+            if (!notecardNameIsUUID)
             {
-                foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
-                {
-                    if (item.Type == 7 && item.Name == notecardNameOrUuid)
-                    {
-                        assetID = item.AssetID;
-                    }
-                }
+                assetID = SearchTaskInventoryForAssetId(notecardNameOrUuid);
             }
 
             if (assetID == UUID.Zero)
@@ -1867,7 +1872,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 AssetBase a = World.AssetService.Get(assetID.ToString());
 
                 if (a == null)
-                    return UUID.Zero;
+                {
+                    // Whoops, it's still possible here that the notecard name was properly 
+                    // formatted like a UUID but isn't an asset UUID so lets look it up by name after all
+                    assetID = SearchTaskInventoryForAssetId(notecardNameOrUuid);
+                    if (assetID == UUID.Zero)
+                        return UUID.Zero;
+
+                    if (!NotecardCache.IsCached(assetID))
+                    {
+                        a = World.AssetService.Get(assetID.ToString());
+
+                        if (a == null)
+                        {
+                            return UUID.Zero;
+                        }
+                    }
+                }
 
                 string data = Encoding.UTF8.GetString(a.Data);
                 NotecardCache.Cache(assetID, data);
@@ -1875,6 +1896,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             return assetID;
         }
+        protected UUID SearchTaskInventoryForAssetId(string name)
+        {
+            UUID assetId = UUID.Zero;
+            m_host.TaskInventory.LockItemsForRead(true);
+            foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
+            {
+                if (item.Type == 7 && item.Name == name)
+                {
+                    assetId = item.AssetID;
+                }
+            }
+            m_host.TaskInventory.LockItemsForRead(false);
+            return assetId;
+        }
 
         /// <summary>
         /// Directly get an entire notecard at once.
@@ -2342,7 +2377,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             CheckThreatLevel(ThreatLevel.High, "osNpcCreate");
             m_host.AddScriptLPS(1);
 
-            return NpcCreate(firstname, lastname, position, notecard, false, false);
+            return NpcCreate(firstname, lastname, position, notecard, true, false);
         }
 
         public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, int options)
@@ -2353,24 +2388,39 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return NpcCreate(
                 firstname, lastname, position, notecard,
                 (options & ScriptBaseClass.OS_NPC_NOT_OWNED) == 0,
-                (options & ScriptBaseClass.OS_NPC_SENSE_AS_AGENT) != 0);
+                false);
+//                (options & ScriptBaseClass.OS_NPC_SENSE_AS_AGENT) != 0);
         }
 
         private LSL_Key NpcCreate(
             string firstname, string lastname, LSL_Vector position, string notecard, bool owned, bool senseAsAgent)
         {
+            if (!owned)
+                OSSLError("Unowned NPCs are unsupported");
+            
+            string groupTitle = String.Empty;
+
+            if (!World.Permissions.CanRezObject(1, m_host.OwnerID, new Vector3((float)position.x, (float)position.y, (float)position.z)))
+                return new LSL_Key(UUID.Zero.ToString());
+
+            if (firstname != String.Empty || lastname != String.Empty)
+            {
+                if (firstname != "Shown outfit:")
+                    groupTitle = "- NPC -";
+            }
+
             INPCModule module = World.RequestModuleInterface<INPCModule>();
             if (module != null)
             {
                 AvatarAppearance appearance = null;
 
-                UUID id;
-                if (UUID.TryParse(notecard, out id))
-                {
-                    ScenePresence clonePresence = World.GetScenePresence(id);
-                    if (clonePresence != null)
-                        appearance = clonePresence.Appearance;
-                }
+//                UUID id;
+//                if (UUID.TryParse(notecard, out id))
+//                {
+//                    ScenePresence clonePresence = World.GetScenePresence(id);
+//                    if (clonePresence != null)
+//                        appearance = clonePresence.Appearance;
+//                }
 
                 if (appearance == null)
                 {
@@ -2378,9 +2428,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                     if (appearanceSerialized != null)
                     {
-                        OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(appearanceSerialized);
-                        appearance = new AvatarAppearance();
-                        appearance.Unpack(appearanceOsd);
+                        try
+                        {
+                            OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(appearanceSerialized);
+                            appearance = new AvatarAppearance();
+                            appearance.Unpack(appearanceOsd);
+                        }
+                        catch
+                        {
+                            return UUID.Zero.ToString();
+                        }
                     }
                     else
                     {
@@ -2399,6 +2456,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                           World,
                                           appearance);
 
+                ScenePresence sp;
+                if (World.TryGetScenePresence(x, out sp))
+                {
+                    sp.Grouptitle = groupTitle;
+                    sp.SendAvatarDataToAllAgents();
+                }
                 return new LSL_Key(x.ToString());
             }
 
@@ -2702,16 +2765,32 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             CheckThreatLevel(ThreatLevel.High, "osNpcRemove");
             m_host.AddScriptLPS(1);
 
-            INPCModule module = World.RequestModuleInterface<INPCModule>();
-            if (module != null)
-            {
-                UUID npcId = new UUID(npc.m_string);
+            ManualResetEvent ev = new ManualResetEvent(false);
 
-                if (!module.CheckPermissions(npcId, m_host.OwnerID))
-                    return;
+            Util.FireAndForget(delegate(object x) {
+                try
+                {
+                    INPCModule module = World.RequestModuleInterface<INPCModule>();
+                    if (module != null)
+                    {
+                        UUID npcId = new UUID(npc.m_string);
 
-                module.DeleteNPC(npcId, World);
-            }
+                        ILandObject l = World.LandChannel.GetLandObject(m_host.GroupPosition.X, m_host.GroupPosition.Y);
+                        if (l == null || m_host.OwnerID != l.LandData.OwnerID)
+                        {
+                            if (!module.CheckPermissions(npcId, m_host.OwnerID))
+                                return;
+                        }
+
+                        module.DeleteNPC(npcId, World);
+                    }
+                }
+                finally
+                {
+                    ev.Set();
+                }
+            });
+            ev.WaitOne();
         }
 
         public void osNpcPlayAnimation(LSL_Key npc, string animation)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index dd45406..d3ef378 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -93,7 +93,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
         private const int AGENT = 1;
         private const int AGENT_BY_USERNAME = 0x10;
         private const int NPC = 0x20;
-        private const int OS_NPC = 0x01000000;
         private const int ACTIVE = 2;
         private const int PASSIVE = 4;
         private const int SCRIPTED = 8;
@@ -240,7 +239,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
             List<SensedEntity> sensedEntities = new List<SensedEntity>();
 
             // Is the sensor type is AGENT and not SCRIPTED then include agents
-            if ((ts.type & (AGENT | AGENT_BY_USERNAME | NPC | OS_NPC)) != 0 && (ts.type & SCRIPTED) == 0)
+            if ((ts.type & (AGENT | AGENT_BY_USERNAME | NPC)) != 0 && (ts.type & SCRIPTED) == 0)
             {
                 sensedEntities.AddRange(doAgentSensor(ts));
             }
@@ -339,7 +338,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
             float dy;
             float dz;
 
-            Quaternion q = SensePoint.GetWorldRotation();
+//            Quaternion q = SensePoint.RotationOffset;
+            Quaternion q = SensePoint.GetWorldRotation();               // non-attached prim Sensor *always* uses World rotation!
             if (SensePoint.ParentGroup.IsAttachment)
             {
                 // In attachments, rotate the sensor cone with the
@@ -353,7 +353,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
                 // Position of a sensor in a child prim attached to an avatar
                 // will be still wrong. 
                 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar);
-                q = avatar.Rotation * q;
+                fromRegionPos = avatar.AbsolutePosition;
+                q = avatar.Rotation;
             }
 
             LSL_Types.Quaternion r = new LSL_Types.Quaternion(q);
@@ -480,7 +481,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
                 // Position of a sensor in a child prim attached to an avatar
                 // will be still wrong. 
                 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.AttachedAvatar);
-                q = avatar.Rotation * q;
+                if (avatar == null)
+                    return sensedEntities;
+                fromRegionPos = avatar.AbsolutePosition;
+                q = avatar.Rotation;
             }
 
             LSL_Types.Quaternion r = new LSL_Types.Quaternion(q);
@@ -496,7 +500,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 //                    "[SENSOR REPEAT]: Inspecting scene presence {0}, type {1} on sensor sweep for {2}, type {3}",
 //                    presence.Name, presence.PresenceType, ts.name, ts.type);
 
-                if ((ts.type & NPC) == 0 && (ts.type & OS_NPC) == 0 && presence.PresenceType == PresenceType.Npc)
+                if ((ts.type & NPC) == 0 && presence.PresenceType == PresenceType.Npc)
                 {
                     INPC npcData = m_npcModule.GetNPC(presence.UUID, presence.Scene);
                     if (npcData == null || !npcData.SenseAsAgent)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
index 0b14565..68aacd2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
@@ -123,25 +123,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
             if (Timers.Count == 0)
                 return;
 
+            Dictionary<string, TimerInfo>.ValueCollection tvals;
             lock (TimerListLock)
             {
                 // Go through all timers
-                Dictionary<string, TimerInfo>.ValueCollection tvals = Timers.Values;
-                foreach (TimerInfo ts in tvals)
+                tvals = Timers.Values;
+            }
+
+            foreach (TimerInfo ts in tvals)
+            {
+                // Time has passed?
+                if (ts.next < DateTime.Now.Ticks)
                 {
-                    // Time has passed?
-                    if (ts.next < DateTime.Now.Ticks)
-                    {
-                        //m_log.Debug("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next);
-                        // Add it to queue
-                        m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID,
-                                new EventParams("timer", new Object[0],
-                                new DetectParams[0]));
-                        // set next interval
-
-                        //ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
-                        ts.next = DateTime.Now.Ticks + ts.interval;
-                    }
+                    //m_log.Debug("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next);
+                    // Add it to queue
+                    m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID,
+                            new EventParams("timer", new Object[0],
+                            new DetectParams[0]));
+                    // set next interval
+
+                    //ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
+                    ts.next = DateTime.Now.Ticks + ts.interval;
                 }
             }
         }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs
new file mode 100644
index 0000000..ab215f3
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System.Collections;
+using OpenSim.Region.ScriptEngine.Interfaces;
+
+using key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
+using rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
+using vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
+using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
+using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
+using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
+using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
+
+namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
+{
+    public interface ICM_Api
+    {
+        string cmDetectedCountry(int num);
+        string cmGetAgentCountry(key key);
+    }
+}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 4ac179a..9bf6f9b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -126,6 +126,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
          LSL_Float llGetEnergy();
         LSL_Vector llGetForce();
        LSL_Integer llGetFreeMemory();
+       LSL_Integer llGetUsedMemory();
        LSL_Integer llGetFreeURLs();
         LSL_Vector llGetGeometricCenter();
          LSL_Float llGetGMTclock();
@@ -149,6 +150,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         LSL_Vector llGetLocalPos();
       LSL_Rotation llGetLocalRot();
          LSL_Float llGetMass();
+         LSL_Float llGetMassMKS();
        LSL_Integer llGetMemoryLimit();
               void llGetNextEmail(string address, string subject);
         LSL_String llGetNotecardLine(string name, int line);
@@ -202,12 +204,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         LSL_String llGetTimestamp();
         LSL_Vector llGetTorque();
        LSL_Integer llGetUnixTime();
-       LSL_Integer llGetUsedMemory();
         LSL_Vector llGetVel();
          LSL_Float llGetWallclock();
               void llGiveInventory(string destination, string inventory);
               void llGiveInventoryList(string destination, string category, LSL_List inventory);
-              void llGiveMoney(string destination, int amount);
+       LSL_Integer llGiveMoney(string destination, int amount);
         LSL_String llTransferLindenDollars(string destination, int amount);
               void llGodLikeRezObject(string inventory, LSL_Vector pos);
          LSL_Float llGround(LSL_Vector offset);
@@ -331,6 +332,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
               void llSensorRemove();
               void llSensorRepeat(string name, string id, int type, double range, double arc, double rate);
               void llSetAlpha(double alpha, int face);
+              void llSetAngularVelocity(LSL_Vector angvelocity, int local);
               void llSetBuoyancy(double buoyancy);
               void llSetCameraAtOffset(LSL_Vector offset);
               void llSetCameraEyeOffset(LSL_Vector offset);
@@ -357,11 +359,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
               void llSetParcelMusicURL(string url);
               void llSetPayPrice(int price, LSL_List quick_pay_buttons);
               void llSetPos(LSL_Vector pos);
+       LSL_Integer llSetRegionPos(LSL_Vector pos);
        LSL_Integer llSetPrimMediaParams(LSL_Integer face, LSL_List rules);
               void llSetPrimitiveParams(LSL_List rules);
               void llSetLinkPrimitiveParamsFast(int linknum, LSL_List rules);
               void llSetPrimURL(string url);
-       LSL_Integer llSetRegionPos(LSL_Vector pos);
               void llSetRemoteScriptAccessPin(int pin);
               void llSetRot(LSL_Rotation rot);
               void llSetScale(LSL_Vector scale);
@@ -381,6 +383,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
               void llSetVehicleRotationParam(int param, LSL_Rotation rot);
               void llSetVehicleType(int type);
               void llSetVehicleVectorParam(int param, LSL_Vector vec);
+              void llSetVelocity(LSL_Vector velocity, int local);
               void llShout(int channelID, string text);
          LSL_Float llSin(double f);
               void llSitTarget(LSL_Vector offset, LSL_Rotation rot);
@@ -424,9 +427,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         LSL_Vector llWind(LSL_Vector offset);
         LSL_String llXorBase64Strings(string str1, string str2);
         LSL_String llXorBase64StringsCorrect(string str1, string str2);
-              void print(string str);
+       LSL_Integer llGetLinkNumberOfSides(LSL_Integer link);
+              void llSetPhysicsMaterial(int material_bits, float material_gravity_modifier, float material_restitution, float material_friction, float material_density);
 
               void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules, string originFunc);
+              void llSetKeyframedMotion(LSL_List frames, LSL_List options);
           LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 51d0581..7eb347e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         // Avatar Info Commands
         string osGetAgentIP(string agent);
         LSL_List osGetAgents();
-
+        
         // Teleport commands
         void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
         void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs
new file mode 100644
index 0000000..4132dfa
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs
@@ -0,0 +1,71 @@
+/*
+ * 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.Runtime.Remoting.Lifetime;
+using System.Threading;
+using System.Reflection;
+using System.Collections;
+using System.Collections.Generic;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.ScriptEngine.Interfaces;
+using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces;
+using integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
+using vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
+using rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
+using key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
+using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
+using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
+using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
+using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
+
+namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
+{
+    public partial class ScriptBaseClass : MarshalByRefObject
+    {
+        public ICM_Api m_CM_Functions;
+
+        public void ApiTypeCM(IScriptApi api)
+        {
+            if (!(api is ICM_Api))
+                return;
+
+            m_CM_Functions = (ICM_Api)api;
+        }
+
+        public string cmDetectedCountry(int num)
+        {
+            return m_CM_Functions.cmDetectedCountry(num);
+        }
+
+        public string cmGetAgentCountry(key key)
+        {
+            return m_CM_Functions.cmGetAgentCountry(key);
+        }
+    }
+}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
index 9615315..943d7a2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics; //for [DebuggerNonUserCode]
 using System.Reflection;
 using System.Runtime.Remoting.Lifetime;
 using OpenSim.Region.ScriptEngine.Shared;
@@ -132,6 +133,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return (eventFlags);
         }
 
+        [DebuggerNonUserCode]
         public void ExecuteEvent(string state, string FunctionName, object[] args)
         {
             // IMPORTANT: Types and MemberInfo-derived objects require a LOT of memory.
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index bd66ba3..da3b31f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -56,7 +56,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int ACTIVE = 2;
         public const int PASSIVE = 4;
         public const int SCRIPTED = 8;
-        public const int OS_NPC = 0x01000000;
 
         public const int CONTROL_FWD = 1;
         public const int CONTROL_BACK = 2;
@@ -95,6 +94,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int AGENT_CROUCHING = 1024;
         public const int AGENT_BUSY = 2048;
         public const int AGENT_ALWAYS_RUN = 4096;
+        public const int AGENT_MALE = 8192;
 
         //Particle Systems
         public const int PSYS_PART_INTERP_COLOR_MASK = 1;
@@ -337,6 +337,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART
         public const int CHANGED_MEDIA = 2048;
         public const int CHANGED_ANIMATION = 16384;
+        public const int CHANGED_POSITION = 32768;
         public const int TYPE_INVALID = 0;
         public const int TYPE_INTEGER = 1;
         public const int TYPE_FLOAT = 2;
@@ -660,7 +661,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int PRIM_MEDIA_PERM_OWNER = 1;
         public const int PRIM_MEDIA_PERM_GROUP = 2;
         public const int PRIM_MEDIA_PERM_ANYONE = 4;
-        
+
         public const int PRIM_PHYSICS_SHAPE_TYPE = 30;
         public const int PRIM_PHYSICS_SHAPE_PRIM = 0;
         public const int PRIM_PHYSICS_SHAPE_CONVEX = 2;
@@ -671,7 +672,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int FRICTION = 2;
         public const int RESTITUTION = 4;
         public const int GRAVITY_MULTIPLIER = 8;
-
+        
         // extra constants for llSetPrimMediaParams
         public static readonly LSLInteger LSL_STATUS_OK = new LSLInteger(0);
         public static readonly LSLInteger LSL_STATUS_MALFORMED_PARAMS = new LSLInteger(1000);
@@ -743,7 +744,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
 
         public static readonly LSLInteger RCERR_UNKNOWN = -1;        
         public static readonly LSLInteger RCERR_SIM_PERF_LOW = -2;
-        public static readonly LSLInteger RCERR_CAST_TIME_EXCEEDED = 3;
+        public static readonly LSLInteger RCERR_CAST_TIME_EXCEEDED = -3;
+
+        public const int KFM_MODE = 1;
+        public const int KFM_LOOP = 1;
+        public const int KFM_REVERSE = 3;
+        public const int KFM_FORWARD = 0;
+        public const int KFM_PING_PONG = 2;
+        public const int KFM_DATA = 2;
+        public const int KFM_TRANSLATION = 2;
+        public const int KFM_ROTATION = 1;
+        public const int KFM_COMMAND = 0;
+        public const int KFM_CMD_PLAY = 0;
+        public const int KFM_CMD_STOP = 1;
+        public const int KFM_CMD_PAUSE = 2;
 
         /// <summary>
         /// process name parameter as regex
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index c7a7cf6..8ecc4f8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Diagnostics; //for [DebuggerNonUserCode]
 using System.Runtime.Remoting.Lifetime;
 using System.Threading;
 using System.Reflection;
@@ -314,6 +315,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel);
         }
 
+        [DebuggerNonUserCode]
         public void llDie()
         {
             m_LSL_Functions.llDie();
@@ -474,6 +476,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_LSL_Functions.llGetFreeMemory();
         }
 
+        public LSL_Integer llGetUsedMemory()
+        {
+            return m_LSL_Functions.llGetUsedMemory();
+        }
+
         public LSL_Integer llGetFreeURLs()
         {
             return m_LSL_Functions.llGetFreeURLs();
@@ -579,6 +586,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_LSL_Functions.llGetMass();
         }
 
+        public LSL_Float llGetMassMKS()
+        {
+            return m_LSL_Functions.llGetMassMKS();
+        }
+
         public LSL_Integer llGetMemoryLimit()
         {
             return m_LSL_Functions.llGetMemoryLimit();
@@ -844,11 +856,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_LSL_Functions.llGetUnixTime();
         }
 
-        public LSL_Integer llGetUsedMemory()
-        {
-            return m_LSL_Functions.llGetUsedMemory();
-        }
-
         public LSL_Vector llGetVel()
         {
             return m_LSL_Functions.llGetVel();
@@ -869,9 +876,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_LSL_Functions.llGiveInventoryList(destination, category, inventory);
         }
 
-        public void llGiveMoney(string destination, int amount)
+        public LSL_Integer llGiveMoney(string destination, int amount)
         {
-            m_LSL_Functions.llGiveMoney(destination, amount);
+            return m_LSL_Functions.llGiveMoney(destination, amount);
         }
 
         public LSL_String llTransferLindenDollars(string destination, int amount)
@@ -1488,6 +1495,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_LSL_Functions.llSetAlpha(alpha, face);
         }
 
+        public void llSetAngularVelocity(LSL_Vector angvelocity, int local)
+        {
+            m_LSL_Functions.llSetAngularVelocity(angvelocity, local);
+        }
+
         public void llSetBuoyancy(double buoyancy)
         {
             m_LSL_Functions.llSetBuoyancy(buoyancy);
@@ -1613,6 +1625,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_LSL_Functions.llSetPos(pos);
         }
 
+        public LSL_Integer llSetRegionPos(LSL_Vector pos)
+        {
+            return m_LSL_Functions.llSetRegionPos(pos);
+        }
+
         public void llSetPrimitiveParams(LSL_List rules)
         {
             m_LSL_Functions.llSetPrimitiveParams(rules);
@@ -1628,11 +1645,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_LSL_Functions.llSetPrimURL(url);
         }
 
-        public LSL_Integer llSetRegionPos(LSL_Vector pos)
-        {
-            return m_LSL_Functions.llSetRegionPos(pos);
-        }
-
         public void llSetRemoteScriptAccessPin(int pin)
         {
             m_LSL_Functions.llSetRemoteScriptAccessPin(pin);
@@ -1728,6 +1740,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_LSL_Functions.llSetVehicleVectorParam(param, vec);
         }
 
+        public void llSetVelocity(LSL_Vector velocity, int local)
+        {
+            m_LSL_Functions.llSetVelocity(velocity, local);
+        }
+
         public void llShout(int channelID, string text)
         {
             m_LSL_Functions.llShout(channelID, text);
@@ -1978,9 +1995,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_LSL_Functions.llClearLinkMedia(link, face);
         }
 
-        public void print(string str)
+        public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
+        {
+            return m_LSL_Functions.llGetLinkNumberOfSides(link);
+        }
+
+        public void llSetKeyframedMotion(LSL_List frames, LSL_List options)
+        {
+            m_LSL_Functions.llSetKeyframedMotion(frames, options);
+        }
+
+        public void llSetPhysicsMaterial(int material_bits, float material_gravity_modifier, float material_restitution, float material_friction, float material_density)
         {
-            m_LSL_Functions.print(str);
+            m_LSL_Functions.llSetPhysicsMaterial(material_bits, material_gravity_modifier, material_restitution, material_friction, material_density);
         }
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
index 143b497..2e27f16 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LS_Stub.cs
@@ -72,9 +72,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         {
             return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target);
         }
+
         public void lsClearWindlightScene()
         {
             m_LS_Functions.lsClearWindlightScene();
         }
+
+        public LSL_List cmGetWindlightScene(LSL_List rules)
+        {
+            return m_LS_Functions.lsGetWindlightScene(rules);
+        }
+
+        public int cmSetWindlightScene(LSL_List rules)
+        {
+            return m_LS_Functions.lsSetWindlightScene(rules);
+        }
+
+        public int cmSetWindlightSceneTargeted(LSL_List rules, key target)
+        {
+            return m_LS_Functions.lsSetWindlightSceneTargeted(rules, target);
+        }
+
+        public void cmClearWindlightScene()
+        {
+            m_LS_Functions.lsClearWindlightScene();
+        }
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
index edbbc2a..b138da3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
@@ -33,6 +33,7 @@ using System.Threading;
 using System.Reflection;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics; //for [DebuggerNonUserCode]
 using OpenSim.Region.ScriptEngine.Interfaces;
 using OpenSim.Region.ScriptEngine.Shared;
 using OpenSim.Region.ScriptEngine.Shared.Api.Runtime;
@@ -90,6 +91,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return (int)m_Executor.GetStateEventFlags(state);
         }
 
+        [DebuggerNonUserCode]
         public void ExecuteEvent(string state, string FunctionName, object[] args)
         {
             m_Executor.ExecuteEvent(state, FunctionName, args);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
index e02d35e..e44a106 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
@@ -35,6 +35,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.CoreModules;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
 using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Region.ScriptEngine.Shared
@@ -120,6 +121,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
             Type = 0;
             Velocity = new LSL_Types.Vector3();
             initializeSurfaceTouch();
+            Country = String.Empty;
         }
 
         public UUID Key;
@@ -151,6 +153,8 @@ namespace OpenSim.Region.ScriptEngine.Shared
         private int touchFace;
         public int TouchFace { get { return touchFace; } }
 
+        public string Country;
+
         // This can be done in two places including the constructor
         // so be carefull what gets added here
         private void initializeSurfaceTouch()
@@ -198,6 +202,10 @@ namespace OpenSim.Region.ScriptEngine.Shared
                     return;
 
                 Name = presence.Firstname + " " + presence.Lastname;
+                UserAccount account = scene.UserAccountService.GetUserAccount(scene.RegionInfo.ScopeID, Key);
+                if (account != null)
+                    Country = account.UserCountry;
+
                 Owner = Key;
                 Position = new LSL_Types.Vector3(presence.AbsolutePosition);
                 Rotation = new LSL_Types.Quaternion(
@@ -207,22 +215,27 @@ namespace OpenSim.Region.ScriptEngine.Shared
                         presence.Rotation.W);
                 Velocity = new LSL_Types.Vector3(presence.Velocity);
 
-                if (presence.PresenceType != PresenceType.Npc)
-                {
-                    Type = AGENT;
-                }
-                else
-                {
-                    Type = OS_NPC;
-
-                    INPCModule npcModule = scene.RequestModuleInterface<INPCModule>();
-                    INPC npcData = npcModule.GetNPC(presence.UUID, presence.Scene);
-
-                    if (npcData.SenseAsAgent)
-                    {
-                        Type |= AGENT;
-                    }
-                }
+                Type = 0x01; // Avatar
+                if (presence.PresenceType == PresenceType.Npc)
+                    Type = 0x20;
+
+                // Cope Impl. We don't use OS_NPC.
+                //if (presence.PresenceType != PresenceType.Npc)
+                //{
+                //    Type = AGENT;
+                //}
+                //else
+                //{
+                //    Type = OS_NPC;
+
+                //    INPCModule npcModule = scene.RequestModuleInterface<INPCModule>();
+                //    INPC npcData = npcModule.GetNPC(presence.UUID, presence.Scene);
+
+                //    if (npcData.SenseAsAgent)
+                //    {
+                //        Type |= AGENT;
+                //    }
+                //}
 
                 if (presence.Velocity != Vector3.Zero)
                     Type |= ACTIVE;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index bf19a42..26850c4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -30,6 +30,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using System.Diagnostics; //for [DebuggerNonUserCode]
 using System.Reflection;
 using System.Runtime.Remoting;
 using System.Runtime.Remoting.Lifetime;
@@ -165,13 +166,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
         public UUID ItemID { get; private set; }
 
-        public UUID ObjectID { get { return Part.UUID; } }
+        public UUID ObjectID { get; private set; }
 
-        public uint LocalID { get { return Part.LocalId; } }
+        public uint LocalID { get; private set; }
 
-        public UUID RootObjectID { get { return Part.ParentGroup.UUID; } }
+        public UUID RootObjectID { get; private set; }
 
-        public uint RootLocalID { get { return Part.ParentGroup.LocalId; } }
+        public uint RootLocalID { get; private set; }
 
         public UUID AssetID { get; private set; }
 
@@ -235,8 +236,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             StartParam = startParam;
             m_MaxScriptQueue = maxScriptQueue;
             m_postOnRez = postOnRez;
-            m_AttachedAvatar = Part.ParentGroup.AttachedAvatar;
-            m_RegionID = Part.ParentGroup.Scene.RegionInfo.RegionID;
+            m_AttachedAvatar = part.ParentGroup.AttachedAvatar;
+            m_RegionID = part.ParentGroup.Scene.RegionInfo.RegionID;
 
             if (Engine.Config.GetString("ScriptStopStrategy", "abort") == "co-op")
             {
@@ -481,27 +482,34 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                     PostEvent(new EventParams("attach",
                         new object[] { new LSL_Types.LSLString(m_AttachedAvatar.ToString()) }, new DetectParams[0]));
                 }
+
             }
         }
 
         private void ReleaseControls()
         {
-            int permsMask;
-            UUID permsGranter;
-            lock (Part.TaskInventory)
+            SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID);
+            
+            if (part != null)
             {
-                if (!Part.TaskInventory.ContainsKey(ItemID))
+                int permsMask;
+                UUID permsGranter;
+                part.TaskInventory.LockItemsForRead(true);
+                if (!part.TaskInventory.ContainsKey(ItemID))
+                {
+                    part.TaskInventory.LockItemsForRead(false);
                     return;
+                }
+                permsGranter = part.TaskInventory[ItemID].PermsGranter;
+                permsMask = part.TaskInventory[ItemID].PermsMask;
+                part.TaskInventory.LockItemsForRead(false);
 
-                permsGranter = Part.TaskInventory[ItemID].PermsGranter;
-                permsMask = Part.TaskInventory[ItemID].PermsMask;
-            }
-
-            if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0)
-            {
-                ScenePresence presence = Engine.World.GetScenePresence(permsGranter);
-                if (presence != null)
-                    presence.UnRegisterControlEventsToScript(LocalID, ItemID);
+                if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0)
+                {
+                    ScenePresence presence = Engine.World.GetScenePresence(permsGranter);
+                    if (presence != null)
+                        presence.UnRegisterControlEventsToScript(LocalID, ItemID);
+                }
             }
         }
 
@@ -650,6 +658,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             return true;
         }
 
+        [DebuggerNonUserCode] //Prevents the debugger from farting in this function
         public void SetState(string state)
         {
             if (state == State)
@@ -661,7 +670,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                                        new DetectParams[0]));
             PostEvent(new EventParams("state_entry", new Object[0],
                                        new DetectParams[0]));
-
+            
             throw new EventAbortException();
         }
 
@@ -751,57 +760,60 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         /// <returns></returns>
         public object EventProcessor()
         {
+            EventParams data = null;
             // We check here as the thread stopping this instance from running may itself hold the m_Script lock.
             if (!Running)
                 return 0;
 
-            lock (m_Script)
-            {
 //                m_log.DebugFormat("[XEngine]: EventProcessor() invoked for {0}.{1}", PrimName, ScriptName);
 
-                if (Suspended)
-                    return 0;
-
-                EventParams data = null;
+            if (Suspended)
+                return 0;
 
-                lock (EventQueue)
+            lock (EventQueue)
+            {
+                data = (EventParams) EventQueue.Dequeue();
+                if (data == null) // Shouldn't happen
                 {
-                    data = (EventParams)EventQueue.Dequeue();
-                    if (data == null) // Shouldn't happen
+                    if (EventQueue.Count > 0 && Running && !ShuttingDown)
                     {
-                        if (EventQueue.Count > 0 && Running && !ShuttingDown)
-                        {
-                            m_CurrentWorkItem = Engine.QueueEventHandler(this);
-                        }
-                        else
-                        {
-                            m_CurrentWorkItem = null;
-                        }
-                        return 0;
+                        m_CurrentWorkItem = Engine.QueueEventHandler(this);
                     }
-
-                    if (data.EventName == "timer")
-                        m_TimerQueued = false;
-                    if (data.EventName == "control")
+                    else
                     {
-                        if (m_ControlEventsInQueue > 0)
-                            m_ControlEventsInQueue--;
+                        m_CurrentWorkItem = null;
                     }
-                    if (data.EventName == "collision")
-                        m_CollisionInQueue = false;
+                    return 0;
                 }
 
+                if (data.EventName == "timer")
+                    m_TimerQueued = false;
+                if (data.EventName == "control")
+                {
+                    if (m_ControlEventsInQueue > 0)
+                        m_ControlEventsInQueue--;
+                }
+                if (data.EventName == "collision")
+                    m_CollisionInQueue = false;
+            }
+
+            lock(m_Script)
+            {
+                
+//                m_log.DebugFormat("[XEngine]: Processing event {0} for {1}", data.EventName, this);
+                SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID);
+
                 if (DebugLevel >= 2)
                     m_log.DebugFormat(
                         "[SCRIPT INSTANCE]: Processing event {0} for {1}/{2}({3})/{4}({5}) @ {6}/{7}", 
                         data.EventName, 
                         ScriptName, 
-                        Part.Name, 
-                        Part.LocalId, 
-                        Part.ParentGroup.Name, 
-                        Part.ParentGroup.UUID, 
-                        Part.AbsolutePosition, 
-                        Part.ParentGroup.Scene.Name);
+                        part.Name, 
+                        part.LocalId, 
+                        part.ParentGroup.Name, 
+                        part.ParentGroup.UUID, 
+                        part.AbsolutePosition, 
+                        part.ParentGroup.Scene.Name);
 
                 m_DetectParams = data.DetectParams;
 
@@ -814,17 +826,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                             "[SCRIPT INSTANCE]: Changing state to {0} for {1}/{2}({3})/{4}({5}) @ {6}/{7}", 
                             State, 
                             ScriptName, 
-                            Part.Name, 
-                            Part.LocalId, 
-                            Part.ParentGroup.Name, 
-                            Part.ParentGroup.UUID, 
-                            Part.AbsolutePosition, 
-                            Part.ParentGroup.Scene.Name);
+                            part.Name, 
+                            part.LocalId, 
+                            part.ParentGroup.Name, 
+                            part.ParentGroup.UUID, 
+                            part.AbsolutePosition, 
+                            part.ParentGroup.Scene.Name);
 
                     AsyncCommandManager.RemoveScript(Engine,
                         LocalID, ItemID);
 
-                    Part.SetScriptEvents(ItemID, (int)m_Script.GetStateEventFlags(State));
+                    if (part != null)
+                    {
+                        part.SetScriptEvents(ItemID,
+                                             (int)m_Script.GetStateEventFlags(State));
+                    }
                 }
                 else
                 {
@@ -887,17 +903,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                                         text = text.Substring(0, 1000);
                                     Engine.World.SimChat(Utils.StringToBytes(text),
                                                            ChatTypeEnum.DebugChannel, 2147483647,
-                                                           Part.AbsolutePosition,
-                                                           Part.Name, Part.UUID, false);
+                                                           part.AbsolutePosition,
+                                                           part.Name, part.UUID, false);
 
 
                                     m_log.DebugFormat(
                                         "[SCRIPT INSTANCE]: Runtime error in script {0}, part {1} {2} at {3} in {4}, displayed error {5}, actual exception {6}", 
                                         ScriptName, 
                                         PrimName, 
-                                        Part.UUID,
-                                        Part.AbsolutePosition,
-                                        Part.ParentGroup.Scene.Name, 
+                                        part.UUID,
+                                        part.AbsolutePosition,
+                                        part.ParentGroup.Scene.Name, 
                                         text.Replace("\n", "\\n"), 
                                         e.InnerException);
                                 }
@@ -917,12 +933,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                             else if ((e is TargetInvocationException) && (e.InnerException is SelfDeleteException))
                             {
                                 m_InSelfDelete = true;
-                                Engine.World.DeleteSceneObject(Part.ParentGroup, false);
+                                if (part != null)
+                                    Engine.World.DeleteSceneObject(part.ParentGroup, false);
                             }
                             else if ((e is TargetInvocationException) && (e.InnerException is ScriptDeleteException))
                             {
                                 m_InSelfDelete = true;
-                                Part.Inventory.RemoveInventoryItem(ItemID);
+                                if (part != null)
+                                    part.Inventory.RemoveInventoryItem(ItemID);
                             }
                             else if ((e is TargetInvocationException) && (e.InnerException is ScriptCoopStopException))
                             {
@@ -976,14 +994,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             ReleaseControls();
 
             Stop(timeout);
-            Part.Inventory.GetInventoryItem(ItemID).PermsMask = 0;
-            Part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero;
+            SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID);
+            part.Inventory.GetInventoryItem(ItemID).PermsMask = 0;
+            part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero;
+            part.CollisionSound = UUID.Zero;
             AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID);
             EventQueue.Clear();
             m_Script.ResetVars();
             State = "default";
 
-            Part.SetScriptEvents(ItemID,
+            part.SetScriptEvents(ItemID,
                                  (int)m_Script.GetStateEventFlags(State));
             if (running)
                 Start();
@@ -992,6 +1012,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                     new Object[0], new DetectParams[0]));
         }
 
+        [DebuggerNonUserCode] //Stops the VS debugger from farting in this function
         public void ApiResetScript()
         {
             // bool running = Running;
@@ -1000,15 +1021,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             ReleaseControls();
 
             m_Script.ResetVars();
-            Part.Inventory.GetInventoryItem(ItemID).PermsMask = 0;
-            Part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero;
+            SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID);
+            part.Inventory.GetInventoryItem(ItemID).PermsMask = 0;
+            part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero;
+            part.CollisionSound = UUID.Zero;
             AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID);
 
             EventQueue.Clear();
             m_Script.ResetVars();
             State = "default";
 
-            Part.SetScriptEvents(ItemID,
+            part.SetScriptEvents(ItemID,
                                  (int)m_Script.GetStateEventFlags(State));
 
             if (m_CurrentEvent != "state_entry")
@@ -1022,10 +1045,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
         public Dictionary<string, object> GetVars()
         {
-            if (m_Script != null)
-                return m_Script.GetVars();
-            else
-                return new Dictionary<string, object>();
+            return m_Script.GetVars();
         }
 
         public void SetVars(Dictionary<string, object> vars)
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 44fdd1a..2e61fb8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -102,19 +102,19 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
             public override string ToString()
             {
-                string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000}>", x, y, z);
+                string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", x, y, z);
                 return s;
             }
 
             public static explicit operator LSLString(Vector3 vec)
             {
-                string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000}>", vec.x, vec.y, vec.z);
+                string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", vec.x, vec.y, vec.z);
                 return new LSLString(s);
             }
 
             public static explicit operator string(Vector3 vec)
             {
-                string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000}>", vec.x, vec.y, vec.z);
+                string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}>", vec.x, vec.y, vec.z);
                 return s;
             }
 
@@ -389,19 +389,19 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
             public override string ToString()
             {
-                string st=String.Format(Culture.FormatProvider, "<{0:0.000000},{1:0.000000},{2:0.000000},{3:0.000000}>", x, y, z, s);
+                string st=String.Format(Culture.FormatProvider, "<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", x, y, z, s);
                 return st;
             }
 
             public static explicit operator string(Quaternion r)
             {
-                string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000},{3:0.000000}>", r.x, r.y, r.z, r.s);
+                string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", r.x, r.y, r.z, r.s);
                 return s;
             }
 
             public static explicit operator LSLString(Quaternion r)
             {
-                string s=String.Format("<{0:0.000000},{1:0.000000},{2:0.000000},{3:0.000000}>", r.x, r.y, r.z, r.s);
+                string s=String.Format("<{0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000}>", r.x, r.y, r.z, r.s);
                 return new LSLString(s);
             }
 
@@ -521,6 +521,8 @@ namespace OpenSim.Region.ScriptEngine.Shared
                             size += 64;
                         else if (o is int)
                             size += 4;
+                        else if (o is uint)
+                            size += 4;
                         else if (o is string)
                             size += ((string)o).Length;
                         else if (o is float)
@@ -711,24 +713,16 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
             public static bool operator ==(list a, list b)
             {
-                int la = -1;
-                int lb = -1;
-                try { la = a.Length; }
-                catch (NullReferenceException) { }
-                try { lb = b.Length; }
-                catch (NullReferenceException) { }
+                int la = a.Length;
+                int lb = b.Length;
 
                 return la == lb;
             }
 
             public static bool operator !=(list a, list b)
             {
-                int la = -1;
-                int lb = -1;
-                try { la = a.Length; }
-                catch (NullReferenceException) { }
-                try {lb = b.Length;}
-                catch (NullReferenceException) { }
+                int la = a.Length;
+                int lb = b.Length;
 
                 return la != lb;
             }
@@ -962,7 +956,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
                     ret = Math.Sign(Quaternion.Mag(l) - Quaternion.Mag(r));
                 }
 
-                if (ascending == 0)
+                if (ascending != 1)
                 {
                     ret = 0 - ret;
                 }
@@ -995,6 +989,9 @@ namespace OpenSim.Region.ScriptEngine.Shared
                     stride = 1;
                 }
 
+                if ((Data.Length % stride) != 0)
+                    return new list(ret);
+
                 // we can optimize here in the case where stride == 1 and the list
                 // consists of homogeneous types
 
@@ -1014,7 +1011,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
                     if (homogeneous)
                     {
                         Array.Sort(ret, new HomogeneousComparer());
-                        if (ascending == 0)
+                        if (ascending != 1)
                         {
                             Array.Reverse(ret);
                         }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 8931be4..17243ab 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics; //for [DebuggerNonUserCode]
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -148,6 +149,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         private Dictionary<UUID, IScriptInstance> m_Scripts =
                 new Dictionary<UUID, IScriptInstance>();
 
+        private OpenMetaverse.ReaderWriterLockSlim m_scriptsLock = new OpenMetaverse.ReaderWriterLockSlim();
+
         // Maps the asset ID to the assembly
 
         private Dictionary<UUID, string> m_Assemblies =
@@ -170,6 +173,71 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         IWorkItemResult m_CurrentCompile = null;
         private Dictionary<UUID, int> m_CompileDict = new Dictionary<UUID, int>();
 
+        private void lockScriptsForRead(bool locked)
+        {
+            if (locked)
+            {
+                if (m_scriptsLock.RecursiveReadCount > 0)
+                {
+                    m_log.Error("[XEngine.m_Scripts] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
+                    m_scriptsLock.ExitReadLock();
+                }
+                if (m_scriptsLock.RecursiveWriteCount > 0)
+                {
+                    m_log.Error("[XEngine.m_Scripts] Recursive write lock requested. This should not happen and means something needs to be fixed.");
+                    m_scriptsLock.ExitWriteLock();
+                }
+
+                while (!m_scriptsLock.TryEnterReadLock(60000))
+                {
+                    m_log.Error("[XEngine.m_Scripts] Thread lock detected while trying to aquire READ lock of m_scripts in XEngine. I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
+                    if (m_scriptsLock.IsWriteLockHeld)
+                    {
+                        m_scriptsLock = new OpenMetaverse.ReaderWriterLockSlim();
+                    }
+                }
+            }
+            else
+            {
+                if (m_scriptsLock.RecursiveReadCount > 0)
+                {
+                    m_scriptsLock.ExitReadLock();
+                }
+            }
+        }
+        private void lockScriptsForWrite(bool locked)
+        {
+            if (locked)
+            {
+                if (m_scriptsLock.RecursiveReadCount > 0)
+                {
+                    m_log.Error("[XEngine.m_Scripts] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
+                    m_scriptsLock.ExitReadLock();
+                }
+                if (m_scriptsLock.RecursiveWriteCount > 0)
+                {
+                    m_log.Error("[XEngine.m_Scripts] Recursive write lock requested. This should not happen and means something needs to be fixed.");
+                    m_scriptsLock.ExitWriteLock();
+                }
+
+                while (!m_scriptsLock.TryEnterWriteLock(60000))
+                {
+                    m_log.Error("[XEngine.m_Scripts] Thread lock detected while trying to aquire WRITE lock of m_scripts in XEngine. I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
+                    if (m_scriptsLock.IsWriteLockHeld)
+                    {
+                        m_scriptsLock = new OpenMetaverse.ReaderWriterLockSlim();
+                    }
+                }
+            }
+            else
+            {
+                if (m_scriptsLock.RecursiveWriteCount > 0)
+                {
+                    m_scriptsLock.ExitWriteLock();
+                }
+            }
+        }
+
         private ScriptEngineConsoleCommands m_consoleCommands;
 
         public string ScriptEngineName
@@ -699,64 +767,69 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         {
             if (!m_Enabled)
                 return;
+            lockScriptsForRead(true);
 
-            lock (m_Scripts)
-            {
-                m_log.InfoFormat(
-                    "[XEngine]: Shutting down {0} scripts in {1}", m_Scripts.Count, m_Scene.RegionInfo.RegionName);
+            List<IScriptInstance> instancesToDel = new List<IScriptInstance>(m_Scripts.Values);
 
-                foreach (IScriptInstance instance in m_Scripts.Values)
+//            foreach (IScriptInstance instance in m_Scripts.Values)
+            foreach (IScriptInstance instance in instancesToDel)
+            {
+                // Force a final state save
+                //
+                if (m_Assemblies.ContainsKey(instance.AssetID))
                 {
-                    // Force a final state save
-                    //
-                    if (m_Assemblies.ContainsKey(instance.AssetID))
-                    {
-                        string assembly = m_Assemblies[instance.AssetID];
+                    string assembly = m_Assemblies[instance.AssetID];
 
-                        try
-                        {
-                            instance.SaveState(assembly);
-                        }
-                        catch (Exception e)
-                        {
-                            m_log.Error(
-                                string.Format(
-                                    "[XEngine]: Failed final state save for script {0}.{1}, item UUID {2}, prim UUID {3} in {4}.  Exception ",
-                                    instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, World.Name)
-                                , e);
-                        }
+                    try
+                    {
+                        instance.SaveState(assembly);
                     }
+                    catch (Exception e)
+                    {
+                        m_log.Error(
+                            string.Format(
+                                "[XEngine]: Failed final state save for script {0}.{1}, item UUID {2}, prim UUID {3} in {4}.  Exception ",
+                                instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, World.Name)
+                            , e);
+                    }
+                }
 
-                    // Clear the event queue and abort the instance thread
-                    //
-                    instance.ClearQueue();
-                    instance.Stop(0);
+                // Clear the event queue and abort the instance thread
+                //
+                instance.ClearQueue();
+                instance.Stop(0);
 
-                    // Release events, timer, etc
-                    //
-                    instance.DestroyScriptInstance();
-
-                    // Unload scripts and app domains.
-                    // Must be done explicitly because they have infinite
-                    // lifetime.
-                    // However, don't bother to do this if the simulator is shutting
-                    // down since it takes a long time with many scripts.
-                    if (!m_SimulatorShuttingDown)
+                // Release events, timer, etc
+                //
+                instance.DestroyScriptInstance();
+
+                // Unload scripts and app domains
+                // Must be done explicitly because they have infinite
+                // lifetime
+                //
+//                if (!m_SimulatorShuttingDown)
+                {
+                    m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
+                    if (m_DomainScripts[instance.AppDomain].Count == 0)
                     {
-                        m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
-                        if (m_DomainScripts[instance.AppDomain].Count == 0)
-                        {
-                            m_DomainScripts.Remove(instance.AppDomain);
-                            UnloadAppDomain(instance.AppDomain);
-                        }
+                        m_DomainScripts.Remove(instance.AppDomain);
+                        UnloadAppDomain(instance.AppDomain);
                     }
                 }
 
-                m_Scripts.Clear();
-                m_PrimObjects.Clear();
-                m_Assemblies.Clear();
-                m_DomainScripts.Clear();
-            }
+//                m_Scripts.Clear();
+//                m_PrimObjects.Clear();
+//                m_Assemblies.Clear();
+//                m_DomainScripts.Clear();
+            }
+            lockScriptsForRead(false);
+            lockScriptsForWrite(true);
+            m_Scripts.Clear();
+            lockScriptsForWrite(false);
+            m_PrimObjects.Clear();
+            m_Assemblies.Clear();
+            m_DomainScripts.Clear();
+           
             lock (m_ScriptEngines)
             {
                 m_ScriptEngines.Remove(this);
@@ -825,22 +898,20 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
             List<IScriptInstance> instances = new List<IScriptInstance>();
 
-            lock (m_Scripts)
-            {
-                foreach (IScriptInstance instance in m_Scripts.Values)
+            lockScriptsForRead(true);
+                 foreach (IScriptInstance instance in m_Scripts.Values)
                     instances.Add(instance);
-            }
+            lockScriptsForRead(false);
 
             foreach (IScriptInstance i in instances)
             {
                 string assembly = String.Empty;
 
-                lock (m_Scripts)
-                {
+                
                     if (!m_Assemblies.ContainsKey(i.AssetID))
                         continue;
                     assembly = m_Assemblies[i.AssetID];
-                }
+                
 
                 try
                 {
@@ -1244,97 +1315,93 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             }
 
             ScriptInstance instance = null;
-            lock (m_Scripts)
+            // Create the object record
+            lockScriptsForRead(true);
+            if ((!m_Scripts.ContainsKey(itemID)) ||
+                (m_Scripts[itemID].AssetID != assetID))
             {
-                // Create the object record
-                if ((!m_Scripts.ContainsKey(itemID)) ||
-                    (m_Scripts[itemID].AssetID != assetID))
-                {
-                    UUID appDomain = assetID;
+                lockScriptsForRead(false);
 
-                    if (part.ParentGroup.IsAttachment)
-                        appDomain = part.ParentGroup.RootPart.UUID;
+                UUID appDomain = assetID;
 
-                    if (!m_AppDomains.ContainsKey(appDomain))
-                    {
-                        try
-                        {
-                            AppDomainSetup appSetup = new AppDomainSetup();
-                            appSetup.PrivateBinPath = Path.Combine(
-                                    m_ScriptEnginesPath,
-                                    m_Scene.RegionInfo.RegionID.ToString());
+                if (part.ParentGroup.IsAttachment)
+                    appDomain = part.ParentGroup.RootPart.UUID;
 
-                            Evidence baseEvidence = AppDomain.CurrentDomain.Evidence;
-                            Evidence evidence = new Evidence(baseEvidence);
+                if (!m_AppDomains.ContainsKey(appDomain))
+                {
+                    try
+                    {
+                        AppDomainSetup appSetup = new AppDomainSetup();
+                        appSetup.PrivateBinPath = Path.Combine(
+                                m_ScriptEnginesPath,
+                                m_Scene.RegionInfo.RegionID.ToString());
 
-                            AppDomain sandbox;
-                            if (m_AppDomainLoading)
-                            {
-                                sandbox = AppDomain.CreateDomain(
-                                                m_Scene.RegionInfo.RegionID.ToString(),
-                                                evidence, appSetup);
-                                sandbox.AssemblyResolve +=
-                                    new ResolveEventHandler(
-                                        AssemblyResolver.OnAssemblyResolve);
-                            }
-                            else
-                            {
-                                sandbox = AppDomain.CurrentDomain;
-                            }
-                            
-                            //PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel();
-                            //AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition();
-                            //PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet");
-                            //PolicyStatement sandboxPolicyStatement = new PolicyStatement(sandboxPermissionSet);
-                            //CodeGroup sandboxCodeGroup = new UnionCodeGroup(sandboxMembershipCondition, sandboxPolicyStatement);
-                            //sandboxPolicy.RootCodeGroup = sandboxCodeGroup;
-                            //sandbox.SetAppDomainPolicy(sandboxPolicy);
-                            
-                            m_AppDomains[appDomain] = sandbox;
+                        Evidence baseEvidence = AppDomain.CurrentDomain.Evidence;
+                        Evidence evidence = new Evidence(baseEvidence);
 
-                            m_DomainScripts[appDomain] = new List<UUID>();
+                        AppDomain sandbox;
+                        if (m_AppDomainLoading)
+                        {
+                            sandbox = AppDomain.CreateDomain(
+                                            m_Scene.RegionInfo.RegionID.ToString(),
+                                            evidence, appSetup);
+                            m_AppDomains[appDomain].AssemblyResolve +=
+                                new ResolveEventHandler(
+                                    AssemblyResolver.OnAssemblyResolve);
                         }
-                        catch (Exception e)
+                        else
                         {
-                            m_log.ErrorFormat("[XEngine] Exception creating app domain:\n {0}", e.ToString());
-                            m_ScriptErrorMessage += "Exception creating app domain:\n";
-                            m_ScriptFailCount++;
-                            lock (m_AddingAssemblies) 
-                            {
-                                m_AddingAssemblies[assembly]--;
-                            }
-                            return false;
+                            sandbox = AppDomain.CurrentDomain;
                         }
-                    }
-                    m_DomainScripts[appDomain].Add(itemID);
-
-                    instance = new ScriptInstance(this, part,
-                                                  item,
-                                                  startParam, postOnRez,
-                                                  m_MaxScriptQueue);
 
                     if (!instance.Load(m_AppDomains[appDomain], assembly, stateSource))
                         return false;
 
-//                    if (DebugLevel >= 1)
-//                    m_log.DebugFormat(
-//                        "[XEngine] Loaded script {0}.{1}, item UUID {2}, prim UUID {3} @ {4}.{5}",
-//                        part.ParentGroup.RootPart.Name, item.Name, itemID, part.UUID,
-//                        part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName);
+                        m_AppDomains[appDomain] = sandbox;
 
-                    if (presence != null)
+                        m_DomainScripts[appDomain] = new List<UUID>();
+                    }
+                    catch (Exception e)
                     {
-                        ShowScriptSaveResponse(item.OwnerID,
-                                assetID, "Compile successful", true);
+                        m_log.ErrorFormat("[XEngine] Exception creating app domain:\n {0}", e.ToString());
+                        m_ScriptErrorMessage += "Exception creating app domain:\n";
+                        m_ScriptFailCount++;
+                        lock (m_AddingAssemblies)
+                        {
+                            m_AddingAssemblies[assembly]--;
+                        }
+                        return false;
                     }
+                }
+                m_DomainScripts[appDomain].Add(itemID);
+
+                instance = new ScriptInstance(this, part,
+                                              item,
+                                              startParam, postOnRez,
+                                              m_MaxScriptQueue);
 
-                    instance.AppDomain = appDomain;
-                    instance.LineMap = linemap;
+                instance.Load(m_AppDomains[appDomain], assembly, stateSource);
+//                m_log.DebugFormat(
+//                        "[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}.{5}",
+//                        part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID, 
+//                        part.ParentGroup.RootPart.AbsolutePosition, part.ParentGroup.Scene.RegionInfo.RegionName);
 
-                    m_Scripts[itemID] = instance;
+                if (presence != null)
+                {
+                    ShowScriptSaveResponse(item.OwnerID,
+                            assetID, "Compile successful", true);
                 }
-            }
 
+                instance.AppDomain = appDomain;
+                instance.LineMap = linemap;
+                lockScriptsForWrite(true);
+                m_Scripts[itemID] = instance;
+                lockScriptsForWrite(false);
+            }
+            else
+            {
+                lockScriptsForRead(false);
+            }
             lock (m_PrimObjects)
             {
                 if (!m_PrimObjects.ContainsKey(localID))
@@ -1352,7 +1419,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 m_AddingAssemblies[assembly]--;
             }
 
-            if (instance != null) 
+            if (instance!=null) 
                 instance.Init();
 
             bool runIt;
@@ -1375,18 +1442,28 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     m_CompileDict.Remove(itemID);
             }
 
-            IScriptInstance instance = null;
-
-            lock (m_Scripts)
+            lockScriptsForRead(true);
+            // Do we even have it?
+            if (!m_Scripts.ContainsKey(itemID))
             {
                 // Do we even have it?
                 if (!m_Scripts.ContainsKey(itemID))
                     return;
 
-                instance = m_Scripts[itemID];
+                lockScriptsForRead(false);
+                lockScriptsForWrite(true);
                 m_Scripts.Remove(itemID);
+                lockScriptsForWrite(false);
+
+                return;
             }
+             
 
+            IScriptInstance instance=m_Scripts[itemID];
+            lockScriptsForRead(false);
+            lockScriptsForWrite(true);
+            m_Scripts.Remove(itemID);
+            lockScriptsForWrite(false);
             instance.ClearQueue();
 
             instance.Stop(m_WaitForEventCompletionOnScriptStop);
@@ -1423,8 +1500,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
             ObjectRemoved handlerObjectRemoved = OnObjectRemoved;
             if (handlerObjectRemoved != null)
-                handlerObjectRemoved(instance.ObjectID);
+            {
+                SceneObjectPart part = m_Scene.GetSceneObjectPart(localID);                    
+                handlerObjectRemoved(part.UUID);
+            }
 
+            CleanAssemblies();
+            
             ScriptRemoved handlerScriptRemoved = OnScriptRemoved;
             if (handlerScriptRemoved != null)
                 handlerScriptRemoved(itemID);
@@ -1685,12 +1767,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         private IScriptInstance GetInstance(UUID itemID)
         {
             IScriptInstance instance;
-            lock (m_Scripts)
+            lockScriptsForRead(true);
+            if (!m_Scripts.ContainsKey(itemID))
             {
-                if (!m_Scripts.ContainsKey(itemID))
-                    return null;
-                instance = m_Scripts[itemID];
+                lockScriptsForRead(false);
+                return null;
             }
+            instance = m_Scripts[itemID];
+            lockScriptsForRead(false);
             return instance;
         }
 
@@ -1714,6 +1798,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             return false;
         }
 
+        [DebuggerNonUserCode]
         public void ApiResetScript(UUID itemID)
         {
             IScriptInstance instance = GetInstance(itemID);
@@ -1775,6 +1860,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             return UUID.Zero;
         }
 
+        [DebuggerNonUserCode]
         public void SetState(UUID itemID, string newState)
         {
             IScriptInstance instance = GetInstance(itemID);
@@ -1797,11 +1883,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
             List<IScriptInstance> instances = new List<IScriptInstance>();
 
-            lock (m_Scripts)
-            {
-                foreach (IScriptInstance instance in m_Scripts.Values)
+            lockScriptsForRead(true);
+            foreach (IScriptInstance instance in m_Scripts.Values)
                     instances.Add(instance);
-            }
+            lockScriptsForRead(false);
 
             foreach (IScriptInstance i in instances)
             {
diff --git a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
index fb85d1c..4502b7d 100644
--- a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
+++ b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
@@ -29,6 +29,7 @@ using System;
 using System.IO;
 using System.Net;
 using System.Reflection;
+using System.Threading;
 
 using Nini.Config;
 using log4net;
@@ -70,6 +71,8 @@ namespace OpenSim.Server.Handlers.MapImage
 
     class MapServerGetHandler : BaseStreamHandler
     {
+        public static ManualResetEvent ev = new ManualResetEvent(true);
+
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private IMapImageService m_MapService;
@@ -82,8 +85,13 @@ namespace OpenSim.Server.Handlers.MapImage
 
         public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
-            byte[] result = new byte[0];
+            ev.WaitOne();
+            lock (ev)
+            {
+                ev.Reset();
+            }
 
+            byte[] result = new byte[0];
             string format = string.Empty;
             result = m_MapService.GetMapTile(path.Trim('/'), out format);
             if (result.Length > 0)
@@ -100,6 +108,11 @@ namespace OpenSim.Server.Handlers.MapImage
                 httpResponse.ContentType = "text/plain";
             }
 
+            lock (ev)
+            {
+                ev.Set();
+            }
+
             return result;
         }
 
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 012b14e..0bd8269 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -100,6 +100,11 @@ namespace OpenSim.Server.Handlers.Simulation
                 DoAgentDelete(request, responsedata, agentID, action, regionID);
                 return responsedata;
             }
+            else if (method.Equals("DELETECHILD"))
+            {
+                DoChildAgentDelete(request, responsedata, agentID, action, regionID);
+                return responsedata;
+            }
             else if (method.Equals("QUERYACCESS"))
             {
                 DoQueryAccess(request, responsedata, agentID, regionID);
@@ -208,6 +213,24 @@ namespace OpenSim.Server.Handlers.Simulation
             }
         }
 
+        protected void DoChildAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, UUID regionID)
+        {
+            m_log.Debug(" >>> DoChildAgentDelete action:" + action + "; RegionID:" + regionID);
+
+            GridRegion destination = new GridRegion();
+            destination.RegionID = regionID;
+
+            if (action.Equals("release"))
+                ReleaseAgent(regionID, id);
+            else
+                m_SimulationService.CloseChildAgent(destination, id);
+
+            responsedata["int_response_code"] = HttpStatusCode.OK;
+            responsedata["str_response_string"] = "OpenSim agent " + id.ToString();
+
+            m_log.Debug("[AGENT HANDLER]: Child Agent Released/Deleted.");
+        }
+
         protected void DoAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, UUID regionID)
         {
             m_log.Debug(" >>> DoDelete action:" + action + "; RegionID:" + regionID);
@@ -420,7 +443,15 @@ namespace OpenSim.Server.Handlers.Simulation
         // subclasses can override this
         protected virtual bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, out string reason)
         {
-            return m_SimulationService.CreateAgent(destination, aCircuit, teleportFlags, out reason);
+            reason = String.Empty;
+            
+            Util.FireAndForget(x =>
+            {
+                string r;
+                m_SimulationService.CreateAgent(destination, aCircuit, teleportFlags, out r);
+            });
+
+            return true;
         }
     }
 
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index e7eb6fe..f1bffa4 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -173,7 +173,10 @@ namespace OpenSim.Services.AssetService
             {
 //                m_log.DebugFormat(
 //                    "[ASSET SERVICE]: Storing asset {0} {1}, bytes {2}", asset.Name, asset.FullID, asset.Data.Length);
-                m_Database.StoreAsset(asset);
+               if (!m_Database.StoreAsset(asset))
+                {
+                return UUID.Zero.ToString();
+                }
             }
 //            else
 //            {
diff --git a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
index 229f557..e42f9a0 100644
--- a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
+++ b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
@@ -30,10 +30,11 @@ using OpenMetaverse;
 using log4net;
 using Nini.Config;
 using System.Reflection;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
 using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Services.Base;
-using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Services.AuthenticationService
 {
@@ -50,6 +51,12 @@ namespace OpenSim.Services.AuthenticationService
                 MethodBase.GetCurrentMethod().DeclaringType);
  
         protected IAuthenticationData m_Database;
+        protected IUserAccountService m_UserAccountService = null;
+
+        public AuthenticationServiceBase(IConfigSource config, IUserAccountService acct) : this(config)
+        {
+            m_UserAccountService = acct;
+        }
 
         public AuthenticationServiceBase(IConfigSource config) : base(config)
         {
diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
index 5f1bde1..a069838 100644
--- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
@@ -51,6 +51,12 @@ namespace OpenSim.Services.AuthenticationService
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
  
+        public PasswordAuthenticationService(IConfigSource config, IUserAccountService userService) :
+                base(config, userService)
+        {
+            m_log.Debug("[AUTH SERVICE]: Started with User Account access");
+        }
+
         public PasswordAuthenticationService(IConfigSource config) :
                 base(config)
         {
@@ -58,42 +64,90 @@ namespace OpenSim.Services.AuthenticationService
 
         public string Authenticate(UUID principalID, string password, int lifetime)
         {
+            UUID realID;
+            return Authenticate(principalID, password, lifetime, out realID);
+        }
+
+        public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID)
+        {
+            realID = UUID.Zero;
+
+            m_log.DebugFormat("[AUTH SERVICE]: Authenticating for {0}, user account service present: {1}", principalID, m_UserAccountService != null);
             AuthenticationData data = m_Database.Get(principalID);
+            UserAccount user = null;
+            if (m_UserAccountService != null)
+                user = m_UserAccountService.GetUserAccount(UUID.Zero, principalID);
 
-            if (data == null)
+            if (data == null || data.Data == null)
             {
-                m_log.DebugFormat("[AUTH SERVICE]: PrincipalID {0} not found", principalID);
+                m_log.DebugFormat("[AUTH SERVICE]: PrincipalID {0} or its data not found", principalID);
                 return String.Empty;
             }
-            else if (data.Data == null)
+
+            if (!data.Data.ContainsKey("passwordHash") ||
+                !data.Data.ContainsKey("passwordSalt"))
             {
-                m_log.DebugFormat("[AUTH SERVICE]: PrincipalID {0} data not found", principalID);
                 return String.Empty;
             }
-            else if (!data.Data.ContainsKey("passwordHash") || !data.Data.ContainsKey("passwordSalt"))
+
+            string hashed = Util.Md5Hash(password + ":" +
+                    data.Data["passwordSalt"].ToString());
+
+            m_log.DebugFormat("[PASS AUTH]: got {0}; hashed = {1}; stored = {2}", password, hashed, data.Data["passwordHash"].ToString());
+
+            if (data.Data["passwordHash"].ToString() == hashed)
+            {
+                return GetToken(principalID, lifetime);
+            }
+
+            if (user == null)
             {
-                m_log.DebugFormat(
-                    "[AUTH SERVICE]: PrincipalID {0} data didn't contain either passwordHash or passwordSalt", principalID);
+                m_log.DebugFormat("[PASS AUTH]: No user record for {0}", principalID);
                 return String.Empty;
             }
-            else
+
+            int impersonateFlag = 1 << 6;
+
+            if ((user.UserFlags & impersonateFlag) == 0)
+                return String.Empty;
+
+            m_log.DebugFormat("[PASS AUTH]: Attempting impersonation");
+
+            List<UserAccount> accounts = m_UserAccountService.GetUserAccountsWhere(UUID.Zero, "UserLevel >= 200");
+            if (accounts == null || accounts.Count == 0)
+                return String.Empty;
+
+            foreach (UserAccount a in accounts)
             {
-                string hashed = Util.Md5Hash(password + ":" + data.Data["passwordSalt"].ToString());
+                data = m_Database.Get(a.PrincipalID);
+                if (data == null || data.Data == null ||
+                    !data.Data.ContainsKey("passwordHash") ||
+                    !data.Data.ContainsKey("passwordSalt"))
+                {
+                    continue;
+                }
+
+//                m_log.DebugFormat("[PASS AUTH]: Trying {0}", data.PrincipalID);
 
-                m_log.DebugFormat("[PASS AUTH]: got {0}; hashed = {1}; stored = {2}", password, hashed, data.Data["passwordHash"].ToString());
+                hashed = Util.Md5Hash(password + ":" +
+                        data.Data["passwordSalt"].ToString());
 
                 if (data.Data["passwordHash"].ToString() == hashed)
                 {
+                    m_log.DebugFormat("[PASS AUTH]: {0} {1} impersonating {2}, proceeding with login", a.FirstName, a.LastName, principalID);
+                    realID = a.PrincipalID;
                     return GetToken(principalID, lifetime);
                 }
-                else
-                {
-                    m_log.DebugFormat(
-                        "[AUTH SERVICE]: Salted hash {0} of given password did not match salted hash of {1} for PrincipalID {2}.  Authentication failure.",
-                        hashed, data.Data["passwordHash"], principalID);
-                    return String.Empty;
-                }
+//                else
+//                {
+//                    m_log.DebugFormat(
+//                        "[AUTH SERVICE]: Salted hash {0} of given password did not match salted hash of {1} for PrincipalID {2}.  Authentication failure.",
+//                        hashed, data.Data["passwordHash"], data.PrincipalID);
+//                }
             }
+
+            m_log.DebugFormat("[PASS AUTH]: Impersonation of {0} failed", principalID);
+            return String.Empty;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs b/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs
index 2344c0e..1510168 100644
--- a/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs
@@ -49,12 +49,23 @@ namespace OpenSim.Services.AuthenticationService
         private static readonly ILog m_log =
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
+ 
+        public WebkeyAuthenticationService(IConfigSource config, IUserAccountService userService) :
+                base(config, userService)
+        {
+        }
 
         public WebkeyAuthenticationService(IConfigSource config) :
             base(config)
         {
         }
 
+        public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID)
+        {
+            realID = UUID.Zero;
+            return Authenticate(principalID, password, lifetime);
+        }
+
         public string Authenticate(UUID principalID, string password, int lifetime)
         {
             if (new UUID(password) == UUID.Zero)
diff --git a/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
index 2c6cebd..bbc8470 100644
--- a/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/WebkeyOrPasswordAuthenticationService.cs
@@ -55,14 +55,22 @@ namespace OpenSim.Services.AuthenticationService
 
         public string Authenticate(UUID principalID, string password, int lifetime)
         {
+            UUID realID;
+
+            return Authenticate(principalID, password, lifetime, out realID);
+        }
+
+        public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID)
+        {
             AuthenticationData data = m_Database.Get(principalID);
             string result = String.Empty;
+            realID = UUID.Zero;
             if (data != null && data.Data != null)
             {
                 if (data.Data.ContainsKey("webLoginKey"))
                 {
                     m_log.DebugFormat("[AUTH SERVICE]: Attempting web key authentication for PrincipalID {0}", principalID);
-                    result = m_svcChecks["web_login_key"].Authenticate(principalID, password, lifetime);
+                    result = m_svcChecks["web_login_key"].Authenticate(principalID, password, lifetime, out realID);
                     if (result == String.Empty)
                     {
                         m_log.DebugFormat("[AUTH SERVICE]: Web Login failed for PrincipalID {0}", principalID);
@@ -71,12 +79,15 @@ namespace OpenSim.Services.AuthenticationService
                 if (result == string.Empty && data.Data.ContainsKey("passwordHash") && data.Data.ContainsKey("passwordSalt"))
                 {
                     m_log.DebugFormat("[AUTH SERVICE]: Attempting password authentication for PrincipalID {0}", principalID);
-                    result = m_svcChecks["password"].Authenticate(principalID, password, lifetime);
+                    result = m_svcChecks["password"].Authenticate(principalID, password, lifetime, out realID);
                     if (result == String.Empty)
                     {
                         m_log.DebugFormat("[AUTH SERVICE]: Password login failed for PrincipalID {0}", principalID);
                     }
                 }
+
+              
+
                 if (result == string.Empty)
                 {
                     m_log.DebugFormat("[AUTH SERVICE]: Both password and webLoginKey-based authentication failed for PrincipalID {0}", principalID);
@@ -86,7 +97,9 @@ namespace OpenSim.Services.AuthenticationService
             {
                 m_log.DebugFormat("[AUTH SERVICE]: PrincipalID {0} or its data not found", principalID);
             }
+            
+            
             return result;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 2b2f11f..4b502b7 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -27,9 +27,11 @@
 
 using log4net;
 using System;
+using System.Threading;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
+using System.Timers;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
@@ -47,14 +49,22 @@ namespace OpenSim.Services.Connectors
 
         private string m_ServerURI = String.Empty;
         private IImprovedAssetCache m_Cache = null;
+        private int m_retryCounter;
+        private Dictionary<int, List<AssetBase>> m_retryQueue = new Dictionary<int, List<AssetBase>>();
+        private System.Timers.Timer m_retryTimer;
         private int m_maxAssetRequestConcurrency = 30;
         
         private delegate void AssetRetrievedEx(AssetBase asset);
 
         // Keeps track of concurrent requests for the same asset, so that it's only loaded once.
         // Maps: Asset ID -> Handlers which will be called when the asset has been loaded
-        private Dictionary<string, AssetRetrievedEx> m_AssetHandlers = new Dictionary<string, AssetRetrievedEx>();
+//        private Dictionary<string, AssetRetrievedEx> m_AssetHandlers = new Dictionary<string, AssetRetrievedEx>();
 
+        private Dictionary<string, List<AssetRetrievedEx>> m_AssetHandlers = new Dictionary<string, List<AssetRetrievedEx>>();
+
+        private Dictionary<string, string> m_UriMap = new Dictionary<string, string>();
+
+        private Thread[] m_fetchThreads;
 
         public AssetServicesConnector()
         {
@@ -86,13 +96,102 @@ namespace OpenSim.Services.Connectors
             string serviceURI = assetConfig.GetString("AssetServerURI",
                     String.Empty);
 
+            m_ServerURI = serviceURI;
+
             if (serviceURI == String.Empty)
             {
                 m_log.Error("[ASSET CONNECTOR]: No Server URI named in section AssetService");
                 throw new Exception("Asset connector init error");
             }
 
-            m_ServerURI = serviceURI;
+
+            m_retryTimer = new System.Timers.Timer();
+            m_retryTimer.Elapsed += new ElapsedEventHandler(retryCheck);
+            m_retryTimer.Interval = 60000;
+
+            Uri serverUri = new Uri(m_ServerURI);
+
+            string groupHost = serverUri.Host;
+
+            for (int i = 0 ; i < 256 ; i++)
+            {
+                string prefix = i.ToString("x2");
+                groupHost = assetConfig.GetString("AssetServerHost_"+prefix, groupHost);
+
+                m_UriMap[prefix] = groupHost;
+                //m_log.DebugFormat("[ASSET]: Using {0} for prefix {1}", groupHost, prefix);
+            }
+
+            m_fetchThreads = new Thread[2];
+
+            for (int i = 0 ; i < 2 ; i++)
+            {
+                m_fetchThreads[i] = new Thread(AssetRequestProcessor);
+                m_fetchThreads[i].Start();
+            }
+        }
+
+        private string MapServer(string id)
+        {
+            UriBuilder serverUri = new UriBuilder(m_ServerURI);
+
+            string prefix = id.Substring(0, 2).ToLower();
+
+            string host = m_UriMap[prefix];
+
+            serverUri.Host = host;
+
+            // m_log.DebugFormat("[ASSET]: Using {0} for host name for prefix {1}", host, prefix);
+
+            string ret = serverUri.Uri.AbsoluteUri;
+            if (ret.EndsWith("/"))
+                ret = ret.Substring(0, ret.Length - 1);
+            return ret;
+        }
+
+        protected void retryCheck(object source, ElapsedEventArgs e)
+        {
+            m_retryCounter++;
+            if (m_retryCounter > 60) m_retryCounter -= 60;
+            List<int> keys = new List<int>();
+            foreach (int a in m_retryQueue.Keys)
+            {
+                keys.Add(a);
+            }
+            foreach (int a in keys)
+            {
+                //We exponentially fall back on frequency until we reach one attempt per hour
+                //The net result is that we end up in the queue for roughly 24 hours..
+                //24 hours worth of assets could be a lot, so the hope is that the region admin
+                //will have gotten the asset connector back online quickly!
+
+                int timefactor = a ^ 2; 
+                if (timefactor > 60)
+                {
+                    timefactor = 60;
+                }
+
+                //First, find out if we care about this timefactor
+                if (timefactor % a == 0)
+                {
+                    //Yes, we do!   
+                    List<AssetBase> retrylist = m_retryQueue[a];
+                    m_retryQueue.Remove(a);
+
+                    foreach(AssetBase ass in retrylist)
+                    {
+                        Store(ass); //Store my ass. This function will put it back in the dictionary if it fails
+                    }
+                }
+            }
+
+            if (m_retryQueue.Count == 0)
+            {
+                //It might only be one tick per minute, but I have
+                //repented and abandoned my wasteful ways
+                m_retryCounter = 0;
+                m_retryTimer.Stop();
+            }
         }
 
         protected void SetCache(IImprovedAssetCache cache)
@@ -102,15 +201,13 @@ namespace OpenSim.Services.Connectors
 
         public AssetBase Get(string id)
         {
-//            m_log.DebugFormat("[ASSET SERVICE CONNECTOR]: Synchronous get request for {0}", id);
-
-            string uri = m_ServerURI + "/assets/" + id;
+            string uri = MapServer(id) + "/assets/" + id;
 
             AssetBase asset = null;
             if (m_Cache != null)
                 asset = m_Cache.Get(id);
-
-            if (asset == null)
+            
+            if (asset == null || asset.Data == null || asset.Data.Length == 0)
             {
                 asset = SynchronousRestObjectRequester.
                         MakeRequest<int, AssetBase>("GET", uri, 0, m_maxAssetRequestConcurrency);
@@ -141,7 +238,7 @@ namespace OpenSim.Services.Connectors
                     return fullAsset.Metadata;
             }
 
-            string uri = m_ServerURI + "/assets/" + id + "/metadata";
+            string uri = MapServer(id) + "/assets/" + id + "/metadata";
 
             AssetMetadata asset = SynchronousRestObjectRequester.
                     MakeRequest<int, AssetMetadata>("GET", uri, 0);
@@ -158,7 +255,7 @@ namespace OpenSim.Services.Connectors
                     return fullAsset.Data;
             }
 
-            RestClient rc = new RestClient(m_ServerURI);
+            RestClient rc = new RestClient(MapServer(id));
             rc.AddResourcePath("assets");
             rc.AddResourcePath(id);
             rc.AddResourcePath("data");
@@ -181,66 +278,109 @@ namespace OpenSim.Services.Connectors
             return null;
         }
 
-        public bool Get(string id, Object sender, AssetRetrieved handler)
+        private class QueuedAssetRequest
         {
-//            m_log.DebugFormat("[ASSET SERVICE CONNECTOR]: Potentially asynchronous get request for {0}", id);
+            public string uri;
+            public string id;
+        }
 
-            string uri = m_ServerURI + "/assets/" + id;
+        private OpenMetaverse.BlockingQueue<QueuedAssetRequest> m_requestQueue =
+                new OpenMetaverse.BlockingQueue<QueuedAssetRequest>();
 
-            AssetBase asset = null;
-            if (m_Cache != null)
-                asset = m_Cache.Get(id);
+        private void AssetRequestProcessor()
+        {
+            QueuedAssetRequest r;
 
-            if (asset == null)
+            while (true)
             {
-                lock (m_AssetHandlers)
-                {
-                    AssetRetrievedEx handlerEx = new AssetRetrievedEx(delegate(AssetBase _asset) { handler(id, sender, _asset); });
-
-                    AssetRetrievedEx handlers;
-                    if (m_AssetHandlers.TryGetValue(id, out handlers))
-                    {
-                        // Someone else is already loading this asset. It will notify our handler when done.
-                        handlers += handlerEx;
-                        return true;
-                    }
+                r = m_requestQueue.Dequeue();
 
-                    // Load the asset ourselves
-                    handlers += handlerEx;
-                    m_AssetHandlers.Add(id, handlers);
-                }
+                string uri = r.uri;
+                string id = r.id;
 
                 bool success = false;
                 try
                 {
-                    AsynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0,
-                        delegate(AssetBase a)
-                        {
-                            if (m_Cache != null)
-                                m_Cache.Cache(a);
+                    AssetBase a = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0, 30);
+                    if (a != null)
+                    {
+                        if (m_Cache != null)
+                            m_Cache.Cache(a);
 
-                            AssetRetrievedEx handlers;
-                            lock (m_AssetHandlers)
+                        List<AssetRetrievedEx> handlers;
+                        lock (m_AssetHandlers)
+                        {
+                            handlers = m_AssetHandlers[id];
+                            m_AssetHandlers.Remove(id);
+                        }
+                        foreach (AssetRetrievedEx h in handlers)
+                        {
+                            Util.FireAndForget(x =>
                             {
-                                handlers = m_AssetHandlers[id];
-                                m_AssetHandlers.Remove(id);
-                            }
-                            handlers.Invoke(a);
-                        }, m_maxAssetRequestConcurrency);
+                                h.Invoke(a);
+                            });
+                        }
+                        if (handlers != null)
+                            handlers.Clear();
                     
-                    success = true;
+                        success = true;
+                    }
                 }
                 finally
                 {
                     if (!success)
                     {
+                        List<AssetRetrievedEx> handlers;
                         lock (m_AssetHandlers)
                         {
+                            handlers = m_AssetHandlers[id];
                             m_AssetHandlers.Remove(id);
                         }
+                        if (handlers != null)
+                            handlers.Clear();
                     }
                 }
             }
+        }
+
+        public bool Get(string id, Object sender, AssetRetrieved handler)
+        {
+            string uri = MapServer(id) + "/assets/" + id;
+
+            AssetBase asset = null;
+            if (m_Cache != null)
+                asset = m_Cache.Get(id);
+
+            if (asset == null || asset.Data == null || asset.Data.Length == 0)
+            {
+                lock (m_AssetHandlers)
+                {
+                    AssetRetrievedEx handlerEx = new AssetRetrievedEx(delegate(AssetBase _asset) { handler(id, sender, _asset); });
+
+//                    AssetRetrievedEx handlers;
+                    List<AssetRetrievedEx> handlers;
+                    if (m_AssetHandlers.TryGetValue(id, out handlers))
+                    {
+                        // Someone else is already loading this asset. It will notify our handler when done.
+//                        handlers += handlerEx;
+                        handlers.Add(handlerEx);
+                        return true;
+                    }
+
+                    // Load the asset ourselves
+//                    handlers += handlerEx;
+                    handlers = new List<AssetRetrievedEx>();
+                    handlers.Add(handlerEx);
+
+                    m_AssetHandlers.Add(id, handlers);
+                }
+
+                QueuedAssetRequest request = new QueuedAssetRequest();
+                request.id = id;
+                request.uri = uri;
+
+                m_requestQueue.Enqueue(request);
+            }
             else
             {
                 handler(id, sender, asset);
@@ -251,38 +391,95 @@ namespace OpenSim.Services.Connectors
 
         public string Store(AssetBase asset)
         {
-            if (asset.Temporary || asset.Local)
+            // Have to assign the asset ID here. This isn't likely to
+            // trigger since current callers don't pass emtpy IDs
+            // We need the asset ID to route the request to the proper
+            // cluster member, so we can't have the server assign one.
+            if (asset.ID == string.Empty)
             {
-                if (m_Cache != null)
-                    m_Cache.Cache(asset);
+                if (asset.FullID == UUID.Zero)
+                {
+                    asset.FullID = UUID.Random();
+                }
+                asset.ID = asset.FullID.ToString();
+            }
+            else if (asset.FullID == UUID.Zero)
+            {
+                UUID uuid = UUID.Zero;
+                if (UUID.TryParse(asset.ID, out uuid))
+                {
+                    asset.FullID = uuid;
+                }
+                else
+                {
+                    asset.FullID = UUID.Random();
+                }
+            }
 
+            if (m_Cache != null)
+                m_Cache.Cache(asset);
+            if (asset.Temporary || asset.Local)
+            {
                 return asset.ID;
             }
 
-            string uri = m_ServerURI + "/assets/";
+            string uri = MapServer(asset.FullID.ToString()) + "/assets/";
 
             string newID = string.Empty;
             try
             {
                 newID = SynchronousRestObjectRequester.
-                        MakeRequest<AssetBase, string>("POST", uri, asset);
+                        MakeRequest<AssetBase, string>("POST", uri, asset, 25);
+                if (newID == null || newID == "")
+                {
+                    newID = UUID.Zero.ToString();
+                }
             }
             catch (Exception e)
             {
-                m_log.WarnFormat("[ASSET CONNECTOR]: Unable to send asset {0} to asset server. Reason: {1}", asset.ID, e.Message);
+                newID = UUID.Zero.ToString();
             }
 
-            if (newID != String.Empty)
+            if (newID == UUID.Zero.ToString())
+            {
+                //The asset upload failed, put it in a queue for later
+                asset.UploadAttempts++;
+                if (asset.UploadAttempts > 30)
+                {
+                    //By this stage we've been in the queue for a good few hours;
+                    //We're going to drop the asset.
+                    m_log.ErrorFormat("[Assets] Dropping asset {0} - Upload has been in the queue for too long.", asset.ID.ToString());
+                }
+                else
+                {
+                    if (!m_retryQueue.ContainsKey(asset.UploadAttempts))
+                    {
+                        m_retryQueue.Add(asset.UploadAttempts, new List<AssetBase>());
+                    }
+                    List<AssetBase> m_queue = m_retryQueue[asset.UploadAttempts];
+                    m_queue.Add(asset);
+                    m_log.WarnFormat("[Assets] Upload failed: {0} - Requeuing asset for another run.", asset.ID.ToString());
+                    m_retryTimer.Start();
+                }
+            }
+            else
             {
-                // Placing this here, so that this work with old asset servers that don't send any reply back
-                // SynchronousRestObjectRequester returns somethins that is not an empty string
-                if (newID != null)
-                    asset.ID = newID;
+                if (asset.UploadAttempts > 0)
+                {
+                    m_log.InfoFormat("[Assets] Upload of {0} succeeded after {1} failed attempts", asset.ID.ToString(), asset.UploadAttempts.ToString());
+                }
+                if (newID != String.Empty)
+                {
+                    // Placing this here, so that this work with old asset servers that don't send any reply back
+                    // SynchronousRestObjectRequester returns somethins that is not an empty string
+                    if (newID != null)
+                        asset.ID = newID;
 
-                if (m_Cache != null)
-                    m_Cache.Cache(asset);
+                    if (m_Cache != null)
+                        m_Cache.Cache(asset);
+                }
             }
-            return newID;
+            return asset.ID;
         }
 
         public bool UpdateContent(string id, byte[] data)
@@ -303,7 +500,7 @@ namespace OpenSim.Services.Connectors
             }
             asset.Data = data;
 
-            string uri = m_ServerURI + "/assets/" + id;
+            string uri = MapServer(id) + "/assets/" + id;
 
             if (SynchronousRestObjectRequester.
                     MakeRequest<AssetBase, bool>("POST", uri, asset))
@@ -318,7 +515,7 @@ namespace OpenSim.Services.Connectors
 
         public bool Delete(string id)
         {
-            string uri = m_ServerURI + "/assets/" + id;
+            string uri = MapServer(id) + "/assets/" + id;
 
             if (SynchronousRestObjectRequester.
                     MakeRequest<int, bool>("DELETE", uri, 0))
diff --git a/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs b/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs
index 2b77154..f996aca 100644
--- a/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs
@@ -81,6 +81,13 @@ namespace OpenSim.Services.Connectors
             m_ServerURI = serviceURI;
         }
 
+        public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID)
+        {
+            realID = UUID.Zero;
+
+            return Authenticate(principalID, password, lifetime);
+        }
+
         public string Authenticate(UUID principalID, string password, int lifetime)
         {
             Dictionary<string, object> sendData = new Dictionary<string, object>();
diff --git a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
index 6d5ce4b..45f4514 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
@@ -144,44 +144,48 @@ namespace OpenSim.Services.Connectors.Friends
 
         private bool Call(GridRegion region, Dictionary<string, object> sendData)
         {
-            string reqString = ServerUtils.BuildQueryString(sendData);
-            //m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: queryString = {0}", reqString);
-            if (region == null)
-                return false;
-
-            string path = ServicePath();
-            if (!region.ServerURI.EndsWith("/"))
-                path = "/" + path;
-            string uri = region.ServerURI + path;
-//            m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: calling {0}", uri);
-
-            try
-            {
-                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
-                if (reply != string.Empty)
+            Util.FireAndForget(x => {
+                string reqString = ServerUtils.BuildQueryString(sendData);
+                //m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: queryString = {0}", reqString);
+                if (region == null)
+                    return;
+
+                string path = ServicePath();
+                if (!region.ServerURI.EndsWith("/"))
+                    path = "/" + path;
+                string uri = region.ServerURI + path;
+                // m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: calling {0}", uri);
+
+                try
                 {
-                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
-
-                    if (replyData.ContainsKey("RESULT"))
+                    string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
+                    if (reply != string.Empty)
                     {
-                        if (replyData["RESULT"].ToString().ToLower() == "true")
-                            return true;
+                        Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+                        if (replyData.ContainsKey("RESULT"))
+                        {
+//                            if (replyData["RESULT"].ToString().ToLower() == "true")
+//                                return;
+//                            else
+                            return;
+                        }
                         else
-                            return false;
+                            m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: reply data does not contain result field");
+
                     }
                     else
-                        m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: reply data does not contain result field");
-
+                        m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: received empty reply");
+                }
+                catch (Exception e)
+                {
+                    m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: Exception when contacting remote sim at {0}: {1}", uri, e.Message);
                 }
-                else
-                    m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: received empty reply");
-            }
-            catch (Exception e)
-            {
-                m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: Exception when contacting remote sim at {0}: {1}", uri, e.Message);
-            }
-
-            return false;
+
+                return;
+            });
+
+            return true;
         }
     }
 }
diff --git a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
index 34ed0d7..f982cc1 100644
--- a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
@@ -48,6 +48,9 @@ namespace OpenSim.Services.Connectors
 
         private string m_ServerURI = String.Empty;
 
+        private ExpiringCache<ulong, GridRegion> m_regionCache =
+                new ExpiringCache<ulong, GridRegion>();
+
         public GridServicesConnector()
         {
         }
@@ -272,6 +275,11 @@ namespace OpenSim.Services.Connectors
 
         public GridRegion GetRegionByPosition(UUID scopeID, int x, int y)
         {
+            ulong regionHandle = Util.UIntsToLong((uint)x, (uint)y);
+
+            if (m_regionCache.Contains(regionHandle))
+                return (GridRegion)m_regionCache[regionHandle];
+
             Dictionary<string, object> sendData = new Dictionary<string, object>();
 
             sendData["SCOPEID"] = scopeID.ToString();
@@ -313,6 +321,8 @@ namespace OpenSim.Services.Connectors
             else
                 m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByPosition received null reply");
 
+            m_regionCache.Add(regionHandle, rinfo, TimeSpan.FromSeconds(600));
+
             return rinfo;
         }
 
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
index 5bcff48..d840527 100644
--- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
@@ -158,6 +158,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
             try
             {
                 WebClient c = new WebClient();
+                //m_log.Debug("JPEG: " + imageURL);
                 string name = regionID.ToString();
                 filename = Path.Combine(storagePath, name + ".jpg");
                 m_log.DebugFormat("[GATEKEEPER SERVICE CONNECTOR]: Map image at {0}, cached at {1}", imageURL, filename);
@@ -186,11 +187,10 @@ namespace OpenSim.Services.Connectors.Hypergrid
 
                 ass.Data = imageData;
 
-                mapTile = ass.FullID;
-
-                // finally
                 m_AssetService.Store(ass);
 
+                // finally
+                mapTile = ass.FullID;
             }
             catch // LEGIT: Catching problems caused by OpenJPEG p/invoke
             {
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 2f263ae..c542c29 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -98,8 +98,6 @@ namespace OpenSim.Services.Connectors.Hypergrid
                 throw new Exception("UserAgent connector init error");
             }
             m_ServerURL = serviceURI;
-            if (!m_ServerURL.EndsWith("/"))
-                m_ServerURL += "/";
 
             m_log.DebugFormat("[USER AGENT CONNECTOR]: UserAgentServiceConnector started for {0}", m_ServerURL);
         }
diff --git a/OpenSim/Services/Connectors/Land/LandServicesConnector.cs b/OpenSim/Services/Connectors/Land/LandServicesConnector.cs
index 30a73a4..833e22a 100644
--- a/OpenSim/Services/Connectors/Land/LandServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Land/LandServicesConnector.cs
@@ -130,4 +130,4 @@ namespace OpenSim.Services.Connectors
             return landData;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
index 7429293..7688e0f 100644
--- a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
@@ -153,9 +153,9 @@ namespace OpenSim.Services.Connectors
             }
             catch (Exception e)
             {
-                m_log.WarnFormat(
-                    "[NEIGHBOUR SERVICE CONNCTOR]: Unable to send HelloNeighbour from {0} to {1}.  Exception {2}{3}",
-                    thisRegion.RegionName, region.RegionName, e.Message, e.StackTrace);
+//                m_log.WarnFormat(
+//                    "[NEIGHBOUR SERVICE CONNCTOR]: Unable to send HelloNeighbour from {0} to {1}.  Exception {2}{3}",
+//                    thisRegion.RegionName, region.RegionName, e.Message, e.StackTrace);
 
                 return false;
             }
@@ -202,4 +202,4 @@ namespace OpenSim.Services.Connectors
             return true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs b/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
index f7d8c53..378aab6 100644
--- a/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
@@ -304,6 +304,17 @@ namespace OpenSim.Services.Connectors
                 {
                     pinfo = new PresenceInfo((Dictionary<string, object>)replyData["result"]);
                 }
+                else
+                {
+                                        if (replyData["result"].ToString() == "null")
+                                                return null;
+
+                    m_log.DebugFormat("[PRESENCE CONNECTOR]: Invalid reply (result not dictionary) received from presence server when querying for sessionID {0}", sessionID.ToString());
+                }
+            }
+            else
+            {
+                m_log.DebugFormat("[PRESENCE CONNECTOR]: Invalid reply received from presence server when querying for sessionID {0}", sessionID.ToString());
             }
 
             return pinfo;
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
index 6603f6e..03b19ae 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
@@ -102,6 +102,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 m_log.Info("[SIMIAN AUTH CONNECTOR]: No AuthenticationServerURI specified, disabling connector");
         }
 
+        public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID)
+        {
+            realID = UUID.Zero;
+            return Authenticate(principalID, password, lifetime);
+        }
+
         public string Authenticate(UUID principalID, string password, int lifetime)
         {
             NameValueCollection requestArgs = new NameValueCollection
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index 038a4bf..20eaa3a 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -28,6 +28,8 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.Drawing;
+using System.Drawing.Imaging;
 using System.IO;
 using System.Net;
 using System.Reflection;
@@ -100,6 +102,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public string RegisterRegion(UUID scopeID, GridRegion regionInfo)
         {
+            IPEndPoint ext = regionInfo.ExternalEndPoint;
+            if (ext == null) return "Region registration for " + regionInfo.RegionName + " failed: Could not resolve EndPoint";
+            // Generate and upload our map tile in PNG format to the SimianGrid AddMapTile service
+//            Scene scene;
+//            if (m_scenes.TryGetValue(regionInfo.RegionID, out scene))
+//                UploadMapTile(scene);
+//            else
+//                m_log.Warn("Registering region " + regionInfo.RegionName + " (" + regionInfo.RegionID + ") that we are not tracking");
+
             Vector3d minPosition = new Vector3d(regionInfo.RegionLocX, regionInfo.RegionLocY, 0.0);
             Vector3d maxPosition = minPosition + new Vector3d(Constants.RegionSize, Constants.RegionSize, Constants.RegionHeight);
 
@@ -108,7 +119,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "ServerURI", OSD.FromString(regionInfo.ServerURI) },
                 { "InternalAddress", OSD.FromString(regionInfo.InternalEndPoint.Address.ToString()) },
                 { "InternalPort", OSD.FromInteger(regionInfo.InternalEndPoint.Port) },
-                { "ExternalAddress", OSD.FromString(regionInfo.ExternalEndPoint.Address.ToString()) },
+                { "ExternalAddress", OSD.FromString(ext.Address.ToString()) },
                 { "ExternalPort", OSD.FromInteger(regionInfo.ExternalEndPoint.Port) },
                 { "MapTexture", OSD.FromUUID(regionInfo.TerrainImage) },
                 { "Access", OSD.FromInteger(regionInfo.Access) },
@@ -399,6 +410,83 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         #endregion IGridService
 
+        private void UploadMapTile(IScene scene)
+        {
+            string errorMessage = null;
+
+            // Create a PNG map tile and upload it to the AddMapTile API
+            byte[] pngData = Utils.EmptyBytes;
+            IMapImageGenerator tileGenerator = scene.RequestModuleInterface<IMapImageGenerator>();
+            if (tileGenerator == null)
+            {
+                m_log.Warn("[SIMIAN GRID CONNECTOR]: Cannot upload PNG map tile without an IMapImageGenerator");
+                return;
+            }
+
+            using (Image mapTile = tileGenerator.CreateMapTile())
+            {
+                using (MemoryStream stream = new MemoryStream())
+                {
+                    mapTile.Save(stream, ImageFormat.Png);
+                    pngData = stream.ToArray();
+                }
+            }
+
+            List<MultipartForm.Element> postParameters = new List<MultipartForm.Element>()
+            {
+                new MultipartForm.Parameter("X", scene.RegionInfo.RegionLocX.ToString()),
+                new MultipartForm.Parameter("Y", scene.RegionInfo.RegionLocY.ToString()),
+                new MultipartForm.File("Tile", "tile.png", "image/png", pngData)
+            };
+
+            // Make the remote storage request
+            try
+            {
+                HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI);
+
+                HttpWebResponse response = MultipartForm.Post(request, postParameters);
+                using (Stream responseStream = response.GetResponseStream())
+                {
+                    string responseStr = null;
+
+                    try
+                    {
+                        responseStr = responseStream.GetStreamString();
+                        OSD responseOSD = OSDParser.Deserialize(responseStr);
+                        if (responseOSD.Type == OSDType.Map)
+                        {
+                            OSDMap responseMap = (OSDMap)responseOSD;
+                            if (responseMap["Success"].AsBoolean())
+                                m_log.Info("[SIMIAN GRID CONNECTOR]: Uploaded " + pngData.Length + " byte PNG map tile to AddMapTile");
+                            else
+                                errorMessage = "Upload failed: " + responseMap["Message"].AsString();
+                        }
+                        else
+                        {
+                            errorMessage = "Response format was invalid:\n" + responseStr;
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        if (!String.IsNullOrEmpty(responseStr))
+                            errorMessage = "Failed to parse the response:\n" + responseStr;
+                        else
+                            errorMessage = "Failed to retrieve the response: " + ex.Message;
+                    }
+                }
+            }
+            catch (WebException ex)
+            {
+                errorMessage = ex.Message;
+            }
+
+            if (!String.IsNullOrEmpty(errorMessage))
+            {
+                m_log.WarnFormat("[SIMIAN GRID CONNECTOR]: Failed to store {0} byte PNG map tile for {1}: {2}",
+                    pngData.Length, scene.RegionInfo.RegionName, errorMessage.Replace('\n', ' '));
+            }
+        }
+
         private GridRegion GetNearestRegion(Vector3d position, bool onlyEnabled)
         {
             NameValueCollection requestArgs = new NameValueCollection
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
index 6e32b3a..fcb5115 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
@@ -191,6 +191,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
             return accounts;
         }
 
+        public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string query)
+        {
+            return null;
+        }
+
         public bool StoreUserAccount(UserAccount data)
         {
 //            m_log.InfoFormat("[SIMIAN ACCOUNT CONNECTOR]: Storing user account for " + data.Name);
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs b/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
index 504fcaf..96c02d9 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
@@ -164,6 +164,11 @@ namespace OpenSim.Services.Connectors
             m_database.RemoveRegionEnvironmentSettings(regionUUID);
         }
 
+        public UUID[] GetObjectIDs(UUID regionID)
+        {
+            return m_database.GetObjectIDs(regionID);
+        }
+
         public void SaveExtra(UUID regionID, string name, string val)
         {
             m_database.SaveExtra(regionID, name, val);
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 57f2ffa..ef2494a 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -86,6 +86,7 @@ namespace OpenSim.Services.Connectors.Simulation
             reason = String.Empty;
             if (destination == null)
             {
+                reason = "Destination not found";
                 m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Given destination is null");
                 return false;
             }
@@ -359,6 +360,10 @@ namespace OpenSim.Services.Connectors.Simulation
                     return false;
                 }
 
+                OSDMap resp = (OSDMap)result["_Result"];
+                success = resp["success"].AsBoolean();
+                reason = resp["reason"].AsString();
+
                 return success;
             }
             catch (Exception e)
@@ -387,26 +392,35 @@ namespace OpenSim.Services.Connectors.Simulation
             return true;
         }
 
-        /// <summary>
-        /// </summary>
-        public bool CloseAgent(GridRegion destination, UUID id)
+        private bool CloseAgent(GridRegion destination, UUID id, bool ChildOnly)
         {
 //            m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start");
+            Util.FireAndForget(x => {
+                string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/";
 
-            string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/";
-
-            try
-            {
-                WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000, false);
-            }
-            catch (Exception e)
-            {
-                m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] CloseAgent failed with exception; {0}",e.ToString());
-            }
+                try
+                {
+                    WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000, false);
+                }
+                catch (Exception e)
+                {
+                    m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] CloseAgent failed with exception; {0}",e.ToString());
+                }
+            });
 
             return true;
         }
 
+        public bool CloseChildAgent(GridRegion destination, UUID id)
+        {
+            return CloseAgent(destination, id, true);
+        }
+
+        public bool CloseAgent(GridRegion destination, UUID id)
+        {
+            return CloseAgent(destination, id, false);
+        }
+
         #endregion Agents
 
         #region Objects
@@ -444,11 +458,14 @@ namespace OpenSim.Services.Connectors.Simulation
                 args["destination_name"] = OSD.FromString(destination.RegionName);
                 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
 
-                WebUtil.PostToService(uri, args, 40000);
+                OSDMap response = WebUtil.PostToService(uri, args, 40000);
+                if (response["Success"] == "False")
+                    return false;
             }
             catch (Exception e)
             {
                 m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] CreateObject failed with exception; {0}",e.ToString());
+                return false;
             }
 
             return true;
diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
index 97d9458..6b2d710 100644
--- a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
+++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
@@ -187,6 +187,11 @@ namespace OpenSim.Services.Connectors
             return accounts;
         }
 
+        public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string where)
+        {
+            return null; // Not implemented for regions
+        }
+
         public virtual bool StoreUserAccount(UserAccount data)
         {
             Dictionary<string, object> sendData = new Dictionary<string, object>();
diff --git a/OpenSim/Services/HypergridService/UserAccountCache.cs b/OpenSim/Services/HypergridService/UserAccountCache.cs
index 65f9dd5..e0a3e61 100644
--- a/OpenSim/Services/HypergridService/UserAccountCache.cs
+++ b/OpenSim/Services/HypergridService/UserAccountCache.cs
@@ -90,6 +90,11 @@ namespace OpenSim.Services.HypergridService
             return null;
         }
 
+        public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string query)
+        {
+            return null;
+        }
+
         public List<UserAccount> GetUserAccounts(UUID scopeID, string query)
         {
             return null;
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index a26a922..416ad16 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -381,13 +381,11 @@ namespace OpenSim.Services.HypergridService
 
             if (m_TravelingAgents.ContainsKey(sessionID))
             {
-                bool result = m_TravelingAgents[sessionID].ClientIPAddress == reportedIP ||
-                    m_TravelingAgents[sessionID].MyIpAddress == reportedIP; // NATed
-
-                m_log.DebugFormat("[USER AGENT SERVICE]: Comparing {0} with login IP {1} and MyIP {1}; result is {3}",
-                                    reportedIP, m_TravelingAgents[sessionID].ClientIPAddress, m_TravelingAgents[sessionID].MyIpAddress, result);
+                m_log.DebugFormat("[USER AGENT SERVICE]: Comparing with login IP {0} and MyIP {1}", 
+                    m_TravelingAgents[sessionID].ClientIPAddress, m_TravelingAgents[sessionID].MyIpAddress);
 
-                return result;
+                return m_TravelingAgents[sessionID].ClientIPAddress == reportedIP ||
+                    m_TravelingAgents[sessionID].MyIpAddress == reportedIP; // NATed
             }
 
             return false;
diff --git a/OpenSim/Services/Interfaces/IAttachmentsService.cs b/OpenSim/Services/Interfaces/IAttachmentsService.cs
new file mode 100644
index 0000000..bdde369
--- /dev/null
+++ b/OpenSim/Services/Interfaces/IAttachmentsService.cs
@@ -0,0 +1,17 @@
+////////////////////////////////////////////////////////////////
+//
+// (c) 2009, 2010 Careminster Limited and Melanie Thielker
+//
+// All rights reserved
+//
+using System;
+using Nini.Config;
+
+namespace OpenSim.Services.Interfaces
+{
+    public interface IAttachmentsService
+    {
+        string Get(string id);
+        void Store(string id, string data);
+    }
+}
diff --git a/OpenSim/Services/Interfaces/IAuthenticationService.cs b/OpenSim/Services/Interfaces/IAuthenticationService.cs
index cee8bc0..cdcfad9 100644
--- a/OpenSim/Services/Interfaces/IAuthenticationService.cs
+++ b/OpenSim/Services/Interfaces/IAuthenticationService.cs
@@ -67,6 +67,7 @@ namespace OpenSim.Services.Interfaces
         // various services.
         //
         string Authenticate(UUID principalID, string password, int lifetime);
+        string Authenticate(UUID principalID, string password, int lifetime, out UUID realID);
 
         //////////////////////////////////////////////////////
         // Verification
diff --git a/OpenSim/Services/Interfaces/IAvatarService.cs b/OpenSim/Services/Interfaces/IAvatarService.cs
index 863fd93..c0130f1 100644
--- a/OpenSim/Services/Interfaces/IAvatarService.cs
+++ b/OpenSim/Services/Interfaces/IAvatarService.cs
@@ -162,10 +162,16 @@ namespace OpenSim.Services.Interfaces
             }
 
             // Visual Params
-            string[] vps = new string[AvatarAppearance.VISUALPARAM_COUNT];
+            //            string[] vps = new string[AvatarAppearance.VISUALPARAM_COUNT];
+            //            byte[] binary = appearance.VisualParams;
+
+            //            for (int i = 0 ; i < AvatarAppearance.VISUALPARAM_COUNT ; i++)
+
+
             byte[] binary = appearance.VisualParams;
+            string[] vps = new string[binary.Length];
 
-            for (int i = 0 ; i < AvatarAppearance.VISUALPARAM_COUNT ; i++)
+            for (int i = 0; i < binary.Length; i++)
             {
                 vps[i] = binary[i].ToString();
             }
@@ -195,7 +201,13 @@ namespace OpenSim.Services.Interfaces
                     appearance.Serial = Int32.Parse(Data["Serial"]);
 
                 if (Data.ContainsKey("AvatarHeight"))
-                    appearance.AvatarHeight = float.Parse(Data["AvatarHeight"]);
+                {
+                    float h = float.Parse(Data["AvatarHeight"]);
+                    if( h == 0f)
+                        h = 1.9f;
+                    appearance.SetSize(new Vector3(0.45f, 0.6f, h ));
+//                    appearance.AvatarHeight = float.Parse(Data["AvatarHeight"]);
+                }
 
                 // Legacy Wearables
                 if (Data.ContainsKey("BodyItem"))
@@ -266,10 +278,14 @@ namespace OpenSim.Services.Interfaces
                 if (Data.ContainsKey("VisualParams"))
                 {
                     string[] vps = Data["VisualParams"].Split(new char[] {','});
-                    byte[] binary = new byte[AvatarAppearance.VISUALPARAM_COUNT];
+                    //                    byte[] binary = new byte[AvatarAppearance.VISUALPARAM_COUNT];
+
+                    //                    for (int i = 0 ; i < vps.Length && i < binary.Length ; i++)
+                    byte[] binary = new byte[vps.Length];
 
-                    for (int i = 0 ; i < vps.Length && i < binary.Length ; i++)
-                        binary[i] = (byte)Convert.ToInt32(vps[i]);
+                    for (int i = 0; i < vps.Length; i++)
+
+                    binary[i] = (byte)Convert.ToInt32(vps[i]);
                     
                     appearance.VisualParams = binary;
                 }
@@ -329,6 +345,7 @@ namespace OpenSim.Services.Interfaces
                     appearance.Wearables[AvatarWearable.EYES].Wear(
                             AvatarWearable.DefaultWearables[
                             AvatarWearable.EYES][0]);
+
             }
             catch
             {
diff --git a/OpenSim/Services/Interfaces/IBakedTextureService.cs b/OpenSim/Services/Interfaces/IBakedTextureService.cs
new file mode 100644
index 0000000..8206ecd
--- /dev/null
+++ b/OpenSim/Services/Interfaces/IBakedTextureService.cs
@@ -0,0 +1,17 @@
+////////////////////////////////////////////////////////////////
+//
+// (c) 2009, 2010 Careminster Limited and Melanie Thielker
+//
+// All rights reserved
+//
+using System;
+using Nini.Config;
+
+namespace OpenSim.Services.Interfaces
+{
+    public interface IBakedTextureService
+    {
+        string Get(string id);
+        void Store(string id, string data);
+    }
+}
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index d7da056..3f4c958 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -337,9 +337,13 @@ namespace OpenSim.Services.Interfaces
                 }
                 catch (SocketException e)
                 {
-                    throw new Exception(
+                    /*throw new Exception(
                         "Unable to resolve local hostname " + m_externalHostName + " innerException of type '" +
-                        e + "' attached to this exception", e);
+                        e + "' attached to this exception", e);*/
+                    // Don't throw a fatal exception here, instead, return Null and handle it in the caller.
+                    // Reason is, on systems such as OSgrid it has occured that known hostnames stop
+                    // resolving and thus make surrounding regions crash out with this exception.
+                    return null;
                 }
 
                 return new IPEndPoint(ia, m_internalEndPoint.Port);
@@ -398,6 +402,12 @@ namespace OpenSim.Services.Interfaces
             if (kvp.ContainsKey("regionName"))
                 RegionName = (string)kvp["regionName"];
 
+            if (kvp.ContainsKey("access"))
+            {
+                byte access = Convert.ToByte((string)kvp["access"]);
+                Maturity = (int)Util.ConvertAccessLevelToMaturity(access);
+            }
+
             if (kvp.ContainsKey("serverIP"))
             {
                 //int port = 0;
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs
index b10a85c..a963b8e 100644
--- a/OpenSim/Services/Interfaces/ISimulationService.cs
+++ b/OpenSim/Services/Interfaces/ISimulationService.cs
@@ -90,6 +90,14 @@ namespace OpenSim.Services.Interfaces
         bool ReleaseAgent(UUID originRegion, UUID id, string uri);
 
         /// <summary>
+        /// Close child agent.
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        bool CloseChildAgent(GridRegion destination, UUID id);
+
+        /// <summary>
         /// Close agent.
         /// </summary>
         /// <param name="regionHandle"></param>
diff --git a/OpenSim/Services/Interfaces/IUserAccountService.cs b/OpenSim/Services/Interfaces/IUserAccountService.cs
index 1b85980..6d5d2a0 100644
--- a/OpenSim/Services/Interfaces/IUserAccountService.cs
+++ b/OpenSim/Services/Interfaces/IUserAccountService.cs
@@ -91,6 +91,7 @@ namespace OpenSim.Services.Interfaces
         public int UserLevel;
         public int UserFlags;
         public string UserTitle;
+        public string UserCountry;
         public Boolean LocalToGrid = true;
 
         public Dictionary<string, object> ServiceURLs;
@@ -120,6 +121,8 @@ namespace OpenSim.Services.Interfaces
                 UserFlags = Convert.ToInt32(kvp["UserFlags"].ToString());
             if (kvp.ContainsKey("UserTitle"))
                 UserTitle = kvp["UserTitle"].ToString();
+            if (kvp.ContainsKey("UserCountry"))
+                UserCountry = kvp["UserCountry"].ToString();
             if (kvp.ContainsKey("LocalToGrid"))
                 Boolean.TryParse(kvp["LocalToGrid"].ToString(), out LocalToGrid);
 
@@ -155,6 +158,7 @@ namespace OpenSim.Services.Interfaces
             result["UserLevel"] = UserLevel.ToString();
             result["UserFlags"] = UserFlags.ToString();
             result["UserTitle"] = UserTitle;
+            result["UserCountry"] = UserCountry;
             result["LocalToGrid"] = LocalToGrid.ToString();
 
             string str = string.Empty;
@@ -182,6 +186,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="query"></param>
         /// <returns></returns>
         List<UserAccount> GetUserAccounts(UUID scopeID, string query);
+        List<UserAccount> GetUserAccountsWhere(UUID scopeID, string where);
 
         /// <summary>
         /// Store the data given, wich replaces the stored data, therefore must be complete.
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 9ec744f..e2f947c 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -55,6 +55,7 @@ namespace OpenSim.Services.LLLoginService
         public static LLFailedLoginResponse InventoryProblem;
         public static LLFailedLoginResponse DeadRegionProblem;
         public static LLFailedLoginResponse LoginBlockedProblem;
+        public static LLFailedLoginResponse UnverifiedAccountProblem;
         public static LLFailedLoginResponse AlreadyLoggedInProblem;
         public static LLFailedLoginResponse InternalError;
 
@@ -75,6 +76,10 @@ namespace OpenSim.Services.LLLoginService
             LoginBlockedProblem = new LLFailedLoginResponse("presence",
                 "Logins are currently restricted. Please try again later.",
                 "false");
+            UnverifiedAccountProblem = new LLFailedLoginResponse("presence",
+                "Your account has not yet been verified. Please check " +
+                "your email and click the provided link.",
+                "false");
             AlreadyLoggedInProblem = new LLFailedLoginResponse("presence",
                 "You appear to be already logged in. " +
                 "If this is not the case please wait for your session to timeout. " +
@@ -145,6 +150,7 @@ namespace OpenSim.Services.LLLoginService
         private UUID agentID;
         private UUID sessionID;
         private UUID secureSessionID;
+        private UUID realID;
 
         // Login Flags
         private string dst;
@@ -227,7 +233,7 @@ namespace OpenSim.Services.LLLoginService
             GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
             string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
             GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency,
-            string DSTZone)
+            string DSTZone, UUID realID)
             : this()
         {
             FillOutInventoryData(invSkel, libService);
@@ -240,6 +246,7 @@ namespace OpenSim.Services.LLLoginService
             AgentID = account.PrincipalID;
             SessionID = aCircuit.SessionID;
             SecureSessionID = aCircuit.SecureSessionID;
+            RealID = realID;
             Message = message;
             BuddList = ConvertFriendListItem(friendsList);
             StartLocation = where;
@@ -375,6 +382,7 @@ namespace OpenSim.Services.LLLoginService
         private void FillOutRegionData(GridRegion destination)
         {
             IPEndPoint endPoint = destination.ExternalEndPoint;
+            if (endPoint == null) return;
             SimAddress = endPoint.Address.ToString();
             SimPort = (uint)endPoint.Port;
             RegionX = (uint)destination.RegionLocX;
@@ -450,6 +458,7 @@ namespace OpenSim.Services.LLLoginService
             SessionID = UUID.Random();
             SecureSessionID = UUID.Random();
             AgentID = UUID.Random();
+            RealID = UUID.Zero;
 
             Hashtable InitialOutfitHash = new Hashtable();
             InitialOutfitHash["folder_name"] = "Nightclub Female";
@@ -493,6 +502,7 @@ namespace OpenSim.Services.LLLoginService
                 responseData["http_port"] = (Int32)SimHttpPort;
 
                 responseData["agent_id"] = AgentID.ToString();
+                responseData["real_id"] = RealID.ToString();
                 responseData["session_id"] = SessionID.ToString();
                 responseData["secure_session_id"] = SecureSessionID.ToString();
                 responseData["circuit_code"] = CircuitCode;
@@ -575,6 +585,7 @@ namespace OpenSim.Services.LLLoginService
                 map["sim_ip"] = OSD.FromString(SimAddress);
 
                 map["agent_id"] = OSD.FromUUID(AgentID);
+                map["real_id"] = OSD.FromUUID(RealID);
                 map["session_id"] = OSD.FromUUID(SessionID);
                 map["secure_session_id"] = OSD.FromUUID(SecureSessionID);
                 map["circuit_code"] = OSD.FromInteger(CircuitCode);
@@ -882,6 +893,12 @@ namespace OpenSim.Services.LLLoginService
             set { secureSessionID = value; }
         }
 
+        public UUID RealID
+        {
+            get { return realID; }
+            set { realID = value; }
+        }
+
         public Int32 CircuitCode
         {
             get { return circuitCode; }
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 59fb559..cbb6e6c 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -140,7 +140,8 @@ namespace OpenSim.Services.LLLoginService
             Object[] args = new Object[] { config };
             m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args);
             m_GridUserService = ServerUtils.LoadPlugin<IGridUserService>(gridUserService, args);
-            m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authService, args);
+            Object[] authArgs = new Object[] { config, m_UserAccountService };
+            m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authService, authArgs);
             m_InventoryService = ServerUtils.LoadPlugin<IInventoryService>(invService, args);
 
             if (gridService != string.Empty)
@@ -289,6 +290,12 @@ namespace OpenSim.Services.LLLoginService
                     return LLFailedLoginResponse.UserProblem;
                 }
 
+                if (account.UserLevel < 0)
+                {
+                    m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: Unverified account");
+                    return LLFailedLoginResponse.UnverifiedAccountProblem;
+                }
+
                 if (account.UserLevel < m_MinLoginLevel)
                 {
                     m_log.InfoFormat(
@@ -320,7 +327,8 @@ namespace OpenSim.Services.LLLoginService
                 if (!passwd.StartsWith("$1$"))
                     passwd = "$1$" + Util.Md5Hash(passwd);
                 passwd = passwd.Remove(0, 3); //remove $1$
-                string token = m_AuthenticationService.Authenticate(account.PrincipalID, passwd, 30);
+                UUID realID;
+                string token = m_AuthenticationService.Authenticate(account.PrincipalID, passwd, 30, out realID);
                 UUID secureSession = UUID.Zero;
                 if ((token == string.Empty) || (token != string.Empty && !UUID.TryParse(token, out secureSession)))
                 {
@@ -452,7 +460,7 @@ namespace OpenSim.Services.LLLoginService
                     = new LLLoginResponse(
                         account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
                         where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP,
-                        m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone);
+                        m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone, realID);
 
                 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName);
 
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index 5b4d040..a4f1bba 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -170,6 +170,10 @@ namespace OpenSim.Services.UserAccountService
                 Int32.TryParse(d.Data["UserLevel"], out u.UserLevel);
             if (d.Data.ContainsKey("UserFlags") && d.Data["UserFlags"] != null)
                 Int32.TryParse(d.Data["UserFlags"], out u.UserFlags);
+            if (d.Data.ContainsKey("UserCountry") && d.Data["UserCountry"] != null)
+                u.UserCountry = d.Data["UserCountry"].ToString();
+            else
+                u.UserTitle = string.Empty;
 
             if (d.Data.ContainsKey("ServiceURLs") && d.Data["ServiceURLs"] != null)
             {
@@ -291,7 +295,22 @@ namespace OpenSim.Services.UserAccountService
 
         public List<UserAccount> GetUserAccounts(UUID scopeID, string query)
         {
-            UserAccountData[] d = m_Database.GetUsers(scopeID, query);
+            UserAccountData[] d = m_Database.GetUsers(scopeID, query.Trim());
+
+            if (d == null)
+                return new List<UserAccount>();
+
+            List<UserAccount> ret = new List<UserAccount>();
+
+            foreach (UserAccountData data in d)
+                ret.Add(MakeUserAccount(data));
+
+            return ret;
+        }
+
+        public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string where)
+        {
+            UserAccountData[] d = m_Database.GetUsersWhere(scopeID, where);
 
             if (d == null)
                 return new List<UserAccount>();
diff --git a/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs
index 4a15cf2..5bab62c 100644
--- a/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs
@@ -54,9 +54,10 @@ namespace OpenSim.Tests.Common.Mock
             return assets.Find(x=>x.FullID == uuid);
         }
 
-        public void StoreAsset(AssetBase asset)
+        public bool StoreAsset(AssetBase asset)
         {
             assets.Add(asset);
+            return true;
         }
 
         public List<AssetMetadata> FetchAssetMetadataSet(int start, int count) { return new List<AssetMetadata>(count); }
diff --git a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
index ed29c39..5c1ec0b 100644
--- a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
@@ -128,6 +128,11 @@ namespace OpenSim.Data.Null
             m_store.RemoveRegionEnvironmentSettings(regionUUID);
         }
 
+        public UUID[] GetObjectIDs(UUID regionID)
+        {
+            return new UUID[0];
+        }
+
         public void SaveExtra(UUID regionID, string name, string value)
         {
         }
@@ -332,6 +337,11 @@ namespace OpenSim.Data.Null
         {
         }
 
+        public UUID[] GetObjectIDs(UUID regionID)
+        {
+            return new UUID[0];
+        }
+
         public void SaveExtra(UUID regionID, string name, string value)
         {
         }
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 182f4d9..2714429 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Tests.Common.Mock
         public event MoneyTransferRequest OnMoneyTransferRequest;
         public event ParcelBuy OnParcelBuy;
         public event Action<IClientAPI> OnConnectionClosed;
-
+        public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
         public event ImprovedInstantMessage OnInstantMessage;
         public event ChatMessage OnChatFromClient;
         public event TextureRequest OnRequestTexture;
@@ -86,6 +86,7 @@ namespace OpenSim.Tests.Common.Mock
         public event ObjectDrop OnObjectDrop;
         public event StartAnim OnStartAnim;
         public event StopAnim OnStopAnim;
+        public event ChangeAnim OnChangeAnim;
         public event LinkObjects OnLinkObjects;
         public event DelinkObjects OnDelinkObjects;
         public event RequestMapBlocks OnRequestMapBlocks;
@@ -133,6 +134,7 @@ namespace OpenSim.Tests.Common.Mock
         public event GenericCall7 OnObjectMaterial;
         public event UpdatePrimFlags OnUpdatePrimFlags;
         public event UpdatePrimTexture OnUpdatePrimTexture;
+        public event ClientChangeObject onClientChangeObject;
         public event UpdateVector OnUpdatePrimGroupPosition;
         public event UpdateVector OnUpdatePrimSinglePosition;
         public event UpdatePrimRotation OnUpdatePrimGroupRotation;
@@ -274,7 +276,7 @@ namespace OpenSim.Tests.Common.Mock
         public event ClassifiedInfoRequest OnClassifiedInfoRequest;
         public event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
         public event ClassifiedDelete OnClassifiedDelete;
-        public event ClassifiedDelete OnClassifiedGodDelete;
+        public event ClassifiedGodDelete OnClassifiedGodDelete;
 
         public event EventNotificationAddRequest OnEventNotificationAddRequest;
         public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
@@ -313,11 +315,12 @@ namespace OpenSim.Tests.Common.Mock
         public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
         public event SimWideDeletesDelegate OnSimWideDeletes;
         public event SendPostcard OnSendPostcard;
+        public event ChangeInventoryItemFlags OnChangeInventoryItemFlags;
         public event MuteListEntryUpdate OnUpdateMuteListEntry;
         public event MuteListEntryRemove OnRemoveMuteListEntry;
         public event GodlikeMessage onGodlikeMessage;
         public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate;
-
+        public event GenericCall2 OnUpdateThrottles;
 #pragma warning restore 67
 
         /// <value>
@@ -518,6 +521,12 @@ namespace OpenSim.Tests.Common.Mock
         public virtual void SetChildAgentThrottle(byte[] throttle)
         {
         }
+
+        public void SetAgentThrottleSilent(int throttle, int setting)
+        {
+
+
+        }
         public byte[] GetThrottlesPacked(float multiplier)
         {
             return new byte[0];
@@ -709,6 +718,10 @@ namespace OpenSim.Tests.Common.Mock
         {
         }
 
+        public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId)
+        {
+        }
+
         public virtual void SendRemoveInventoryItem(UUID itemID)
         {
         }
@@ -725,7 +738,7 @@ namespace OpenSim.Tests.Common.Mock
         {
         }
 
-        public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data)
+        public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory)
         {
         }
 
@@ -930,10 +943,10 @@ namespace OpenSim.Tests.Common.Mock
 
         public void Close()
         {
-            Close(false);
+            Close(true, false);
         }
 
-        public void Close(bool force)
+        public void Close(bool sendStop, bool force)
         {
             // Fire the callback for this connection closing
             // This is necesary to get the presence detector to notice that a client has logged out.
@@ -1280,6 +1293,5 @@ namespace OpenSim.Tests.Common.Mock
         public void SendPartPhysicsProprieties(ISceneEntity entity)
         {
         }
-
     }
 }
diff --git a/OpenSim/Tests/Performance/NPCPerformanceTests.cs b/OpenSim/Tests/Performance/NPCPerformanceTests.cs
index 2026a88..fde1b91 100644
--- a/OpenSim/Tests/Performance/NPCPerformanceTests.cs
+++ b/OpenSim/Tests/Performance/NPCPerformanceTests.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Tests.Performance
             // ScenePresence.SendInitialData() to reset our entire appearance.
             scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId));
 
-            afm.SetAppearance(sp, originalTe, null);
+            afm.SetAppearance(sp, originalTe, null, new WearableCacheItem[0]);
 
             INPCModule npcModule = scene.RequestModuleInterface<INPCModule>();
 
diff --git a/ThirdParty/SmartThreadPool/SmartThreadPool.cs b/ThirdParty/SmartThreadPool/SmartThreadPool.cs
index 19a0007..2c061d7 100644
--- a/ThirdParty/SmartThreadPool/SmartThreadPool.cs
+++ b/ThirdParty/SmartThreadPool/SmartThreadPool.cs
@@ -541,17 +541,10 @@ namespace Amib.Threading
                 // Process until shutdown.
                 while(!_shutdown)
                 {
-                    // Update the last time this thread was seen alive.
-                    // It's good for debugging.
-                    _workerThreads[Thread.CurrentThread] = DateTime.Now;
-
+                    
                     // Wait for a work item, shutdown, or timeout
                     WorkItem workItem = Dequeue();
 
-                    // Update the last time this thread was seen alive.
-                    // It's good for debugging.
-                    _workerThreads[Thread.CurrentThread] = DateTime.Now;
-
                     // On timeout or shut down.
                     if (null == workItem)
                     {
@@ -560,6 +553,10 @@ namespace Amib.Threading
                         {
                             lock(_workerThreads.SyncRoot)
                             {
+                                // Update the last time this thread was seen alive.
+                                // It's good for debugging.
+                                _workerThreads[Thread.CurrentThread] = DateTime.Now;
+
                                 if (_workerThreads.Count > _stpStartInfo.MinWorkerThreads)
                                 {
                                     // Inform that the thread is quiting and then quit.
diff --git a/bin/MsgPack.dll b/bin/MsgPack.dll
new file mode 100755
index 0000000..90e6b7b
--- /dev/null
+++ b/bin/MsgPack.dll
diff --git a/bin/OpenMetaverse.StructuredData.XML b/bin/OpenMetaverse.StructuredData.XML
index 897a330..d6c31df 100644
--- a/bin/OpenMetaverse.StructuredData.XML
+++ b/bin/OpenMetaverse.StructuredData.XML
@@ -1,333 +1,377 @@
 <?xml version="1.0"?>
 <doc>
     <assembly>
-        <name>OpenMetaverse.StructuredData</name>
+        <name>/home/root/libomv-0.9.1-source/bin/OpenMetaverse.StructuredData</name>
     </assembly>
     <members>
-        <member name="T:OpenMetaverse.StructuredData.OSDParser">
+        <member name="T:OpenMetaverse.StructuredData.OSDType">
             <summary>
-            
             </summary>
+        </member>
+        <member name="F:OpenMetaverse.StructuredData.OSDType.Unknown">
             <summary>
-            
             </summary>
+        </member>
+        <member name="F:OpenMetaverse.StructuredData.OSDType.Boolean">
             <summary>
-            
             </summary>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.Byte[])">
+        <member name="F:OpenMetaverse.StructuredData.OSDType.Integer">
             <summary>
-            Deserializes binary LLSD
             </summary>
-            <param name="binaryData">Serialized data</param>
-            <returns>OSD containting deserialized data</returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.IO.Stream)">
+        <member name="F:OpenMetaverse.StructuredData.OSDType.Real">
             <summary>
-            Deserializes binary LLSD
             </summary>
-            <param name="stream">Stream to read the data from</param>
-            <returns>OSD containting deserialized data</returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDBinary(OpenMetaverse.StructuredData.OSD)">
+        <member name="F:OpenMetaverse.StructuredData.OSDType.String">
             <summary>
-            
             </summary>
-            <param name="osd"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDBinaryStream(OpenMetaverse.StructuredData.OSD)">
+        <member name="F:OpenMetaverse.StructuredData.OSDType.UUID">
             <summary>
-            
             </summary>
-            <param name="data"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.SkipWhiteSpace(System.IO.Stream)">
+        <member name="F:OpenMetaverse.StructuredData.OSDType.Date">
             <summary>
-            
             </summary>
-            <param name="stream"></param>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.FindByte(System.IO.Stream,System.Byte)">
+        <member name="F:OpenMetaverse.StructuredData.OSDType.URI">
             <summary>
-            
             </summary>
-            <param name="stream"></param>
-            <param name="toFind"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.FindString(System.IO.Stream,System.String)">
+        <member name="F:OpenMetaverse.StructuredData.OSDType.Binary">
             <summary>
-            
             </summary>
-            <param name="stream"></param>
-            <param name="toFind"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.ConsumeBytes(System.IO.Stream,System.Int32)">
+        <member name="F:OpenMetaverse.StructuredData.OSDType.Map">
             <summary>
-            
             </summary>
-            <param name="stream"></param>
-            <param name="consumeBytes"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.NetworkToHostInt(System.Byte[])">
+        <member name="F:OpenMetaverse.StructuredData.OSDType.Array">
             <summary>
-            
             </summary>
-            <param name="binaryNetEnd"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.NetworkToHostDouble(System.Byte[])">
+        <member name="T:OpenMetaverse.StructuredData.OSDException">
             <summary>
-            
             </summary>
-            <param name="binaryNetEnd"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.HostToNetworkIntBytes(System.Int32)">
+        <member name="T:OpenMetaverse.StructuredData.OSD">
             <summary>
-            
             </summary>
-            <param name="intHostEnd"></param>
-            <returns></returns>   
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDXml(System.Byte[])">
+        <member name="M:OpenMetaverse.StructuredData.OSD.SerializeMembers(System.Object)">
             <summary>
-            
+            Uses reflection to create an SDMap from all of the SD
+            serializable types in an object
             </summary>
-            <param name="xmlData"></param>
-            <returns></returns>
+            <param name="obj">Class or struct containing serializable types</param>
+            <returns>An SDMap holding the serialized values from the
+            container object</returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDXml(System.String)">
+        <member name="M:OpenMetaverse.StructuredData.OSD.DeserializeMembers(System.Object@,OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            
+            Uses reflection to deserialize member variables in an object from
+            an SDMap
             </summary>
-            <param name="xmlData"></param>
-            <returns></returns>
+            <param name="obj">Reference to an object to fill with deserialized
+            values</param>
+            <param name="serialized">Serialized values to put in the target
+            object</param>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDXml(System.Xml.XmlTextReader)">
+        <member name="T:OpenMetaverse.StructuredData.OSDBoolean">
             <summary>
-            
             </summary>
-            <param name="xmlData"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDXmlBytes(OpenMetaverse.StructuredData.OSD)">
+        <member name="T:OpenMetaverse.StructuredData.OSDInteger">
             <summary>
-            
             </summary>
-            <param name="data"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDXmlString(OpenMetaverse.StructuredData.OSD)">
+        <member name="T:OpenMetaverse.StructuredData.OSDReal">
             <summary>
-            
             </summary>
-            <param name="data"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDXmlElement(System.Xml.XmlTextWriter,OpenMetaverse.StructuredData.OSD)">
+        <member name="T:OpenMetaverse.StructuredData.OSDString">
             <summary>
-            
             </summary>
-            <param name="writer"></param>
-            <param name="data"></param>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.TryValidateLLSDXml(System.Xml.XmlTextReader,System.String@)">
+        <member name="T:OpenMetaverse.StructuredData.OSDUUID">
             <summary>
-            
             </summary>
-            <param name="xmlData"></param>
-            <param name="error"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.ParseLLSDXmlElement(System.Xml.XmlTextReader)">
+        <member name="T:OpenMetaverse.StructuredData.OSDDate">
             <summary>
-            
             </summary>
-            <param name="reader"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDNotationElement(System.IO.StringReader)">
+        <member name="T:OpenMetaverse.StructuredData.OSDUri">
             <summary>
-            
             </summary>
-            <param name="reader"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.PeekAndSkipWhitespace(System.IO.StringReader)">
+        <member name="T:OpenMetaverse.StructuredData.OSDBinary">
             <summary>
-            
             </summary>
-            <param name="reader"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.ReadAndSkipWhitespace(System.IO.StringReader)">
+        <member name="T:OpenMetaverse.StructuredData.OSDMap">
             <summary>
-            
             </summary>
-            <param name="reader"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.GetLengthInBrackets(System.IO.StringReader)">
+        <member name="T:OpenMetaverse.StructuredData.OSDArray">
             <summary>
-            
             </summary>
-            <param name="reader"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.GetStringDelimitedBy(System.IO.StringReader,System.Char)">
+        <member name="T:OpenMetaverse.StructuredData.OSDParser">
+            <summary>
+            </summary>
+            <summary>
+            </summary>
             <summary>
-            
             </summary>
-            <param name="reader"></param>
-            <param name="delimiter"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.BufferCharactersEqual(System.IO.StringReader,System.Char[],System.Int32)">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.Byte[])">
             <summary>
-            
+            Deserializes binary LLSD
             </summary>
-            <param name="reader"></param>
-            <param name="buffer"></param>
-            <param name="offset"></param>
-            <returns></returns>
+            <param name="binaryData">Serialized data</param>
+            <returns>OSD containting deserialized data</returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.UnescapeCharacter(System.String,System.Char)">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.IO.Stream)">
             <summary>
-            
+            Deserializes binary LLSD
             </summary>
-            <param name="s"></param>
-            <param name="c"></param>
-            <returns></returns>
+            <param name="stream">Stream to read the data from</param>
+            <returns>OSD containting deserialized data</returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.EscapeCharacter(System.String,System.Char)">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDBinary(OpenMetaverse.StructuredData.OSD)">
             <summary>
-            
+            Serializes OSD to binary format. It does no prepend header
             </summary>
-            <param name="s"></param>
-            <param name="c"></param>
-            <returns></returns>
+            <param name="osd">OSD to serialize</param>
+            <returns>Serialized data</returns>
         </member>
-        <member name="T:OpenMetaverse.StructuredData.OSDType">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDBinary(OpenMetaverse.StructuredData.OSD,System.Boolean)">
             <summary>
-            
+            Serializes OSD to binary format
             </summary>
+            <param name="osd">OSD to serialize</param>
+            <param name="prependHeader">
+            </param>
+            <returns>Serialized data</returns>
         </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.Unknown">
-            <summary></summary>
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDBinaryStream(OpenMetaverse.StructuredData.OSD)">
+            <summary>
+            Serializes OSD to binary format. It does no prepend header
+            </summary>
+            <param name="data">OSD to serialize</param>
+            <returns>Serialized data</returns>
         </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.Boolean">
-            <summary></summary>
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDBinaryStream(OpenMetaverse.StructuredData.OSD,System.Boolean)">
+            <summary>
+            Serializes OSD to binary format
+            </summary>
+            <param name="data">OSD to serialize</param>
+            <param name="prependHeader">
+            </param>
+            <returns>Serialized data</returns>
         </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.Integer">
-            <summary></summary>
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.SkipWhiteSpace(System.IO.Stream)">
+            <summary>
+            </summary>
+            <param name="stream">
+            </param>
         </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.Real">
-            <summary></summary>
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.FindByte(System.IO.Stream,System.Byte)">
+            <summary>
+            </summary>
+            <param name="stream">
+            </param>
+            <param name="toFind">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.String">
-            <summary></summary>
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.FindString(System.IO.Stream,System.String)">
+            <summary>
+            </summary>
+            <param name="stream">
+            </param>
+            <param name="toFind">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.UUID">
-            <summary></summary>
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.ConsumeBytes(System.IO.Stream,System.Int32)">
+            <summary>
+            </summary>
+            <param name="stream">
+            </param>
+            <param name="consumeBytes">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.Date">
-            <summary></summary>
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.NetworkToHostInt(System.Byte[])">
+            <summary>
+            </summary>
+            <param name="binaryNetEnd">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.URI">
-            <summary></summary>
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.NetworkToHostDouble(System.Byte[])">
+            <summary>
+            </summary>
+            <param name="binaryNetEnd">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.Binary">
-            <summary></summary>
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.HostToNetworkIntBytes(System.Int32)">
+            <summary>
+            </summary>
+            <param name="intHostEnd">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.Map">
-            <summary></summary>
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDNotationElement(System.IO.StringReader)">
+            <summary>
+            </summary>
+            <param name="reader">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="F:OpenMetaverse.StructuredData.OSDType.Array">
-            <summary></summary>
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.PeekAndSkipWhitespace(System.IO.StringReader)">
+            <summary>
+            </summary>
+            <param name="reader">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="T:OpenMetaverse.StructuredData.OSDException">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.ReadAndSkipWhitespace(System.IO.StringReader)">
             <summary>
-            
             </summary>
+            <param name="reader">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="T:OpenMetaverse.StructuredData.OSD">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.GetLengthInBrackets(System.IO.StringReader)">
             <summary>
-            
             </summary>
+            <param name="reader">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSD.SerializeMembers(System.Object)">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.GetStringDelimitedBy(System.IO.StringReader,System.Char)">
             <summary>
-            Uses reflection to create an SDMap from all of the SD
-            serializable types in an object
             </summary>
-            <param name="obj">Class or struct containing serializable types</param>
-            <returns>An SDMap holding the serialized values from the
-            container object</returns>
+            <param name="reader">
+            </param>
+            <param name="delimiter">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSD.DeserializeMembers(System.Object@,OpenMetaverse.StructuredData.OSDMap)">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.BufferCharactersEqual(System.IO.StringReader,System.Char[],System.Int32)">
             <summary>
-            Uses reflection to deserialize member variables in an object from
-            an SDMap
             </summary>
-            <param name="obj">Reference to an object to fill with deserialized
-            values</param>
-            <param name="serialized">Serialized values to put in the target
-            object</param>
+            <param name="reader">
+            </param>
+            <param name="buffer">
+            </param>
+            <param name="offset">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="T:OpenMetaverse.StructuredData.OSDBoolean">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.UnescapeCharacter(System.String,System.Char)">
             <summary>
-            
             </summary>
+            <param name="s">
+            </param>
+            <param name="c">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="T:OpenMetaverse.StructuredData.OSDInteger">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.EscapeCharacter(System.String,System.Char)">
             <summary>
-            
             </summary>
+            <param name="s">
+            </param>
+            <param name="c">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="T:OpenMetaverse.StructuredData.OSDReal">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDXml(System.Byte[])">
             <summary>
-            
             </summary>
+            <param name="xmlData">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="T:OpenMetaverse.StructuredData.OSDString">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDXml(System.String)">
             <summary>
-            
             </summary>
+            <param name="xmlData">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="T:OpenMetaverse.StructuredData.OSDUUID">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDXml(System.Xml.XmlTextReader)">
             <summary>
-            
             </summary>
+            <param name="xmlData">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="T:OpenMetaverse.StructuredData.OSDDate">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDXmlBytes(OpenMetaverse.StructuredData.OSD)">
             <summary>
-            
             </summary>
+            <param name="data">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="T:OpenMetaverse.StructuredData.OSDUri">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDXmlString(OpenMetaverse.StructuredData.OSD)">
             <summary>
-            
             </summary>
+            <param name="data">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="T:OpenMetaverse.StructuredData.OSDBinary">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDXmlElement(System.Xml.XmlTextWriter,OpenMetaverse.StructuredData.OSD)">
             <summary>
-            
             </summary>
+            <param name="writer">
+            </param>
+            <param name="data">
+            </param>
         </member>
-        <member name="T:OpenMetaverse.StructuredData.OSDMap">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.TryValidateLLSDXml(System.Xml.XmlTextReader,System.String@)">
             <summary>
-            
             </summary>
+            <param name="xmlData">
+            </param>
+            <param name="error">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="T:OpenMetaverse.StructuredData.OSDArray">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.ParseLLSDXmlElement(System.Xml.XmlTextReader)">
             <summary>
-            
             </summary>
+            <param name="reader">
+            </param>
+            <returns>
+            </returns>
         </member>
     </members>
 </doc>
diff --git a/bin/OpenMetaverse.XML b/bin/OpenMetaverse.XML
index 6e57fed..81cc005 100644
--- a/bin/OpenMetaverse.XML
+++ b/bin/OpenMetaverse.XML
@@ -1,5574 +1,1829 @@
 <?xml version="1.0"?>
 <doc>
     <assembly>
-        <name>OpenMetaverse</name>
+        <name>/home/root/libomv-0.9.1-source/bin/OpenMetaverse</name>
     </assembly>
     <members>
-        <member name="F:OpenMetaverse.Http.EventQueueClient.REQUEST_TIMEOUT">
-            <summary>=</summary>
-        </member>
-        <member name="F:OpenMetaverse.Http.EventQueueClient._errorCount">
-            <summary>Number of times we've received an unknown CAPS exception in series.</summary>
-        </member>
-        <member name="F:OpenMetaverse.Http.EventQueueClient._random">
-            <summary>For exponential backoff on error.</summary>
-        </member>
-        <member name="M:OpenMetaverse.Packets.PacketDecoder.AddCallback(System.String,OpenMetaverse.Packets.PacketDecoder.CustomPacketDecoder)">
-            <summary>
-            Add a custom decoder callback
-            </summary>
-            <param name="key">The key of the field to decode</param>
-            <param name="customPacketHandler">The custom decode handler</param>
-        </member>
-        <member name="M:OpenMetaverse.Packets.PacketDecoder.RemoveCustomHandler(System.String,OpenMetaverse.Packets.PacketDecoder.CustomPacketDecoder)">
-            <summary>
-            Remove a custom decoder callback
-            </summary>
-            <param name="key">The key of the field to decode</param>
-            <param name="customPacketHandler">The custom decode handler</param>
-        </member>
-        <member name="M:OpenMetaverse.Packets.PacketDecoder.PacketToString(OpenMetaverse.Packets.Packet)">
-            <summary>
-            Creates a formatted string containing the values of a Packet
-            </summary>
-            <param name="packet">The Packet</param>
-            <returns>A formatted string of values of the nested items in the Packet object</returns>
-        </member>
-        <member name="M:OpenMetaverse.Packets.PacketDecoder.MessageToString(System.Object,System.Int32)">
-            <summary>
-            Decode an IMessage object into a beautifully formatted string
-            </summary>
-            <param name="message">The IMessage object</param>
-            <param name="recurseLevel">Recursion level (used for indenting)</param>
-            <returns>A formatted string containing the names and values of the source object</returns>
-        </member>
-        <member name="T:OpenMetaverse.Packets.PacketDecoder.CustomPacketDecoder">
-            <summary>
-            A custom decoder callback
-            </summary>
-            <param name="fieldName">The key of the object</param>
-            <param name="fieldData">the data to decode</param>
-            <returns>A string represending the fieldData</returns>
-        </member>
-        <member name="T:OpenMetaverse.DirectoryManager">
-            <summary>
-            Access to the data server which allows searching for land, events, people, etc
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_EventInfoReply">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.OnEventInfo(OpenMetaverse.EventInfoReplyEventArgs)">
-            <summary>Raises the EventInfoReply event</summary>
-            <param name="e">An EventInfoReplyEventArgs object containing the
-            data returned from the data server</param>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_EventDetailLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirEvents">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.OnDirEvents(OpenMetaverse.DirEventsReplyEventArgs)">
-            <summary>Raises the DirEventsReply event</summary>
-            <param name="e">An DirEventsReplyEventArgs object containing the
-            data returned from the data server</param>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirEventsLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_Places">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.OnPlaces(OpenMetaverse.PlacesReplyEventArgs)">
-            <summary>Raises the PlacesReply event</summary>
-            <param name="e">A PlacesReplyEventArgs object containing the
-            data returned from the data server</param>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_PlacesLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirPlaces">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.OnDirPlaces(OpenMetaverse.DirPlacesReplyEventArgs)">
-            <summary>Raises the DirPlacesReply event</summary>
-            <param name="e">A DirPlacesReplyEventArgs object containing the
-            data returned from the data server</param>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirPlacesLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirClassifieds">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.OnDirClassifieds(OpenMetaverse.DirClassifiedsReplyEventArgs)">
-            <summary>Raises the DirClassifiedsReply event</summary>
-            <param name="e">A DirClassifiedsReplyEventArgs object containing the
-            data returned from the data server</param>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirClassifiedsLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirGroups">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.OnDirGroups(OpenMetaverse.DirGroupsReplyEventArgs)">
-            <summary>Raises the DirGroupsReply event</summary>
-            <param name="e">A DirGroupsReplyEventArgs object containing the
-            data returned from the data server</param>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirGroupsLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirPeople">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.OnDirPeople(OpenMetaverse.DirPeopleReplyEventArgs)">
-            <summary>Raises the DirPeopleReply event</summary>
-            <param name="e">A DirPeopleReplyEventArgs object containing the
-            data returned from the data server</param>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirPeopleLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirLandReply">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.OnDirLand(OpenMetaverse.DirLandReplyEventArgs)">
-            <summary>Raises the DirLandReply event</summary>
-            <param name="e">A DirLandReplyEventArgs object containing the
-            data returned from the data server</param>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.m_DirLandLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Constructs a new instance of the DirectoryManager class
-            </summary>
-            <param name="client">An instance of GridClient</param>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartClassifiedSearch(System.String)">
-            <summary>
-            Query the data server for a list of classified ads containing the specified string.
-            Defaults to searching for classified placed in any category, and includes PG, Adult and Mature 
-            results.
-            
-            Responses are sent 16 per response packet, there is no way to know how many results a query reply will contain however assuming
-            the reply packets arrived ordered, a response with less than 16 entries would indicate all results have been received
-            
-            The <see cref="!:OnClassifiedReply"/> event is raised when a response is received from the simulator
-            </summary>
-            <param name="searchText">A string containing a list of keywords to search for</param>
-            <returns>A UUID to correlate the results when the <see cref="!:OnClassifiedReply"/> event is raised</returns>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartClassifiedSearch(System.String,OpenMetaverse.DirectoryManager.ClassifiedCategories,OpenMetaverse.DirectoryManager.ClassifiedQueryFlags)">
-            <summary>
-            Query the data server for a list of classified ads which contain specified keywords (Overload)
-            
-            The <see cref="!:OnClassifiedReply"/> event is raised when a response is received from the simulator
-            </summary>
-            <param name="searchText">A string containing a list of keywords to search for</param>
-            <param name="category">The category to search</param>
-            <param name="queryFlags">A set of flags which can be ORed to modify query options 
-            such as classified maturity rating.</param>
-            <returns>A UUID to correlate the results when the <see cref="!:OnClassifiedReply"/> event is raised</returns>
-            <example>
-            Search classified ads containing the key words "foo" and "bar" in the "Any" category that are either PG or Mature
-            <code>
-            UUID searchID = StartClassifiedSearch("foo bar", ClassifiedCategories.Any, ClassifiedQueryFlags.PG | ClassifiedQueryFlags.Mature);
-            </code>
-            </example>
-            <remarks>        
-            Responses are sent 16 at a time, there is no way to know how many results a query reply will contain however assuming
-            the reply packets arrived ordered, a response with less than 16 entries would indicate all results have been received
-            </remarks>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartDirPlacesSearch(System.String,System.Int32)">
+        <member name="T:OpenMetaverse.ScriptPermission">
             <summary>
-            Starts search for places (Overloaded)
-            
-            The <see cref="!:OnDirPlacesReply"/> event is raised when a response is received from the simulator
+            Permission request flags, asked when a script wants to control an Avatar
             </summary>
-            <param name="searchText">Search text</param>
-            <param name="queryStart">Each request is limited to 100 places
-            being returned. To get the first 100 result entries of a request use 0,
-            from 100-199 use 1, 200-299 use 2, etc.</param>        
-            <returns>A UUID to correlate the results when the <see cref="!:OnDirPlacesReply"/> event is raised</returns>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartDirPlacesSearch(System.String,OpenMetaverse.DirectoryManager.DirFindFlags,OpenMetaverse.ParcelCategory,System.Int32)">
-            <summary>
-            Queries the dataserver for parcels of land which are flagged to be shown in search
-            
-            The <see cref="!:OnDirPlacesReply"/> event is raised when a response is received from the simulator
-            </summary>
-            <param name="searchText">A string containing a list of keywords to search for separated by a space character</param>
-            <param name="queryFlags">A set of flags which can be ORed to modify query options 
-            such as classified maturity rating.</param>
-            <param name="category">The category to search</param>        
-            <param name="queryStart">Each request is limited to 100 places
-            being returned. To get the first 100 result entries of a request use 0,
-            from 100-199 use 1, 200-299 use 2, etc.</param>        
-            <returns>A UUID to correlate the results when the <see cref="!:OnDirPlacesReply"/> event is raised</returns>
-            <example>
-            Search places containing the key words "foo" and "bar" in the "Any" category that are either PG or Adult
-            <code>
-            UUID searchID = StartDirPlacesSearch("foo bar", DirFindFlags.DwellSort | DirFindFlags.IncludePG | DirFindFlags.IncludeAdult, ParcelCategory.Any, 0);
-            </code>
-            </example>
-            <remarks>        
-            Additional information on the results can be obtained by using the ParcelManager.InfoRequest method
-            </remarks>
+        <member name="F:OpenMetaverse.ScriptPermission.None">
+            <summary>Placeholder for empty values, shouldn't ever see this</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartLandSearch(OpenMetaverse.DirectoryManager.SearchTypeFlags)">
-            <summary>
-            Starts a search for land sales using the directory
-            
-            The <see cref="!:OnDirLandReply"/> event is raised when a response is received from the simulator
-            </summary>
-            <param name="typeFlags">What type of land to search for. Auction, 
-            estate, mainland, "first land", etc</param>        
-            <remarks>The OnDirLandReply event handler must be registered before
-            calling this function. There is no way to determine how many 
-            results will be returned, or how many times the callback will be 
-            fired other than you won't get more than 100 total parcels from 
-            each query.</remarks>
+        <member name="F:OpenMetaverse.ScriptPermission.Debit">
+            <summary>Script wants ability to take money from you</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartLandSearch(OpenMetaverse.DirectoryManager.SearchTypeFlags,System.Int32,System.Int32,System.Int32)">
-            <summary>
-            Starts a search for land sales using the directory
-            
-            The <seealso cref="!:OnDirLandReply"/> event is raised when a response is received from the simulator
-            </summary>
-            <param name="typeFlags">What type of land to search for. Auction, 
-            estate, mainland, "first land", etc</param>
-            <param name="priceLimit">Maximum price to search for</param>
-            <param name="areaLimit">Maximum area to search for</param>
-            <param name="queryStart">Each request is limited to 100 parcels
-            being returned. To get the first 100 parcels of a request use 0,
-            from 100-199 use 1, 200-299 use 2, etc.</param>        
-            <remarks>The OnDirLandReply event handler must be registered before
-            calling this function. There is no way to determine how many 
-            results will be returned, or how many times the callback will be 
-            fired other than you won't get more than 100 total parcels from 
-            each query.</remarks>
+        <member name="F:OpenMetaverse.ScriptPermission.TakeControls">
+            <summary>Script wants to take camera controls for you</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartLandSearch(OpenMetaverse.DirectoryManager.DirFindFlags,OpenMetaverse.DirectoryManager.SearchTypeFlags,System.Int32,System.Int32,System.Int32)">
-            <summary>
-            Send a request to the data server for land sales listings
-            </summary>
-            
-            <param name="findFlags">Flags sent to specify query options
-            
-            Available flags:
-            Specify the parcel rating with one or more of the following:
-                IncludePG IncludeMature IncludeAdult
-            
-            Specify the field to pre sort the results with ONLY ONE of the following:
-                PerMeterSort NameSort AreaSort PricesSort
-                
-            Specify the order the results are returned in, if not specified the results are pre sorted in a Descending Order
-                SortAsc
-                
-            Specify additional filters to limit the results with one or both of the following:
-                LimitByPrice LimitByArea
-                
-            Flags can be combined by separating them with the | (pipe) character
-            
-            Additional details can be found in <see cref="T:OpenMetaverse.DirectoryManager.DirFindFlags"/>
-            </param>
-            <param name="typeFlags">What type of land to search for. Auction, 
-            Estate or Mainland</param>
-            <param name="priceLimit">Maximum price to search for when the 
-            DirFindFlags.LimitByPrice flag is specified in findFlags</param>
-            <param name="areaLimit">Maximum area to search for when the
-            DirFindFlags.LimitByArea flag is specified in findFlags</param>
-            <param name="queryStart">Each request is limited to 100 parcels
-            being returned. To get the first 100 parcels of a request use 0,
-            from 100-199 use 100, 200-299 use 200, etc.</param>
-            <remarks><para>The <seealso cref="!:OnDirLandReply"/> event will be raised with the response from the simulator 
-            
-            There is no way to determine how many results will be returned, or how many times the callback will be 
-            fired other than you won't get more than 100 total parcels from 
-            each reply.</para>
-            
-            <para>Any land set for sale to either anybody or specific to the connected agent will be included in the
-            results if the land is included in the query</para></remarks>
-            <example>
-            <code>
-            // request all mainland, any maturity rating that is larger than 512 sq.m
-            StartLandSearch(DirFindFlags.SortAsc | DirFindFlags.PerMeterSort | DirFindFlags.LimitByArea | DirFindFlags.IncludePG | DirFindFlags.IncludeMature | DirFindFlags.IncludeAdult, SearchTypeFlags.Mainland, 0, 512, 0);
-            </code></example>
+        <member name="F:OpenMetaverse.ScriptPermission.RemapControls">
+            <summary>Script wants to remap avatars controls</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartGroupSearch(System.String,System.Int32)">
-            <summary>
-            Search for Groups
-            </summary>
-            <param name="searchText">The name or portion of the name of the group you wish to search for</param>
-            <param name="queryStart">Start from the match number</param>
-            <returns></returns>
+        <member name="F:OpenMetaverse.ScriptPermission.TriggerAnimation">
+            <summary>Script wants to trigger avatar animations</summary>
+            <remarks>This function is not implemented on the grid</remarks>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartGroupSearch(System.String,System.Int32,OpenMetaverse.DirectoryManager.DirFindFlags)">
-            <summary>
-            Search for Groups
-            </summary>
-            <param name="searchText">The name or portion of the name of the group you wish to search for</param>
-            <param name="queryStart">Start from the match number</param>
-            <param name="flags">Search flags</param>
-            <returns></returns>
+        <member name="F:OpenMetaverse.ScriptPermission.Attach">
+            <summary>Script wants to attach or detach the prim or primset to your avatar</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartPeopleSearch(System.String,System.Int32)">
-            <summary>
-            Search the People directory for other avatars
-            </summary>
-            <param name="searchText">The name or portion of the name of the avatar you wish to search for</param>
-            <param name="queryStart"></param>
-            <returns></returns>
+        <member name="F:OpenMetaverse.ScriptPermission.ReleaseOwnership">
+            <summary>Script wants permission to release ownership</summary>
+            <remarks>This function is not implemented on the grid
+            The concept of "public" objects does not exist anymore.</remarks>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartPlacesSearch">
-            <summary>
-            Search Places for parcels of land you personally own
-            </summary>
+        <member name="F:OpenMetaverse.ScriptPermission.ChangeLinks">
+            <summary>Script wants ability to link/delink with other prims</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartPlacesSearch(OpenMetaverse.UUID)">
-            <summary>
-            Searches Places for land owned by the specified group
-            </summary>
-            <param name="groupID">ID of the group you want to recieve land list for (You must be a member of the group)</param>
-            <returns>Transaction (Query) ID which can be associated with results from your request.</returns>
+        <member name="F:OpenMetaverse.ScriptPermission.ChangeJoints">
+            <summary>Script wants permission to change joints</summary>
+            <remarks>This function is not implemented on the grid</remarks>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartPlacesSearch(System.String)">
-            <summary>
-            Search the Places directory for parcels that are listed in search and contain the specified keywords
-            </summary>
-            <param name="searchText">A string containing the keywords to search for</param>
-            <returns>Transaction (Query) ID which can be associated with results from your request.</returns>
+        <member name="F:OpenMetaverse.ScriptPermission.ChangePermissions">
+            <summary>Script wants permissions to change permissions</summary>
+            <remarks>This function is not implemented on the grid</remarks>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartPlacesSearch(OpenMetaverse.DirectoryManager.DirFindFlags,OpenMetaverse.ParcelCategory,System.String,System.String,OpenMetaverse.UUID,OpenMetaverse.UUID)">
-            <summary>
-            Search Places - All Options
-            </summary>
-            <param name="findFlags">One of the Values from the DirFindFlags struct, ie: AgentOwned, GroupOwned, etc.</param>
-            <param name="searchCategory">One of the values from the SearchCategory Struct, ie: Any, Linden, Newcomer</param>
-            <param name="searchText">A string containing a list of keywords to search for separated by a space character</param>
-            <param name="simulatorName">String Simulator Name to search in</param>
-            <param name="groupID">LLUID of group you want to recieve results for</param>
-            <param name="transactionID">Transaction (Query) ID which can be associated with results from your request.</param>
-            <returns>Transaction (Query) ID which can be associated with results from your request.</returns>
+        <member name="F:OpenMetaverse.ScriptPermission.TrackCamera">
+            <summary>Script wants to track avatars camera position and rotation </summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartEventsSearch(System.String,System.UInt32)">
-            <summary>
-            Search All Events with specifid searchText in all categories, includes PG, Mature and Adult
-            </summary>
-            <param name="searchText">A string containing a list of keywords to search for separated by a space character</param>
-            <param name="queryStart">Each request is limited to 100 entries
-            being returned. To get the first group of entries of a request use 0,
-            from 100-199 use 100, 200-299 use 200, etc.</param>
-            <returns>UUID of query to correlate results in callback.</returns>
+        <member name="F:OpenMetaverse.ScriptPermission.ControlCamera">
+            <summary>Script wants to control your camera</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.StartEventsSearch(System.String,OpenMetaverse.DirectoryManager.DirFindFlags,System.String,System.UInt32,OpenMetaverse.DirectoryManager.EventCategories)">
+        <member name="T:OpenMetaverse.InstantMessageDialog">
             <summary>
-            Search Events
+            Special commands used in Instant Messages
             </summary>
-            <param name="searchText">A string containing a list of keywords to search for separated by a space character</param>
-            <param name="queryFlags">One or more of the following flags: DateEvents, IncludePG, IncludeMature, IncludeAdult
-            from the <see cref="T:OpenMetaverse.DirectoryManager.DirFindFlags"/> Enum
-            
-            Multiple flags can be combined by separating the flags with the | (pipe) character</param>
-            <param name="eventDay">"u" for in-progress and upcoming events, -or- number of days since/until event is scheduled
-            For example "0" = Today, "1" = tomorrow, "2" = following day, "-1" = yesterday, etc.</param>
-            <param name="queryStart">Each request is limited to 100 entries
-            being returned. To get the first group of entries of a request use 0,
-            from 100-199 use 100, 200-299 use 200, etc.</param>
-            <param name="category">EventCategory event is listed under.</param>
-            <returns>UUID of query to correlate results in callback.</returns>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.EventInfoRequest(System.UInt32)">
-            <summary>Requests Event Details</summary>
-            <param name="eventID">ID of Event returned from the <see cref="M:OpenMetaverse.DirectoryManager.StartEventsSearch(System.String,System.UInt32)"/> method</param>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.DirClassifiedReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.DirLandReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.DirLandReplyEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
-            <summary>Process an incoming <see cref="T:OpenMetaverse.Messages.Linden.DirLandReplyMessage"/> event message</summary>
-            <param name="capsKey">The Unique Capabilities Key</param>
-            <param name="message">The <see cref="T:OpenMetaverse.Messages.Linden.DirLandReplyMessage"/> event message containing the data</param>
-            <param name="simulator">The simulator the message originated from</param>
+        <member name="F:OpenMetaverse.InstantMessageDialog.MessageFromAgent">
+            <summary>Indicates a regular IM from another agent</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.DirPeopleReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.InstantMessageDialog.MessageBox">
+            <summary>Simple notification box with an OK button</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.DirGroupsReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupInvitation">
+            <summary>You've been invited to join a group.</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.PlacesReplyEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
-            <summary>Process an incoming <see cref="T:OpenMetaverse.Messages.Linden.PlacesReplyMessage"/> event message</summary>
-            <param name="capsKey">The Unique Capabilities Key</param>
-            <param name="message">The <see cref="T:OpenMetaverse.Messages.Linden.PlacesReplyMessage"/> event message containing the data</param>
-            <param name="simulator">The simulator the message originated from</param>
+        <member name="F:OpenMetaverse.InstantMessageDialog.InventoryOffered">
+            <summary>Inventory offer</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.PlacesReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.InstantMessageDialog.InventoryAccepted">
+            <summary>Accepted inventory offer</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.EventsReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.InstantMessageDialog.InventoryDeclined">
+            <summary>Declined inventory offer</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.EventInfoReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupVote">
+            <summary>Group vote</summary>
         </member>
-        <member name="M:OpenMetaverse.DirectoryManager.DirPlacesReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.InstantMessageDialog.TaskInventoryOffered">
+            <summary>An object is offering its inventory</summary>
         </member>
-        <member name="E:OpenMetaverse.DirectoryManager.EventInfoReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.EventInfoRequest(System.UInt32)"/> request.</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.TaskInventoryAccepted">
+            <summary>Accept an inventory offer from an object</summary>
         </member>
-        <member name="E:OpenMetaverse.DirectoryManager.DirEventsReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartEventsSearch(System.String,System.UInt32)"/> request.</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.TaskInventoryDeclined">
+            <summary>Decline an inventory offer from an object</summary>
         </member>
-        <member name="E:OpenMetaverse.DirectoryManager.PlacesReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartPlacesSearch"/> request.</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.NewUserDefault">
+            <summary>Unknown</summary>
         </member>
-        <member name="E:OpenMetaverse.DirectoryManager.DirPlacesReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartDirPlacesSearch(System.String,System.Int32)"/> request.</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.SessionAdd">
+            <summary>Start a session, or add users to a session</summary>
         </member>
-        <member name="E:OpenMetaverse.DirectoryManager.DirClassifiedsReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartClassifiedSearch(System.String,OpenMetaverse.DirectoryManager.ClassifiedCategories,System.Boolean)"/> request.</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.SessionOfflineAdd">
+            <summary>Start a session, but don't prune offline users</summary>
         </member>
-        <member name="E:OpenMetaverse.DirectoryManager.DirGroupsReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartGroupSearch(System.String,System.Int32)"/> request.</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.SessionGroupStart">
+            <summary>Start a session with your group</summary>
         </member>
-        <member name="E:OpenMetaverse.DirectoryManager.DirPeopleReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartPeopleSearch(System.String,System.Int32)"/> request.</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.SessionCardlessStart">
+            <summary>Start a session without a calling card (finder or objects)</summary>
         </member>
-        <member name="E:OpenMetaverse.DirectoryManager.DirLandReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartLandSearch(OpenMetaverse.DirectoryManager.SearchTypeFlags)"/> request.</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.SessionSend">
+            <summary>Send a message to a session</summary>
         </member>
-        <member name="T:OpenMetaverse.DirectoryManager.ClassifiedCategories">
-            <summary>Classified Ad categories</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.SessionDrop">
+            <summary>Leave a session</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Any">
-            <summary>Classified is listed in the Any category</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.MessageFromObject">
+            <summary>Indicates that the IM is from an object</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Shopping">
-            <summary>Classified is shopping related</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.BusyAutoResponse">
+            <summary>Sent an IM to a busy user, this is the auto response</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.LandRental">
-            <summary>Classified is </summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.ConsoleAndChatHistory">
+            <summary>Shows the message in the console and chat history</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.PropertyRental">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.RequestTeleport">
+            <summary>Send a teleport lure</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.SpecialAttraction">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.AcceptTeleport">
+            <summary>Response sent to the agent which inititiated a teleport invitation</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.NewProducts">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.DenyTeleport">
+            <summary>Response sent to the agent which inititiated a teleport invitation</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Employment">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GodLikeRequestTeleport">
+            <summary>Only useful if you have Linden permissions</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Wanted">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.CurrentlyUnused">
+            <summary>A placeholder type for future expansion, currently not
+            used</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Service">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GotoUrl">
+            <summary>IM to tell the user to go to an URL</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Personal">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.Session911Start">
+            <summary>IM for help</summary>
         </member>
-        <member name="T:OpenMetaverse.DirectoryManager.EventCategories">
-            <summary>Event Categories</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.Lure911">
+            <summary>IM sent automatically on call for help, sends a lure
+            to each Helper reached</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.All">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.FromTaskAsAlert">
+            <summary>Like an IM but won't go to email</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Discussion">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupNotice">
+            <summary>IM from a group officer to all group members</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Sports">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupNoticeInventoryAccepted">
+            <summary>Unknown</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.LiveMusic">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupNoticeInventoryDeclined">
+            <summary>Unknown</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Commercial">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupInvitationAccept">
+            <summary>Accept a group invitation</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Nightlife">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupInvitationDecline">
+            <summary>Decline a group invitation</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Games">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupNoticeRequested">
+            <summary>Unknown</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Pageants">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.FriendshipOffered">
+            <summary>An avatar is offering you friendship</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Education">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.FriendshipAccepted">
+            <summary>An avatar has accepted your friendship offer</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Arts">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.FriendshipDeclined">
+            <summary>An avatar has declined your friendship offer</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Charity">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.StartTyping">
+            <summary>Indicates that a user has started typing</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Miscellaneous">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.StopTyping">
+            <summary>Indicates that a user has stopped typing</summary>
         </member>
-        <member name="T:OpenMetaverse.DirectoryManager.DirFindFlags">
+        <member name="T:OpenMetaverse.InstantMessageOnline">
             <summary>
-            Query Flags used in many of the DirectoryManager methods to specify which query to execute and how to return the results.
-            
-            Flags can be combined using the | (pipe) character, not all flags are available in all queries
+            Flag in Instant Messages, whether the IM should be delivered to
+            offline avatars as well
             </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.People">
-            <summary>Query the People database</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.Online">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.Events">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.Groups">
-            <summary>Query the Groups database</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.DateEvents">
-            <summary>Query the Events database</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.AgentOwned">
-            <summary>Query the land holdings database for land owned by the currently connected agent</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.ForSale">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.GroupOwned">
-            <summary>Query the land holdings database for land which is owned by a Group</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.DwellSort">
-            <summary>Specifies the query should pre sort the results based upon traffic
-            when searching the Places database</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PgSimsOnly">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PicturesOnly">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PgEventsOnly">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.MatureSimsOnly">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.SortAsc">
-            <summary>Specifies the query should pre sort the results in an ascending order when searching the land sales database. 
-            This flag is only used when searching the land sales database</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PricesSort">
-            <summary>Specifies the query should pre sort the results using the SalePrice field when searching the land sales database. 
-            This flag is only used when searching the land sales database</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PerMeterSort">
-            <summary>Specifies the query should pre sort the results by calculating the average price/sq.m (SalePrice / Area) when searching the land sales database. 
-            This flag is only used when searching the land sales database</summary>
+        <member name="F:OpenMetaverse.InstantMessageOnline.Online">
+            <summary>Only deliver to online avatars</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.AreaSort">
-            <summary>Specifies the query should pre sort the results using the ParcelSize field when searching the land sales database. 
-            This flag is only used when searching the land sales database</summary>
+        <member name="F:OpenMetaverse.InstantMessageOnline.Offline">
+            <summary>If the avatar is offline the message will be held until
+            they login next, and possibly forwarded to their e-mail account</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.NameSort">
-            <summary>Specifies the query should pre sort the results using the Name field when searching the land sales database. 
-            This flag is only used when searching the land sales database</summary>
+        <member name="T:OpenMetaverse.ChatType">
+            <summary>
+            Conversion type to denote Chat Packet types in an easier-to-understand format
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.LimitByPrice">
-            <summary>When set, only parcels less than the specified Price will be included when searching the land sales database.
-            This flag is only used when searching the land sales database</summary>
+        <member name="F:OpenMetaverse.ChatType.Whisper">
+            <summary>Whisper (5m radius)</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.LimitByArea">
-            <summary>When set, only parcels greater than the specified Size will be included when searching the land sales database.
-            This flag is only used when searching the land sales database</summary>
+        <member name="F:OpenMetaverse.ChatType.Normal">
+            <summary>Normal chat (10/20m radius), what the official viewer typically sends</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.FilterMature">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ChatType.Shout">
+            <summary>Shouting! (100m radius)</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PGOnly">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ChatType.StartTyping">
+            <summary>Event message when an Avatar has begun to type</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.IncludePG">
-            <summary>Include PG land in results. This flag is used when searching both the Groups, Events and Land sales databases</summary>
+        <member name="F:OpenMetaverse.ChatType.StopTyping">
+            <summary>Event message when an Avatar has stopped typing</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.IncludeMature">
-            <summary>Include Mature land in results. This flag is used when searching both the Groups, Events and Land sales databases</summary>
+        <member name="F:OpenMetaverse.ChatType.Debug">
+            <summary>Send the message to the debug channel</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.IncludeAdult">
-            <summary>Include Adult land in results. This flag is used when searching both the Groups, Events and Land sales databases</summary>
+        <member name="F:OpenMetaverse.ChatType.OwnerSay">
+            <summary>Event message when an object uses llOwnerSay</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.AdultOnly">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ChatType.RegionSay">
+            <summary>Special value to support llRegionSay, never sent to the client</summary>
         </member>
-        <member name="T:OpenMetaverse.DirectoryManager.SearchTypeFlags">
+        <member name="T:OpenMetaverse.ChatSourceType">
             <summary>
-            Land types to search dataserver for
+            Identifies the source of a chat message
             </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.SearchTypeFlags.Any">
-            <summary>Search Auction, Mainland and Estate</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.SearchTypeFlags.Auction">
-            <summary>Land which is currently up for auction</summary>
+        <member name="F:OpenMetaverse.ChatSourceType.System">
+            <summary>Chat from the grid or simulator</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.SearchTypeFlags.Mainland">
-            <summary>Parcels which are on the mainland (Linden owned) continents</summary>
+        <member name="F:OpenMetaverse.ChatSourceType.Agent">
+            <summary>Chat from another avatar</summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.SearchTypeFlags.Estate">
-            <summary>Parcels which are on privately owned simulators</summary>
+        <member name="F:OpenMetaverse.ChatSourceType.Object">
+            <summary>Chat from an object</summary>
         </member>
-        <member name="T:OpenMetaverse.DirectoryManager.EventFlags">
+        <member name="T:OpenMetaverse.ChatAudibleLevel">
             <summary>
-            The content rating of the event
             </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventFlags.PG">
-            <summary>Event is PG</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventFlags.Mature">
-            <summary>Event is Mature</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventFlags.Adult">
-            <summary>Event is Adult</summary>
-        </member>
-        <member name="T:OpenMetaverse.DirectoryManager.ClassifiedFlags">
+        <member name="F:OpenMetaverse.ChatAudibleLevel.Not">
             <summary>
-            Classified Ad Options
             </summary>
-            <remarks>There appear to be two formats the flags are packed in.
-            This set of flags is for the newer style</remarks>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.None">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.Mature">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.Enabled">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.UpdateTime">
-            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.AutoRenew">
-            <summary></summary>
-        </member>
-        <member name="T:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags">
+        <member name="F:OpenMetaverse.ChatAudibleLevel.Barely">
             <summary>
-            Classified ad query options
             </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags.All">
-            <summary>Include all ads in results</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags.PG">
-            <summary>Include PG ads in results</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags.Mature">
-            <summary>Include Mature ads in results</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags.Adult">
-            <summary>Include Adult ads in results</summary>
-        </member>
-        <member name="T:OpenMetaverse.DirectoryManager.PlacesFlags">
+        <member name="F:OpenMetaverse.ChatAudibleLevel.Fully">
             <summary>
-            The For Sale flag in PlacesReplyData
             </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesFlags.NotForSale">
-            <summary>Parcel is not listed for sale</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesFlags.ForSale">
-            <summary>Parcel is For Sale</summary>
-        </member>
-        <member name="T:OpenMetaverse.DirectoryManager.Classified">
+        <member name="T:OpenMetaverse.EffectType">
             <summary>
-            A classified ad on the grid
+            Effect type used in ViewerEffect packets
             </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.Classified.ID">
-            <summary>UUID for this ad, useful for looking up detailed
-            information about it</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.Classified.Name">
-            <summary>The title of this classified ad</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.Classified.Flags">
-            <summary>Flags that show certain options applied to the classified</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.Classified.CreationDate">
-            <summary>Creation date of the ad</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.Classified.ExpirationDate">
-            <summary>Expiration date of the ad</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.Classified.Price">
-            <summary>Price that was paid for this ad</summary>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.Classified.ToString">
-            <summary>Print the struct data as a string</summary>
-            <returns>A string containing the field name, and field value</returns>
-        </member>
-        <member name="T:OpenMetaverse.DirectoryManager.DirectoryParcel">
+        <member name="F:OpenMetaverse.EffectType.Text">
             <summary>
-            A parcel retrieved from the dataserver such as results from the 
-            "For-Sale" listings or "Places" Search
             </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.ID">
-            <summary>The unique dataserver parcel ID</summary>
-            <remarks>This id is used to obtain additional information from the entry
-            by using the <see cref="!:ParcelManager.InfoRequest"/> method</remarks>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.Name">
-            <summary>A string containing the name of the parcel</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.ActualArea">
-            <summary>The size of the parcel</summary>
-            <remarks>This field is not returned for Places searches</remarks>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.SalePrice">
-            <summary>The price of the parcel</summary>
-            <remarks>This field is not returned for Places searches</remarks>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.Auction">
-            <summary>If True, this parcel is flagged to be auctioned</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.ForSale">
-            <summary>If true, this parcel is currently set for sale</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.Dwell">
-            <summary>Parcel traffic</summary>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.DirectoryParcel.ToString">
-            <summary>Print the struct data as a string</summary>
-            <returns>A string containing the field name, and field value</returns>
-        </member>
-        <member name="T:OpenMetaverse.DirectoryManager.AgentSearchData">
+        <member name="F:OpenMetaverse.EffectType.Icon">
             <summary>
-            An Avatar returned from the dataserver
             </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.AgentSearchData.Online">
-            <summary>Online status of agent</summary>
-            <remarks>This field appears to be obsolete and always returns false</remarks>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.AgentSearchData.FirstName">
-            <summary>The agents first name</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.AgentSearchData.LastName">
-            <summary>The agents last name</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.AgentSearchData.AgentID">
-            <summary>The agents <see cref="T:OpenMetaverse.UUID"/></summary>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.AgentSearchData.ToString">
-            <summary>Print the struct data as a string</summary>
-            <returns>A string containing the field name, and field value</returns>
-        </member>
-        <member name="T:OpenMetaverse.DirectoryManager.GroupSearchData">
+        <member name="F:OpenMetaverse.EffectType.Connector">
             <summary>
-             Response to a "Groups" Search
             </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.GroupSearchData.GroupID">
-            <summary>The Group ID</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.GroupSearchData.GroupName">
-            <summary>The name of the group</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.GroupSearchData.Members">
-            <summary>The current number of members</summary>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.GroupSearchData.ToString">
-            <summary>Print the struct data as a string</summary>
-            <returns>A string containing the field name, and field value</returns>
-        </member>
-        <member name="T:OpenMetaverse.DirectoryManager.PlacesSearchData">
+        <member name="F:OpenMetaverse.EffectType.FlexibleObject">
             <summary>
-            Parcel information returned from a <see cref="M:OpenMetaverse.DirectoryManager.StartPlacesSearch"/> request
-            <para>
-            Represents one of the following:
-            A parcel of land on the grid that has its Show In Search flag set
-            A parcel of land owned by the agent making the request
-            A parcel of land owned by a group the agent making the request is a member of
-            </para>
-            <para>
-            In a request for Group Land, the First record will contain an empty record
-            </para>
-            Note: This is not the same as searching the land for sale data source
             </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.OwnerID">
-            <summary>The ID of the Agent of Group that owns the parcel</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.Name">
-            <summary>The name</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.Desc">
-            <summary>The description</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.ActualArea">
-            <summary>The Size of the parcel</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.BillableArea">
-            <summary>The billable Size of the parcel, for mainland
-            parcels this will match the ActualArea field. For Group owned land this will be 10 percent smaller
-            than the ActualArea. For Estate land this will always be 0</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.Flags">
-            <summary>Indicates the ForSale status of the parcel</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.GlobalX">
-            <summary>The Gridwide X position</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.GlobalY">
-            <summary>The Gridwide Y position</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.GlobalZ">
-            <summary>The Z position of the parcel, or 0 if no landing point set</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.SimName">
-            <summary>The name of the Region the parcel is located in</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.SnapshotID">
-            <summary>The Asset ID of the parcels Snapshot texture</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.Dwell">
-            <summary>The calculated visitor traffic</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.SKU">
-            <summary>The billing product SKU</summary>
-            <remarks>Known values are:
-            <list type="table">
-            <item><term>023</term><description>Mainland / Full Region</description></item>
-            <item><term>024</term><description>Estate / Full Region</description></item>
-            <item><term>027</term><description>Estate / Openspace</description></item>
-            <item><term>029</term><description>Estate / Homestead</description></item>
-            <item><term>129</term><description>Mainland / Homestead (Linden Owned)</description></item>
-            </list>
-            </remarks>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.Price">
-            <summary>No longer used, will always be 0</summary>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.PlacesSearchData.ToSLurl">
-            <summary>Get a SL URL for the parcel</summary>
-            <returns>A string, containing a standard SLURL</returns>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.PlacesSearchData.ToString">
-            <summary>Print the struct data as a string</summary>
-            <returns>A string containing the field name, and field value</returns>
-        </member>
-        <member name="T:OpenMetaverse.DirectoryManager.EventsSearchData">
+        <member name="F:OpenMetaverse.EffectType.AnimalControls">
             <summary>
-            An "Event" Listing summary
             </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventsSearchData.Owner">
-            <summary>The ID of the event creator</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventsSearchData.Name">
-            <summary>The name of the event</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventsSearchData.ID">
-            <summary>The events ID</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventsSearchData.Date">
-            <summary>A string containing the short date/time the event will begin</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventsSearchData.Time">
-            <summary>The event start time in Unixtime (seconds since epoch)</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventsSearchData.Flags">
-            <summary>The events maturity rating</summary>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.EventsSearchData.ToString">
-            <summary>Print the struct data as a string</summary>
-            <returns>A string containing the field name, and field value</returns>
-        </member>
-        <member name="T:OpenMetaverse.DirectoryManager.EventInfo">
+        <member name="F:OpenMetaverse.EffectType.AnimationObject">
             <summary>
-            The details of an "Event"
             </summary>
         </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.ID">
-            <summary>The events ID</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Creator">
-            <summary>The ID of the event creator</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Name">
-            <summary>The name of the event</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Category">
-            <summary>The category</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Desc">
-            <summary>The events description</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Date">
-            <summary>The short date/time the event will begin</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.DateUTC">
-            <summary>The event start time in Unixtime (seconds since epoch) UTC adjusted</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Duration">
-            <summary>The length of the event in minutes</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Cover">
-            <summary>0 if no cover charge applies</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Amount">
-            <summary>The cover charge amount in L$ if applicable</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.SimName">
-            <summary>The name of the region where the event is being held</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.GlobalPos">
-            <summary>The gridwide location of the event</summary>
-        </member>
-        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Flags">
-            <summary>The maturity rating</summary>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.EventInfo.ToSLurl">
-            <summary>Get a SL URL for the parcel where the event is hosted</summary>
-            <returns>A string, containing a standard SLURL</returns>
-        </member>
-        <member name="M:OpenMetaverse.DirectoryManager.EventInfo.ToString">
-            <summary>Print the struct data as a string</summary>
-            <returns>A string containing the field name, and field value</returns>
-        </member>
-        <member name="T:OpenMetaverse.EventInfoReplyEventArgs">
-            <summary>Contains the Event data returned from the data server from an EventInfoRequest</summary>
-        </member>
-        <member name="M:OpenMetaverse.EventInfoReplyEventArgs.#ctor(OpenMetaverse.DirectoryManager.EventInfo)">
-            <summary>Construct a new instance of the EventInfoReplyEventArgs class</summary>
-            <param name="matchedEvent">A single EventInfo object containing the details of an event</param>
-        </member>
-        <member name="P:OpenMetaverse.EventInfoReplyEventArgs.MatchedEvent">
+        <member name="F:OpenMetaverse.EffectType.Cloth">
             <summary>
-            A single EventInfo object containing the details of an event
             </summary>
         </member>
-        <member name="T:OpenMetaverse.DirEventsReplyEventArgs">
-            <summary>Contains the "Event" detail data returned from the data server</summary>
-        </member>
-        <member name="M:OpenMetaverse.DirEventsReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.EventsSearchData})">
-            <summary>Construct a new instance of the DirEventsReplyEventArgs class</summary>
-            <param name="queryID">The ID of the query returned by the data server. 
-            This will correlate to the ID returned by the <see cref="!:StartEventsSearch"/> method</param>
-            <param name="matchedEvents">A list containing the "Events" returned by the search query</param>
-        </member>
-        <member name="P:OpenMetaverse.DirEventsReplyEventArgs.QueryID">
-            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartEventsSearch(System.String,System.UInt32)"/></summary>
-        </member>
-        <member name="P:OpenMetaverse.DirEventsReplyEventArgs.MatchedEvents">
-            <summary>A list of "Events" returned by the data server</summary>
-        </member>
-        <member name="T:OpenMetaverse.PlacesReplyEventArgs">
-            <summary>Contains the "Event" list data returned from the data server</summary>
-        </member>
-        <member name="M:OpenMetaverse.PlacesReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.PlacesSearchData})">
-            <summary>Construct a new instance of PlacesReplyEventArgs class</summary>
-            <param name="queryID">The ID of the query returned by the data server. 
-            This will correlate to the ID returned by the <see cref="!:StartPlacesSearch"/> method</param>
-            <param name="matchedPlaces">A list containing the "Places" returned by the data server query</param>
-        </member>
-        <member name="P:OpenMetaverse.PlacesReplyEventArgs.QueryID">
-            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartPlacesSearch"/></summary>
-        </member>
-        <member name="P:OpenMetaverse.PlacesReplyEventArgs.MatchedPlaces">
-            <summary>A list of "Places" returned by the data server</summary>
-        </member>
-        <member name="T:OpenMetaverse.DirPlacesReplyEventArgs">
-            <summary>Contains the places data returned from the data server</summary>
-        </member>
-        <member name="M:OpenMetaverse.DirPlacesReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.DirectoryParcel})">
-            <summary>Construct a new instance of the DirPlacesReplyEventArgs class</summary>
-            <param name="queryID">The ID of the query returned by the data server. 
-            This will correlate to the ID returned by the <see cref="!:StartDirPlacesSearch"/> method</param>
-            <param name="matchedParcels">A list containing land data returned by the data server</param>
-        </member>
-        <member name="P:OpenMetaverse.DirPlacesReplyEventArgs.QueryID">
-            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartDirPlacesSearch(System.String,System.Int32)"/></summary>
-        </member>
-        <member name="P:OpenMetaverse.DirPlacesReplyEventArgs.MatchedParcels">
-            <summary>A list containing Places data returned by the data server</summary>
-        </member>
-        <member name="T:OpenMetaverse.DirClassifiedsReplyEventArgs">
-            <summary>Contains the classified data returned from the data server</summary>
-        </member>
-        <member name="M:OpenMetaverse.DirClassifiedsReplyEventArgs.#ctor(System.Collections.Generic.List{OpenMetaverse.DirectoryManager.Classified})">
-            <summary>Construct a new instance of the DirClassifiedsReplyEventArgs class</summary>
-            <param name="classifieds">A list of classified ad data returned from the data server</param>
-        </member>
-        <member name="P:OpenMetaverse.DirClassifiedsReplyEventArgs.Classifieds">
-            <summary>A list containing Classified Ads returned by the data server</summary>
-        </member>
-        <member name="T:OpenMetaverse.DirGroupsReplyEventArgs">
-            <summary>Contains the group data returned from the data server</summary>
-        </member>
-        <member name="M:OpenMetaverse.DirGroupsReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.GroupSearchData})">
-            <summary>Construct a new instance of the DirGroupsReplyEventArgs class</summary>
-            <param name="queryID">The ID of the query returned by the data server. 
-            This will correlate to the ID returned by the <see cref="!:StartGroupSearch"/> method</param>
-            <param name="matchedGroups">A list of groups data returned by the data server</param>
-        </member>
-        <member name="P:OpenMetaverse.DirGroupsReplyEventArgs.QueryID">
-            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartGroupSearch(System.String,System.Int32)"/></summary>
-        </member>
-        <member name="P:OpenMetaverse.DirGroupsReplyEventArgs.MatchedGroups">
-            <summary>A list containing Groups data returned by the data server</summary>
-        </member>
-        <member name="T:OpenMetaverse.DirPeopleReplyEventArgs">
-            <summary>Contains the people data returned from the data server</summary>
-        </member>
-        <member name="M:OpenMetaverse.DirPeopleReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.AgentSearchData})">
-            <summary>Construct a new instance of the DirPeopleReplyEventArgs class</summary>
-            <param name="queryID">The ID of the query returned by the data server. 
-            This will correlate to the ID returned by the <see cref="!:StartPeopleSearch"/> method</param>
-            <param name="matchedPeople">A list of people data returned by the data server</param>
-        </member>
-        <member name="P:OpenMetaverse.DirPeopleReplyEventArgs.QueryID">
-            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartPeopleSearch(System.String,System.Int32)"/></summary>
-        </member>
-        <member name="P:OpenMetaverse.DirPeopleReplyEventArgs.MatchedPeople">
-            <summary>A list containing People data returned by the data server</summary>
-        </member>
-        <member name="T:OpenMetaverse.DirLandReplyEventArgs">
-            <summary>Contains the land sales data returned from the data server</summary>
-        </member>
-        <member name="M:OpenMetaverse.DirLandReplyEventArgs.#ctor(System.Collections.Generic.List{OpenMetaverse.DirectoryManager.DirectoryParcel})">
-            <summary>Construct a new instance of the DirLandReplyEventArgs class</summary>
-            <param name="dirParcels">A list of parcels for sale returned by the data server</param>
-        </member>
-        <member name="P:OpenMetaverse.DirLandReplyEventArgs.DirParcels">
-            <summary>A list containing land forsale data returned by the data server</summary>
+        <member name="F:OpenMetaverse.EffectType.Beam">
+            <summary>Project a beam from a source to a destination, such as
+            the one used when editing an object</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.TeleportFinishMessage">
+        <member name="F:OpenMetaverse.EffectType.Glow">
             <summary>
-            Sent to the client to indicate a teleport request has completed
             </summary>
         </member>
-        <member name="T:OpenMetaverse.Interfaces.IMessage">
+        <member name="F:OpenMetaverse.EffectType.Point">
             <summary>
-            Interface requirements for Messaging system
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.AgentID">
-            <summary>The <see cref="T:OpenMetaverse.UUID"/> of the agent</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.LocationID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.RegionHandle">
-            <summary>The simulators handle the agent teleported to</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.SeedCapability">
-            <summary>A Uri which contains a list of Capabilities the simulator supports</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.SimAccess">
-            <summary>Indicates the level of access required
-            to access the simulator, or the content rating, or the simulators 
-            map status</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.IP">
-            <summary>The IP Address of the simulator</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.Port">
-            <summary>The UDP Port the simulator will listen for UDP traffic on</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.Flags">
-            <summary>Status flags indicating the state of the Agent upon arrival, Flying, etc.</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.TeleportFinishMessage.Serialize">
+        <member name="F:OpenMetaverse.EffectType.Trail">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.TeleportFinishMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.EffectType.Sphere">
+            <summary>Create a swirl of particles around an object</summary>
+        </member>
+        <member name="F:OpenMetaverse.EffectType.Spiral">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.EstablishAgentCommunicationMessage">
+        <member name="F:OpenMetaverse.EffectType.Edit">
             <summary>
-            Sent to the viewer when a neighboring simulator is requesting the agent make a connection to it.
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EstablishAgentCommunicationMessage.Serialize">
+        <member name="F:OpenMetaverse.EffectType.LookAt">
+            <summary>Cause an avatar to look at an object</summary>
+        </member>
+        <member name="F:OpenMetaverse.EffectType.PointAt">
+            <summary>Cause an avatar to point at an object</summary>
+        </member>
+        <member name="T:OpenMetaverse.LookAtType">
             <summary>
-            Serialize the object
+            The action an avatar is doing when looking at something, used in
+            ViewerEffect packets for the LookAt effect
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EstablishAgentCommunicationMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.LookAtType.None">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.CrossedRegionMessage.Serialize">
+        <member name="F:OpenMetaverse.LookAtType.Idle">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.CrossedRegionMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.LookAtType.AutoListen">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EnableSimulatorMessage.Serialize">
+        <member name="F:OpenMetaverse.LookAtType.FreeLook">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EnableSimulatorMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.LookAtType.Respond">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.TeleportFailedMessage">
+        <member name="F:OpenMetaverse.LookAtType.Hover">
             <summary>
-            A message sent to the client which indicates a teleport request has failed
-            and contains some information on why it failed
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFailedMessage.ExtraParams">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFailedMessage.MessageKey">
-            <summary>A string key of the reason the teleport failed e.g. CouldntTPCloser
-            Which could be used to look up a value in a dictionary or enum</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFailedMessage.AgentID">
-            <summary>The <see cref="T:OpenMetaverse.UUID"/> of the Agent</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.TeleportFailedMessage.Reason">
-            <summary>A string human readable message containing the reason </summary>
-            <remarks>An example: Could not teleport closer to destination</remarks>
+        <member name="F:OpenMetaverse.LookAtType.Conversation">
+            <summary>Deprecated</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.TeleportFailedMessage.Serialize">
+        <member name="F:OpenMetaverse.LookAtType.Select">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.TeleportFailedMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.LookAtType.Focus">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.LandStatReplyMessage.Serialize">
+        <member name="F:OpenMetaverse.LookAtType.Mouselook">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.LandStatReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.LookAtType.Clear">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage">
+        <member name="T:OpenMetaverse.PointAtType">
             <summary>
-            Contains a list of prim owner information for a specific parcel in a simulator
+            The action an avatar is doing when pointing at something, used in
+            ViewerEffect packets for the PointAt effect
             </summary>
-            <remarks>
-            A Simulator will always return at least 1 entry
-            If agent does not have proper permission the OwnerID will be UUID.Zero
-            If agent does not have proper permission OR there are no primitives on parcel
-            the DataBlocksExtended map will not be sent from the simulator
-            </remarks>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwnersBlock">
-            <summary>An Array of <see cref="T:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner"/> objects</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.Serialize">
+        <member name="F:OpenMetaverse.PointAtType.None">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.PointAtType.Select">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner">
+        <member name="F:OpenMetaverse.PointAtType.Grab">
             <summary>
-            Prim ownership information for a specified owner on a single parcel
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.OwnerID">
-            <summary>The <see cref="T:OpenMetaverse.UUID"/> of the prim owner, 
-            UUID.Zero if agent has no permission to view prim owner information</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.Count">
-            <summary>The total number of prims</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.IsGroupOwned">
-            <summary>True if the OwnerID is a <see cref="T:OpenMetaverse.Group"/></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.OnlineStatus">
-            <summary>True if the owner is online 
-            <remarks>This is no longer used by the LL Simulators</remarks></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.TimeStamp">
-            <summary>The date the most recent prim was rezzed</summary>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage">
+        <member name="F:OpenMetaverse.PointAtType.Clear">
             <summary>
-            The details of a single parcel in a region, also contains some regionwide globals
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.LocalID">
-            <summary>Simulator-local ID of this parcel</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AABBMax">
-            <summary>Maximum corner of the axis-aligned bounding box for this
-            parcel</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AABBMin">
-            <summary>Minimum corner of the axis-aligned bounding box for this
-            parcel</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Area">
-            <summary>Total parcel land area</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AuctionID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AuthBuyerID">
-            <summary>Key of authorized buyer</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Bitmap">
-            <summary>Bitmap describing land layout in 4x4m squares across the 
-            entire region</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Category">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ClaimDate">
-            <summary>Date land was claimed</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ClaimPrice">
-            <summary>Appears to always be zero</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Desc">
-            <summary>Parcel Description</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ParcelFlags">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.GroupID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.GroupPrims">
-            <summary>Total number of primitives owned by the parcel group on 
-            this parcel</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.IsGroupOwned">
-            <summary>Whether the land is deeded to a group or not</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.LandingType">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MaxPrims">
-            <summary>Maximum number of primitives this parcel supports</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaID">
-            <summary>The Asset UUID of the Texture which when applied to a 
-            primitive will display the media</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaURL">
-            <summary>A URL which points to any Quicktime supported media type</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaAutoScale">
-            <summary>A byte, if 0x1 viewer should auto scale media to fit object</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MusicURL">
-            <summary>URL For Music Stream</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Name">
-            <summary>Parcel Name</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OtherCleanTime">
-            <summary>Autoreturn value in minutes for others' objects</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OtherCount">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OtherPrims">
-            <summary>Total number of other primitives on this parcel</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OwnerID">
-            <summary>UUID of the owner of this parcel</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OwnerPrims">
-            <summary>Total number of primitives owned by the parcel owner on 
-            this parcel</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ParcelPrimBonus">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.PassHours">
-            <summary>How long is pass valid for</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.PassPrice">
-            <summary>Price for a temporary pass</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.PublicCount">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionDenyAnonymous">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionDenyIdentified">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionDenyTransacted">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionDenyAgeUnverified">
-            <summary>True if the region denies access to age unverified users</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionPushOverride">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RentPrice">
-            <summary>This field is no longer used</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RequestResult">
-            The result of a request for parcel properties
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SalePrice">
-            <summary>Sale price of the parcel, only useful if ForSale is set</summary>
-            <remarks>The SalePrice will remain the same after an ownership
-            transfer (sale), so it can be used to see the purchase price after
-            a sale if the new owner has not changed it</remarks>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SelectedPrims">
+        <member name="T:OpenMetaverse.MoneyTransactionType">
             <summary>
-            Number of primitives your avatar is currently
-            selecting and sitting on in this parcel
+            Money transaction types
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SelfCount">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SequenceID">
+        <member name="F:OpenMetaverse.MoneyTransactionType.None">
             <summary>
-            A number which increments by 1, starting at 0 for each ParcelProperties request. 
-            Can be overriden by specifying the sequenceID with the ParcelPropertiesRequest being sent. 
-            a Negative number indicates the action in <seealso cref="T:OpenMetaverse.ParcelPropertiesStatus"/> has occurred. 
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SimWideMaxPrims">
-            <summary>Maximum primitives across the entire simulator</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SimWideTotalPrims">
-            <summary>Total primitives across the entire simulator</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SnapSelection">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SnapshotID">
-            <summary>Key of parcel snapshot</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Status">
-            <summary>Parcel ownership status</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.TotalPrims">
-            <summary>Total number of primitives on this parcel</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.UserLocation">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.UserLookAt">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaDesc">
-            <summary>A description of the media</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaHeight">
-            <summary>An Integer which represents the height of the media</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaWidth">
-            <summary>An integer which represents the width of the media</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaLoop">
-            <summary>A boolean, if true the viewer should loop the media</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaType">
-            <summary>A string which contains the mime type of the media</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ObscureMedia">
-            <summary>true to obscure (hide) media url</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ObscureMusic">
-            <summary>true to obscure (hide) music url</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Serialize">
+        <member name="F:OpenMetaverse.MoneyTransactionType.FailSimulatorTimeout">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.MoneyTransactionType.FailDataserverTimeout">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage">
-            <summary>A message sent from the viewer to the simulator to updated a specific parcels settings</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.AuthBuyerID">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the agent authorized to purchase this
-            parcel of land or a NULL <seealso cref="T:OpenMetaverse.UUID"/> if the sale is authorized to anyone</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaAutoScale">
-            <summary>true to enable auto scaling of the parcel media</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Category">
-            <summary>The category of this parcel used when search is enabled to restrict
-            search results</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Desc">
-            <summary>A string containing the description to set</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.GroupID">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the <seealso cref="T:OpenMetaverse.Group"/> which allows for additional
-            powers and restrictions.</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Landing">
-            <summary>The <seealso cref="T:OpenMetaverse.LandingType"/> which specifies how avatars which teleport
-            to this parcel are handled</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.LocalID">
-            <summary>The LocalID of the parcel to update settings on</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaDesc">
-            <summary>A string containing the description of the media which can be played
-            to visitors</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaHeight">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaLoop">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaType">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaURL">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaWidth">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MusicURL">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Name">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.ObscureMedia">
-            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.ObscureMusic">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.ParcelFlags">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.PassHours">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.PassPrice">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.SalePrice">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.SnapshotID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.UserLocation">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.UserLookAt">
-            <summary></summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectClaim">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Serialize">
+        <member name="F:OpenMetaverse.MoneyTransactionType.LandClaim">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestBlock">
-            <summary>Base class used for the RemoteParcelRequest message</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest">
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupCreate">
             <summary>
-            A message sent from the viewer to the simulator to request information
-            on a remote parcel
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.Location">
-            <summary>Local sim position of the parcel we are looking up</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.RegionHandle">
-            <summary>Region handle of the parcel we are looking up</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.RegionID">
-            <summary>Region <see cref="T:OpenMetaverse.UUID"/> of the parcel we are looking up</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.Serialize">
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPublicClaim">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupJoin">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestReply">
+        <member name="F:OpenMetaverse.MoneyTransactionType.TeleportCharge">
             <summary>
-            A message sent from the simulator to the viewer in response to a <see cref="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest"/> 
-            which will contain parcel information
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestReply.ParcelID">
-            <summary>The grid-wide unique parcel ID</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestReply.Serialize">
+        <member name="F:OpenMetaverse.MoneyTransactionType.UploadCharge">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestReply.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.MoneyTransactionType.LandAuction">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestMessage">
+        <member name="F:OpenMetaverse.MoneyTransactionType.ClassifiedCharge">
             <summary>
-            A message containing a request for a remote parcel from a viewer, or a response
-            from the simulator to that request
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestMessage.Request">
-            <summary>The request or response details block</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestMessage.Serialize">
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectTax">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.MoneyTransactionType.LandTax">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.NewFileAgentInventoryMessage.Serialize">
+        <member name="F:OpenMetaverse.MoneyTransactionType.LightTax">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.NewFileAgentInventoryMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.MoneyTransactionType.ParcelDirFee">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.NewFileAgentInventoryVariablePriceMessage.Serialize">
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupTax">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.NewFileAgentInventoryVariablePriceMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.MoneyTransactionType.ClassifiedRenew">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage">
+        <member name="F:OpenMetaverse.MoneyTransactionType.GiveInventory">
             <summary>
-            A message sent from the simulator to an agent which contains
-            the groups the agent is in
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.AgentID">
-            <summary>The Agent receiving the message</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupDataBlock">
-            <summary>An array containing <seealso cref="T:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData"/> information
-            for each <see cref="T:OpenMetaverse.Group"/> the agent is a member of</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.NewGroupDataBlock">
-            <summary>An array containing <seealso cref="T:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.NewGroupData"/> information
-            for each <see cref="T:OpenMetaverse.Group"/> the agent is a member of</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.Serialize">
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectSale">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.MoneyTransactionType.Gift">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData">
-            <summary>Group Details specific to the agent</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.AcceptNotices">
-            <summary>true of the agent accepts group notices</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.Contribution">
-            <summary>The agents tier contribution to the group</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.GroupID">
-            <summary>The Groups <seealso cref="T:OpenMetaverse.UUID"/></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.GroupInsigniaID">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the groups insignia</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.GroupName">
-            <summary>The name of the group</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.GroupPowers">
-            <summary>The aggregate permissions the agent has in the group for all roles the agent
-            is assigned</summary>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.NewGroupData">
-            <summary>An optional block containing additional agent specific information</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.NewGroupData.ListInProfile">
-            <summary>true of the agent allows this group to be
-            listed in their profile</summary>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage">
+        <member name="F:OpenMetaverse.MoneyTransactionType.LandSale">
             <summary>
-            A message sent from the viewer to the simulator which 
-            specifies the language and permissions for others to detect
-            the language specified
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage.Language">
-            <summary>A string containng the default language 
-            to use for the agent</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage.LanguagePublic">
-            <summary>true of others are allowed to
-            know the language setting</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage.Serialize">
+        <member name="F:OpenMetaverse.MoneyTransactionType.ReferBonus">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.MoneyTransactionType.InventorySale">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.AgentDropGroupMessage">
+        <member name="F:OpenMetaverse.MoneyTransactionType.RefundPurchase">
             <summary>
-            An EventQueue message sent from the simulator to an agent when the agent
-            leaves a group
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.AgentDataBlock">
+        <member name="F:OpenMetaverse.MoneyTransactionType.LandPassSale">
             <summary>
-            An Array containing the AgentID and GroupID
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.Serialize">
+        <member name="F:OpenMetaverse.MoneyTransactionType.DwellBonus">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.MoneyTransactionType.PayObject">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.AgentData">
-            <summary>An object containing the Agents UUID, and the Groups UUID</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.AgentData.AgentID">
-            <summary>The ID of the Agent leaving the group</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.AgentData.GroupID">
-            <summary>The GroupID the Agent is leaving</summary>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.AssetUploaderBlock">
-            <summary>Base class for Asset uploads/results via Capabilities</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AssetUploaderBlock.State">
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPays">
             <summary>
-            The request state
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.AssetUploaderBlock.Serialize">
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupLandDeed">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.AssetUploaderBlock.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupObjectDeed">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UploaderRequestUpload">
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupLiability">
             <summary>
-            A message sent from the viewer to the simulator to request a temporary upload capability
-            which allows an asset to be uploaded
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploaderRequestUpload.Url">
-            <summary>The Capability URL sent by the simulator to upload the baked texture to</summary>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UploaderRequestComplete">
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupDividend">
             <summary>
-            A message sent from the simulator that will inform the agent the upload is complete, 
-            and the UUID of the uploaded asset
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploaderRequestComplete.AssetID">
-            <summary>The uploaded texture asset ID</summary>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UploadBakedTextureMessage">
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupMembershipDues">
             <summary>
-            A message sent from the viewer to the simulator to request a temporary
-            capability URI which is used to upload an agents baked appearance textures
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploadBakedTextureMessage.Request">
-            <summary>Object containing request or response</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UploadBakedTextureMessage.Serialize">
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectRelease">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UploadBakedTextureMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.MoneyTransactionType.LandRelease">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage">
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectDelete">
             <summary>
-            A message sent from the simulator which indicates the minimum version required for 
-            using voice chat
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.MajorVersion">
-            <summary>Major Version Required</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.MinorVersion">
-            <summary>Minor version required</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.RegionName">
-            <summary>The name of the region sending the version requrements</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.Serialize">
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPublicDecay">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPublicDelete">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage">
+        <member name="F:OpenMetaverse.MoneyTransactionType.LindenAdjustment">
             <summary>
-            A message sent from the simulator to the viewer containing the 
-            voice server URI
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.ParcelID">
-            <summary>The Parcel ID which the voice server URI applies</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.RegionName">
-            <summary>The name of the region</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.SipChannelUri">
-            <summary>A uri containing the server/channel information
-            which the viewer can utilize to participate in voice conversations</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.Serialize">
+        <member name="F:OpenMetaverse.MoneyTransactionType.LindenGrant">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.MoneyTransactionType.LindenPenalty">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage">
+        <member name="F:OpenMetaverse.MoneyTransactionType.EventFee">
             <summary>
-            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage.Password">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage.Username">
-            <summary></summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage.Serialize">
+        <member name="F:OpenMetaverse.MoneyTransactionType.EventPrize">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.MoneyTransactionType.StipendBasic">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UploadScriptTaskMessage">
+        <member name="F:OpenMetaverse.MoneyTransactionType.StipendDeveloper">
             <summary>
-            A message sent by the viewer to the simulator to request a temporary
-            capability for a script contained with in a Tasks inventory to be updated
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploadScriptTaskMessage.Request">
-            <summary>Object containing request or response</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UploadScriptTaskMessage.Serialize">
+        <member name="F:OpenMetaverse.MoneyTransactionType.StipendAlways">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UploadScriptTaskMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.MoneyTransactionType.StipendDaily">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage">
+        <member name="F:OpenMetaverse.MoneyTransactionType.StipendRating">
             <summary>
-            A message sent from the simulator to the viewer to indicate
-            a Tasks scripts status.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.ItemID">
-            <summary>The Asset ID of the script</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.Mono">
-            <summary>True of the script is compiled/ran using the mono interpreter, false indicates it 
-            uses the older less efficient lsl2 interprter</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.ObjectID">
-            <summary>The Task containing the scripts <seealso cref="T:OpenMetaverse.UUID"/></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.Running">
-            <summary>true of the script is in a running state</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.Serialize">
+        <member name="F:OpenMetaverse.MoneyTransactionType.StipendDelta">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="T:OpenMetaverse.TransactionFlags">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UpdateGestureAgentInventoryMessage">
+        <member name="F:OpenMetaverse.TransactionFlags.None">
             <summary>
-            A message containing the request/response used for updating a gesture
-            contained with an agents inventory
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateGestureAgentInventoryMessage.Request">
-            <summary>Object containing request or response</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateGestureAgentInventoryMessage.Serialize">
+        <member name="F:OpenMetaverse.TransactionFlags.SourceGroup">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateGestureAgentInventoryMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.TransactionFlags.DestGroup">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage">
+        <member name="F:OpenMetaverse.TransactionFlags.OwnerGroup">
             <summary>
-            A message request/response which is used to update a notecard contained within
-            a tasks inventory
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage.TaskID">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the Task containing the notecard asset to update</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage.ItemID">
-            <summary>The notecard assets <seealso cref="T:OpenMetaverse.UUID"/> contained in the tasks inventory</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage.Serialize">
+        <member name="F:OpenMetaverse.TransactionFlags.SimultaneousContribution">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.TransactionFlags.ContributionRemoval">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UpdateAgentInventoryRequestMessage">
+        <member name="T:OpenMetaverse.MeanCollisionType">
             <summary>
-            A reusable class containing a message sent from the viewer to the simulator to request a temporary uploader capability
-            which is used to update an asset in an agents inventory
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateAgentInventoryRequestMessage.ItemID">
+        <member name="F:OpenMetaverse.MeanCollisionType.None">
             <summary>
-            The Notecard AssetID to replace
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentInventoryRequestMessage.Serialize">
+        <member name="F:OpenMetaverse.MeanCollisionType.Bump">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentInventoryRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.MeanCollisionType.LLPushObject">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UpdateNotecardAgentInventoryMessage">
+        <member name="F:OpenMetaverse.MeanCollisionType.SelectedObjectCollide">
             <summary>
-            A message containing the request/response used for updating a notecard
-            contained with an agents inventory
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateNotecardAgentInventoryMessage.Request">
-            <summary>Object containing request or response</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateNotecardAgentInventoryMessage.Serialize">
+        <member name="F:OpenMetaverse.MeanCollisionType.ScriptedObjectCollide">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateNotecardAgentInventoryMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.MeanCollisionType.PhysicalObjectCollide">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.CopyInventoryFromNotecardMessage.Serialize">
+        <member name="T:OpenMetaverse.ScriptControlChange">
             <summary>
-            Serialize the object
+            Flags sent when a script takes or releases a control
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+            <remarks>NOTE: (need to verify) These might be a subset of the ControlFlags enum in Movement,</remarks>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.CopyInventoryFromNotecardMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.ScriptControlChange.None">
+            <summary>No Flags set</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UploaderScriptRequestError">
-            <summary>
-            A message sent from the simulator to the viewer which indicates
-            an error occurred while attempting to update a script in an agents or tasks 
-            inventory
-            </summary>
+        <member name="F:OpenMetaverse.ScriptControlChange.Forward">
+            <summary>Forward (W or up Arrow)</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploaderScriptRequestError.Compiled">
-            <summary>true of the script was successfully compiled by the simulator</summary>
+        <member name="F:OpenMetaverse.ScriptControlChange.Back">
+            <summary>Back (S or down arrow)</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploaderScriptRequestError.Error">
-            <summary>A string containing the error which occured while trying
-            to update the script</summary>
+        <member name="F:OpenMetaverse.ScriptControlChange.Left">
+            <summary>Move left (shift+A or left arrow)</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploaderScriptRequestError.AssetID">
-            <summary>A new AssetID assigned to the script</summary>
+        <member name="F:OpenMetaverse.ScriptControlChange.Right">
+            <summary>Move right (shift+D or right arrow)</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage">
-            <summary>
-            A message sent from the viewer to the simulator
-            requesting the update of an existing script contained
-            within a tasks inventory
-            </summary>
+        <member name="F:OpenMetaverse.ScriptControlChange.Up">
+            <summary>Up (E or PgUp)</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.ScriptRunning">
-            <summary>if true, set the script mode to running</summary>
+        <member name="F:OpenMetaverse.ScriptControlChange.Down">
+            <summary>Down (C or PgDown)</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.ItemID">
-            <summary>The scripts InventoryItem ItemID to update</summary>
+        <member name="F:OpenMetaverse.ScriptControlChange.RotateLeft">
+            <summary>Rotate left (A or left arrow)</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.Target">
-            <summary>A lowercase string containing either "mono" or "lsl2" which 
-            specifies the script is compiled and ran on the mono runtime, or the older
-            lsl runtime</summary>
+        <member name="F:OpenMetaverse.ScriptControlChange.RotateRight">
+            <summary>Rotate right (D or right arrow)</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.TaskID">
-            <summary>The tasks <see cref="T:OpenMetaverse.UUID"/> which contains the script to update</summary>
+        <member name="F:OpenMetaverse.ScriptControlChange.LeftButton">
+            <summary>Left Mouse Button</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.Serialize">
+        <member name="F:OpenMetaverse.ScriptControlChange.MouseLookLeftButton">
+            <summary>Left Mouse button in MouseLook</summary>
+        </member>
+        <member name="T:OpenMetaverse.AgentFlags">
             <summary>
-            Serialize the object
+            Currently only used to hide your group title
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.AgentFlags.None">
+            <summary>No flags set</summary>
+        </member>
+        <member name="F:OpenMetaverse.AgentFlags.HideTitle">
+            <summary>Hide your group title</summary>
+        </member>
+        <member name="T:OpenMetaverse.AgentState">
             <summary>
-            Deserialize the message
+            Action state of the avatar, which can currently be typing and
+            editing
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage">
+        <member name="F:OpenMetaverse.AgentState.None">
             <summary>
-            A message containing either the request or response used in updating a script inside
-            a tasks inventory
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage.Request">
-            <summary>Object containing request or response</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage.Serialize">
+        <member name="F:OpenMetaverse.AgentState.Typing">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.AgentState.Editing">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UploaderRequestScriptComplete">
+        <member name="T:OpenMetaverse.TeleportStatus">
             <summary>
-            Response from the simulator to notify the viewer the upload is completed, and
-            the UUID of the script asset and its compiled status
+            Current teleport status
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploaderRequestScriptComplete.AssetID">
-            <summary>The uploaded texture asset ID</summary>
+        <member name="F:OpenMetaverse.TeleportStatus.None">
+            <summary>Unknown status</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UploaderRequestScriptComplete.Compiled">
-            <summary>true of the script was compiled successfully</summary>
+        <member name="F:OpenMetaverse.TeleportStatus.Start">
+            <summary>Teleport initialized</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage">
-            <summary>
-            A message sent from a viewer to the simulator requesting a temporary uploader capability
-            used to update a script contained in an agents inventory
-            </summary>
+        <member name="F:OpenMetaverse.TeleportStatus.Progress">
+            <summary>Teleport in progress</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage.ItemID">
-            <summary>The existing asset if of the script in the agents inventory to replace</summary>
+        <member name="F:OpenMetaverse.TeleportStatus.Failed">
+            <summary>Teleport failed</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage.Target">
-            <summary>The language of the script</summary>
-            <remarks>Defaults to lsl version 2, "mono" might be another possible option</remarks>
+        <member name="F:OpenMetaverse.TeleportStatus.Finished">
+            <summary>Teleport completed</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.TeleportStatus.Cancelled">
+            <summary>Teleport cancelled</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="T:OpenMetaverse.TeleportFlags">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.UpdateScriptAgentMessage">
-            <summary>
-            A message containing either the request or response used in updating a script inside
-            an agents inventory
-            </summary>
+        <member name="F:OpenMetaverse.TeleportFlags.Default">
+            <summary>No flags set, or teleport failed</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptAgentMessage.Request">
-            <summary>Object containing request or response</summary>
+        <member name="F:OpenMetaverse.TeleportFlags.SetHomeToTarget">
+            <summary>Set when newbie leaves help island for first time</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptAgentMessage.Serialize">
+        <member name="F:OpenMetaverse.TeleportFlags.SetLastToTarget">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptAgentMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.TeleportFlags.ViaLure">
+            <summary>Via Lure</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.SendPostcardMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.TeleportFlags.ViaLandmark">
+            <summary>Via Landmark</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.SendPostcardMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.TeleportFlags.ViaLocation">
+            <summary>Via Location</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.MapLayerMessageBase">
-            <summary>Base class for Map Layers via Capabilities</summary>
+        <member name="F:OpenMetaverse.TeleportFlags.ViaHome">
+            <summary>Via Home</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.MapLayerMessageBase.Flags">
-            <summary></summary>
+        <member name="F:OpenMetaverse.TeleportFlags.ViaTelehub">
+            <summary>Via Telehub</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.MapLayerMessageBase.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.TeleportFlags.ViaLogin">
+            <summary>Via Login</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.MapLayerMessageBase.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.TeleportFlags.ViaGodlikeLure">
+            <summary>Linden Summoned</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.MapLayerRequestVariant">
-            <summary>
-            Sent by an agent to the capabilities server to request map layers
-            </summary>
+        <member name="F:OpenMetaverse.TeleportFlags.Godlike">
+            <summary>Linden Forced me</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.MapLayerReplyVariant">
+        <member name="F:OpenMetaverse.TeleportFlags.NineOneOne">
             <summary>
-            A message sent from the simulator to the viewer which contains an array of map images and their grid coordinates
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerDataBlocks">
-            <summary>An array containing LayerData items</summary>
+        <member name="F:OpenMetaverse.TeleportFlags.DisableCancel">
+            <summary>Agent Teleported Home via Script</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.Serialize">
+        <member name="F:OpenMetaverse.TeleportFlags.ViaRegionID">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.TeleportFlags.IsFlying">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData">
+        <member name="F:OpenMetaverse.TeleportFlags.ResetHome">
             <summary>
-            An object containing map location details
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.ImageID">
-            <summary>The Asset ID of the regions tile overlay</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.Bottom">
-            <summary>The grid location of the southern border of the map tile</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.Left">
-            <summary>The grid location of the western border of the map tile</summary>
+        <member name="F:OpenMetaverse.TeleportFlags.ForceRedirect">
+            <summary>forced to new location for example when avatar is banned or ejected</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.Right">
-            <summary>The grid location of the eastern border of the map tile</summary>
+        <member name="F:OpenMetaverse.TeleportFlags.FinishedViaLure">
+            <summary>Teleport Finished via a Lure</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.Top">
-            <summary>The grid location of the northern border of the map tile</summary>
+        <member name="F:OpenMetaverse.TeleportFlags.FinishedViaNewSim">
+            <summary>Finished, Sim Changed</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.MapLayerMessage.Request">
-            <summary>Object containing request or response</summary>
+        <member name="F:OpenMetaverse.TeleportFlags.FinishedViaSameSim">
+            <summary>Finished, Same Sim</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.MapLayerMessage.Serialize">
+        <member name="T:OpenMetaverse.TeleportLureFlags">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.MapLayerMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.TeleportLureFlags.NormalLure">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ProductInfoRequestMessage">
+        <member name="F:OpenMetaverse.TeleportLureFlags.GodlikeLure">
             <summary>
-            New as of 1.23 RC1, no details yet.
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ProductInfoRequestMessage.Serialize">
+        <member name="F:OpenMetaverse.TeleportLureFlags.GodlikePursuit">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ProductInfoRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="T:OpenMetaverse.ScriptSensorTypeFlags">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.SearchStatRequestMessage.Serialize">
+        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Agent">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.SearchStatRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Active">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestBlock.Method">
-            <summary>A string containing the method used</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference">
-            <summary>
-            A request sent from an agent to the Simulator to begin a new conference.
-            Contains a list of Agents which will be included in the conference
-            </summary>    
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference.AgentsBlock">
-            <summary>An array containing the <see cref="T:OpenMetaverse.UUID"/> of the agents invited to this conference</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference.SessionID">
-            <summary>The conferences Session ID</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference.Serialize">
+        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Passive">
             <summary>
-            Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Scripted">
             <summary>
-            Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate">
+        <member name="T:OpenMetaverse.MuteType">
             <summary>
-            A moderation request sent from a conference moderator
-            Contains an agent and an optional action to take
-            </summary>    
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.SessionID">
-            <summary>The Session ID</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.AgentID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.RequestKey">
-            <summary>A list containing Key/Value pairs, known valid values:
-            key: text value: true/false - allow/disallow specified agents ability to use text in session
-            key: voice value: true/false - allow/disallow specified agents ability to use voice in session
+            Type of mute entry
             </summary>
-            <remarks>"text" or "voice"</remarks>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.RequestValue">
-            <summary></summary>
+        <member name="F:OpenMetaverse.MuteType.ByName">
+            <summary>Object muted by name</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.MuteType.Resident">
+            <summary>Muted residet</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.MuteType.Object">
+            <summary>Object muted by UUID</summary>
         </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation">
-            <summary>
-            A message sent from the agent to the simulator which tells the 
-            simulator we've accepted a conference invitation
-            </summary>
+        <member name="F:OpenMetaverse.MuteType.Group">
+            <summary>Muted group</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation.SessionID">
-            <summary>The conference SessionID</summary>
+        <member name="F:OpenMetaverse.MuteType.External">
+            <summary>Muted external entry</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation.Serialize">
+        <member name="T:OpenMetaverse.MuteFlags">
             <summary>
-            Serialize the object
+            Flags of mute entry
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.MuteFlags.Default">
+            <summary>No exceptions</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.MuteFlags.TextChat">
+            <summary>Don't mute text chat</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.MuteFlags.VoiceChat">
+            <summary>Don't mute voice chat</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatterboxSessionEventReplyMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.MuteFlags.Particles">
+            <summary>Don't mute particles</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatterboxSessionEventReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
+        <member name="F:OpenMetaverse.MuteFlags.ObjectSounds">
+            <summary>Don't mute sounds</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxSessionStartReplyMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
+        <member name="F:OpenMetaverse.MuteFlags.All">
+            <summary>Don't mute</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxSessionStartReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="T:OpenMetaverse.InstantMessage">
             <summary>
-            Deserialize the message
+            Instant Message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.FromAgentID">
+        <member name="F:OpenMetaverse.InstantMessage.FromAgentID">
             <summary>Key of sender</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.FromAgentName">
+        <member name="F:OpenMetaverse.InstantMessage.FromAgentName">
             <summary>Name of sender</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.ToAgentID">
+        <member name="F:OpenMetaverse.InstantMessage.ToAgentID">
             <summary>Key of destination avatar</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.ParentEstateID">
+        <member name="F:OpenMetaverse.InstantMessage.ParentEstateID">
             <summary>ID of originating estate</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.RegionID">
+        <member name="F:OpenMetaverse.InstantMessage.RegionID">
             <summary>Key of originating region</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Position">
+        <member name="F:OpenMetaverse.InstantMessage.Position">
             <summary>Coordinates in originating region</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Dialog">
+        <member name="F:OpenMetaverse.InstantMessage.Dialog">
             <summary>Instant message type</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.GroupIM">
+        <member name="F:OpenMetaverse.InstantMessage.GroupIM">
             <summary>Group IM session toggle</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.IMSessionID">
+        <member name="F:OpenMetaverse.InstantMessage.IMSessionID">
             <summary>Key of IM session, for Group Messages, the groups UUID</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Timestamp">
+        <member name="F:OpenMetaverse.InstantMessage.Timestamp">
             <summary>Timestamp of the instant message</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Message">
+        <member name="F:OpenMetaverse.InstantMessage.Message">
             <summary>Instant message text</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Offline">
+        <member name="F:OpenMetaverse.InstantMessage.Offline">
             <summary>Whether this message is held for offline avatars</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.BinaryBucket">
+        <member name="F:OpenMetaverse.InstantMessage.BinaryBucket">
             <summary>Context specific packed data</summary>
         </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Voice">
-            <summary>Is this invitation for voice group/conference chat</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ChatterBoxSessionAgentListUpdatesMessage">
-            <summary>
-            Sent from the simulator to the viewer.
-            
-            When an agent initially joins a session the AgentUpdatesBlock object will contain a list of session members including
-            a boolean indicating they can use voice chat in this session, a boolean indicating they are allowed to moderate 
-            this session, and lastly a string which indicates another agent is entering the session with the Transition set to "ENTER"
-            
-            During the session lifetime updates on individuals are sent. During the update the booleans sent during the initial join are
-            excluded with the exception of the Transition field. This indicates a new user entering or exiting the session with
-            the string "ENTER" or "LEAVE" respectively.
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxSessionAgentListUpdatesMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxSessionAgentListUpdatesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage">
-            <summary>
-            An EventQueue message sent when the agent is forcibly removed from a chatterbox session
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage.Reason">
-            <summary>
-            A string containing the reason the agent was removed
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage.SessionID">
-            <summary>
-            The ChatterBoxSession's SessionID
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EventQueueAck.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EventQueueAck.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EventQueueEvent.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EventQueueEvent.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EventQueueGetMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.EventQueueGetMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ViewerStatsMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ViewerStatsMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.PlacesReplyMessage">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.PlacesReplyMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.PlacesReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentInformationMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentInformationMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.DirLandReplyMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.DirLandReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage">
-            <summary>
-            A message sent from the viewer to the simulator which 
-            specifies that the user has changed current URL
-            of the specific media on a prim face
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.URL">
-            <summary>
-            New URL
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.PrimID">
-            <summary>
-            Prim UUID where navigation occured
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.Face">
-            <summary>
-            Face index
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaBlock">
-            <summary>Base class used for the ObjectMedia message</summary>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaRequest">
-            <summary>
-            Message used to retrive prim media data
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaRequest.PrimID">
-            <summary>
-            Prim UUID
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaRequest.Verb">
-            <summary>
-            Requested operation, either GET or UPDATE
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaRequest.Serialize">
-            <summary>
-            Serialize object
-            </summary>
-            <returns>Serialized object as OSDMap</returns>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaRequest.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaResponse">
-            <summary>
-            Message used to update prim media data
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaResponse.PrimID">
-            <summary>
-            Prim UUID
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaResponse.FaceMedia">
-            <summary>
-            Array of media entries indexed by face number
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaResponse.Version">
-            <summary>
-            Media version string
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaResponse.Serialize">
-            <summary>
-            Serialize object
-            </summary>
-            <returns>Serialized object as OSDMap</returns>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaResponse.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaUpdate">
-            <summary>
-            Message used to update prim media data
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.PrimID">
-            <summary>
-            Prim UUID
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.FaceMedia">
-            <summary>
-            Array of media entries indexed by face number
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.Verb">
-            <summary>
-            Requested operation, either GET or UPDATE
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.Serialize">
-            <summary>
-            Serialize object
-            </summary>
-            <returns>Serialized object as OSDMap</returns>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaMessage">
-            <summary>
-            Message for setting or getting per face MediaEntry
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaMessage.Request">
-            <summary>The request or response details block</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaMessage.Serialize">
-            <summary>
-            Serialize the object
-            </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserialize the message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ObjectResourcesDetail">
-            <summary>Details about object resource usage</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.ID">
-            <summary>Object UUID</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.Name">
-            <summary>Object name</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.GroupOwned">
-            <summary>Indicates if object is group owned</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.Location">
-            <summary>Locatio of the object</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.OwnerID">
-            <summary>Object owner</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.Resources">
-            <summary>Resource usage, keys are resource names, values are resource usage for that specific resource</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserializes object from OSD
-            </summary>
-            <param name="obj">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.FromOSD(OpenMetaverse.StructuredData.OSD)">
-            <summary>
-            Makes an instance based on deserialized data
-            </summary>
-            <param name="osd"><see cref="T:OpenMetaverse.StructuredData.OSD"/> serialized data</param>
-            <returns>Instance containg deserialized data</returns>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.ParcelResourcesDetail">
-            <summary>Details about parcel resource usage</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.ID">
-            <summary>Parcel UUID</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.LocalID">
-            <summary>Parcel local ID</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.Name">
-            <summary>Parcel name</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.GroupOwned">
-            <summary>Indicates if parcel is group owned</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.OwnerID">
-            <summary>Parcel owner</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.Objects">
-            <summary>Array of <see cref="T:OpenMetaverse.Messages.Linden.ObjectResourcesDetail"/> containing per object resource usage</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserializes object from OSD
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.FromOSD(OpenMetaverse.StructuredData.OSD)">
-            <summary>
-            Makes an instance based on deserialized data
-            </summary>
-            <param name="osd"><see cref="T:OpenMetaverse.StructuredData.OSD"/> serialized data</param>
-            <returns>Instance containg deserialized data</returns>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.BaseResourcesInfo">
-            <summary>Resource usage base class, both agent and parcel resource
-            usage contains summary information</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.BaseResourcesInfo.SummaryAvailable">
-            <summary>Summary of available resources, keys are resource names,
-            values are resource usage for that specific resource</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.BaseResourcesInfo.SummaryUsed">
-            <summary>Summary resource usage, keys are resource names,
-            values are resource usage for that specific resource</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.BaseResourcesInfo.Serialize">
-            <summary>
-            Serializes object
-            </summary>
-            <returns><see cref="T:OpenMetaverse.StructuredData.OSDMap"/> serialized data</returns>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.BaseResourcesInfo.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserializes object from OSD
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage">
-            <summary>Agent resource usage</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage.Attachments">
-            <summary>Per attachment point object resource usage</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserializes object from OSD
-            </summary>
-            <param name="osd">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage.FromOSD(OpenMetaverse.StructuredData.OSD)">
-            <summary>
-            Makes an instance based on deserialized data
-            </summary>
-            <param name="osd"><see cref="T:OpenMetaverse.StructuredData.OSD"/> serialized data</param>
-            <returns>Instance containg deserialized data</returns>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage.GetMessageHandler(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Detects which class handles deserialization of this message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-            <returns>Object capable of decoding this message</returns>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.LandResourcesRequest">
-            <summary>Request message for parcel resource usage</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.LandResourcesRequest.ParcelID">
-            <summary>UUID of the parel to request resource usage info</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesRequest.Serialize">
-            <summary>
-            Serializes object
-            </summary>
-            <returns><see cref="T:OpenMetaverse.StructuredData.OSDMap"/> serialized data</returns>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesRequest.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserializes object from OSD
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.LandResourcesMessage">
-            <summary>Response message for parcel resource usage</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.LandResourcesMessage.ScriptResourceDetails">
-            <summary>URL where parcel resource usage details can be retrieved</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.LandResourcesMessage.ScriptResourceSummary">
-            <summary>URL where parcel resource usage summary can be retrieved</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesMessage.Serialize">
-            <summary>
-            Serializes object
-            </summary>
-            <returns><see cref="T:OpenMetaverse.StructuredData.OSDMap"/> serialized data</returns>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserializes object from OSD
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesMessage.GetMessageHandler(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Detects which class handles deserialization of this message
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-            <returns>Object capable of decoding this message</returns>
-        </member>
-        <member name="T:OpenMetaverse.Messages.Linden.LandResourcesInfo">
-            <summary>Parcel resource usage</summary>
-        </member>
-        <member name="F:OpenMetaverse.Messages.Linden.LandResourcesInfo.Parcels">
-            <summary>Array of <see cref="T:OpenMetaverse.Messages.Linden.ParcelResourcesDetail"/> containing per percal resource usage</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesInfo.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Deserializes object from OSD
-            </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
-        </member>
-        <member name="T:OpenMetaverse.Assets.GestureStepType">
-            <summary>
-            Type of gesture step
-            </summary>
-        </member>
-        <member name="T:OpenMetaverse.Assets.GestureStep">
-            <summary>
-            Base class for gesture steps
-            </summary>
-        </member>
-        <member name="P:OpenMetaverse.Assets.GestureStep.GestureStepType">
-            <summary>
-            Retururns what kind of gesture step this is
-            </summary>
-        </member>
-        <member name="T:OpenMetaverse.Assets.GestureStepAnimation">
-            <summary>
-            Describes animation step of a gesture
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepAnimation.AnimationStart">
-            <summary>
-            If true, this step represents start of animation, otherwise animation stop
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepAnimation.ID">
-            <summary>
-            Animation asset <see cref="T:OpenMetaverse.UUID"/>
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepAnimation.Name">
-            <summary>
-            Animation inventory name
-            </summary>
-        </member>
-        <member name="P:OpenMetaverse.Assets.GestureStepAnimation.GestureStepType">
-            <summary>
-            Returns what kind of gesture step this is
-            </summary>
-        </member>
-        <member name="T:OpenMetaverse.Assets.GestureStepSound">
-            <summary>
-            Describes sound step of a gesture
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepSound.ID">
-            <summary>
-            Sound asset <see cref="T:OpenMetaverse.UUID"/>
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepSound.Name">
-            <summary>
-            Sound inventory name
-            </summary>
-        </member>
-        <member name="P:OpenMetaverse.Assets.GestureStepSound.GestureStepType">
-            <summary>
-            Returns what kind of gesture step this is
-            </summary>
-        </member>
-        <member name="T:OpenMetaverse.Assets.GestureStepChat">
-            <summary>
-            Describes sound step of a gesture
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepChat.Text">
-            <summary>
-            Text to output in chat
-            </summary>
-        </member>
-        <member name="P:OpenMetaverse.Assets.GestureStepChat.GestureStepType">
-            <summary>
-            Returns what kind of gesture step this is
-            </summary>
-        </member>
-        <member name="T:OpenMetaverse.Assets.GestureStepWait">
-            <summary>
-            Describes sound step of a gesture
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepWait.WaitForAnimation">
-            <summary>
-            If true in this step we wait for all animations to finish
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepWait.WaitForTime">
-            <summary>
-            If true gesture player should wait for the specified amount of time
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepWait.WaitTime">
-            <summary>
-            Time in seconds to wait if WaitForAnimation is false
-            </summary>
-        </member>
-        <member name="P:OpenMetaverse.Assets.GestureStepWait.GestureStepType">
-            <summary>
-            Returns what kind of gesture step this is
-            </summary>
-        </member>
-        <member name="T:OpenMetaverse.Assets.GestureStepEOF">
-            <summary>
-            Describes the final step of a gesture
-            </summary>
-        </member>
-        <member name="P:OpenMetaverse.Assets.GestureStepEOF.GestureStepType">
-            <summary>
-            Returns what kind of gesture step this is
-            </summary>
-        </member>
-        <member name="T:OpenMetaverse.Assets.AssetGesture">
-            <summary>
-            Represents a sequence of animations, sounds, and chat actions
-            </summary>
-        </member>
-        <member name="T:OpenMetaverse.Assets.Asset">
-            <summary>
-            Base class for all Asset types
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.Asset.AssetData">
-            <summary>A byte array containing the raw asset data</summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.Asset.Temporary">
-            <summary>True if the asset it only stored on the server temporarily</summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.Asset._AssetID">
-            <summary>A unique ID</summary>
-        </member>
-        <member name="M:OpenMetaverse.Assets.Asset.#ctor">
-            <summary>
-            Construct a new Asset object
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Assets.Asset.#ctor(OpenMetaverse.UUID,System.Byte[])">
-            <summary>
-            Construct a new Asset object
-            </summary>
-            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
-            <param name="assetData">A byte array containing the raw asset data</param>
-        </member>
-        <member name="M:OpenMetaverse.Assets.Asset.Encode">
-            <summary>
-            Regenerates the <code>AssetData</code> byte array from the properties 
-            of the derived class.
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Assets.Asset.Decode">
-            <summary>
-            Decodes the AssetData, placing it in appropriate properties of the derived
-            class.
-            </summary>
-            <returns>True if the asset decoding succeeded, otherwise false</returns>
-        </member>
-        <member name="P:OpenMetaverse.Assets.Asset.AssetID">
-            <summary>The assets unique ID</summary>
-        </member>
-        <member name="P:OpenMetaverse.Assets.Asset.AssetType">
-            <summary>
-            The "type" of asset, Notecard, Animation, etc
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.AssetGesture.TriggerKey">
-            <summary>
-            Keyboard key that triggers the gestyre
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.AssetGesture.TriggerKeyMask">
-            <summary>
-            Modifier to the trigger key
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.AssetGesture.Trigger">
-            <summary>
-            String that triggers playing of the gesture sequence
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.AssetGesture.ReplaceWith">
-            <summary>
-            Text that replaces trigger in chat once gesture is triggered
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.AssetGesture.Sequence">
-            <summary>
-            Sequence of gesture steps
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Assets.AssetGesture.#ctor">
-            <summary>
-            Constructs guesture asset
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Assets.AssetGesture.#ctor(OpenMetaverse.UUID,System.Byte[])">
-            <summary>
-            Constructs guesture asset
-            </summary>
-            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
-            <param name="assetData">A byte array containing the raw asset data</param>
-        </member>
-        <member name="M:OpenMetaverse.Assets.AssetGesture.Encode">
-            <summary>
-            Encodes gesture asset suitable for uplaod
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Assets.AssetGesture.Decode">
-            <summary>
-            Decodes gesture assset into play sequence
-            </summary>
-            <returns>true if the asset data was decoded successfully</returns>
-        </member>
-        <member name="P:OpenMetaverse.Assets.AssetGesture.AssetType">
-            <summary>
-            Returns asset type
-            </summary>
-        </member>
-        <member name="T:OpenMetaverse.Assets.AssetsArchiver">
-            <summary>
-            Archives assets
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.AssetsArchiver.m_assets">
-            <summary>
-            Archive assets
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Assets.AssetsArchiver.Archive(OpenMetaverse.Assets.TarArchiveWriter)">
-            <summary>
-            Archive the assets given to this archiver to the given archive.
-            </summary>
-            <param name="archive"></param>
-        </member>
-        <member name="M:OpenMetaverse.Assets.AssetsArchiver.WriteMetadata(OpenMetaverse.Assets.TarArchiveWriter)">
-            <summary>
-            Write an assets metadata file to the given archive
-            </summary>
-            <param name="archive"></param>
-        </member>
-        <member name="M:OpenMetaverse.Assets.AssetsArchiver.WriteData(OpenMetaverse.Assets.TarArchiveWriter)">
-            <summary>
-            Write asset data files to the given archive
-            </summary>
-            <param name="archive"></param>
-        </member>
-        <member name="T:OpenMetaverse.Assets.ArchiveConstants">
-            <summary>
-            Constants for the archiving module
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.CONTROL_FILE_PATH">
-            <summary>
-            The location of the archive control file
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.ASSETS_PATH">
-            <summary>
-            Path for the assets held in an archive
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.OBJECTS_PATH">
-            <summary>
-            Path for the prims file
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.TERRAINS_PATH">
-            <summary>
-            Path for terrains.  Technically these may be assets, but I think it's quite nice to split them out.
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.SETTINGS_PATH">
-            <summary>
-            Path for region settings.
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.ASSET_EXTENSION_SEPARATOR">
-            <summary>
-            The character the separates the uuid from extension information in an archived asset filename
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.ASSET_TYPE_TO_EXTENSION">
-            <summary>
-            Extensions used for asset types in the archive
-            </summary>
-        </member>
-        <member name="T:OpenMetaverse.Caps">
-            <summary>
-            Capabilities is the name of the bi-directional HTTP REST protocol
-            used to communicate non real-time transactions such as teleporting or
-            group messaging
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Caps.Simulator">
-            <summary>Reference to the simulator this system is connected to</summary>
-        </member>
-        <member name="M:OpenMetaverse.Caps.#ctor(OpenMetaverse.Simulator,System.String)">
-            <summary>
-            Default constructor
-            </summary>
-            <param name="simulator"></param>
-            <param name="seedcaps"></param>
-        </member>
-        <member name="M:OpenMetaverse.Caps.CapabilityURI(System.String)">
-            <summary>
-            Request the URI of a named capability
-            </summary>
-            <param name="capability">Name of the capability to request</param>
-            <returns>The URI of the requested capability, or String.Empty if
-            the capability does not exist</returns>
-        </member>
-        <member name="M:OpenMetaverse.Caps.EventQueueEventHandler(System.String,OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Process any incoming events, check to see if we have a message created for the event, 
-            </summary>
-            <param name="eventName"></param>
-            <param name="body"></param>
-        </member>
-        <member name="P:OpenMetaverse.Caps.SeedCapsURI">
-            <summary>Capabilities URI this system was initialized with</summary>
-        </member>
-        <member name="P:OpenMetaverse.Caps.IsEventQueueRunning">
-            <summary>Whether the capabilities event queue is connected and
-            listening for incoming events</summary>
-        </member>
-        <member name="T:OpenMetaverse.Caps.EventQueueCallback">
-            <summary>
-            Triggered when an event is received via the EventQueueGet 
-            capability
-            </summary>
-            <param name="capsKey">Event name</param>
-            <param name="message">Decoded event data</param>
-            <param name="simulator">The simulator that generated the event</param>
-        </member>
-        <member name="T:OpenMetaverse.AgentThrottle">
-            <summary>
-            Throttles the network traffic for various different traffic types.
-            Access this class through GridClient.Throttle
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.AgentThrottle.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Default constructor, uses a default high total of 1500 KBps (1536000)
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.AgentThrottle.#ctor(System.Byte[],System.Int32)">
-            <summary>
-            Constructor that decodes an existing AgentThrottle packet in to
-            individual values
-            </summary>
-            <param name="data">Reference to the throttle data in an AgentThrottle
-            packet</param>
-            <param name="pos">Offset position to start reading at in the 
-            throttle data</param>
-            <remarks>This is generally not needed in clients as the server will
-            never send a throttle packet to the client</remarks>
-        </member>
-        <member name="M:OpenMetaverse.AgentThrottle.Set">
-            <summary>
-            Send an AgentThrottle packet to the current server using the 
-            current values
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.AgentThrottle.Set(OpenMetaverse.Simulator)">
-            <summary>
-            Send an AgentThrottle packet to the specified server using the 
-            current values
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.AgentThrottle.ToBytes">
-            <summary>
-            Convert the current throttle values to a byte array that can be put
-            in an AgentThrottle packet
-            </summary>
-            <returns>Byte array containing all the throttle values</returns>
-        </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Resend">
-            <summary>Maximum bits per second for resending unacknowledged packets</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Land">
-            <summary>Maximum bits per second for LayerData terrain</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Wind">
-            <summary>Maximum bits per second for LayerData wind data</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Cloud">
-            <summary>Maximum bits per second for LayerData clouds</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Task">
-            <summary>Unknown, includes object data</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Texture">
-            <summary>Maximum bits per second for textures</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Asset">
-            <summary>Maximum bits per second for downloaded assets</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Total">
-            <summary>Maximum bits per second the entire connection, divided up
-            between invidiual streams using default multipliers</summary>
-        </member>
-        <member name="T:OpenMetaverse.Primitive">
-            <summary>
-            Particle system specific enumerators, flags and methods.
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.GroupID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.LocalID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParentID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.RegionHandle">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.Flags">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.TreeSpecies">
-            <summary>Foliage type for this primitive. Only applicable if this
-            primitive is foliage</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ScratchPad">
-            <summary>Unknown</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.Position">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.Scale">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.Rotation">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.Velocity">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.AngularVelocity">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.Acceleration">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.CollisionPlane">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.Flexible">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.Light">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.Sculpt">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ClickAction">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.Sound">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.OwnerID">
-            <summary>Identifies the owner if audio or a particle system is
-            active</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.SoundFlags">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.SoundGain">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.SoundRadius">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.Text">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.TextColor">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.MediaURL">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.Joint">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.JointPivot">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.JointAxisOrAnchor">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.NameValues">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.PrimData">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.Properties">
-            <summary></summary>
-        </member>
-        <member name="M:OpenMetaverse.Primitive.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Primitive.PackPathTwist(System.Single)">
-            <summary>
-            Packs PathTwist, PathTwistBegin, PathRadiusOffset, and PathSkew
-            parameters in to signed eight bit values
-            </summary>
-            <param name="pathTwist">Floating point parameter to pack</param>
-            <returns>Signed eight bit value containing the packed parameter</returns>
-        </member>
-        <member name="M:OpenMetaverse.Primitive.UnpackPathTwist(System.SByte)">
-            <summary>
-            Unpacks PathTwist, PathTwistBegin, PathRadiusOffset, and PathSkew
-            parameters from signed eight bit integers to floating point values
-            </summary>
-            <param name="pathTwist">Signed eight bit value to unpack</param>
-            <returns>Unpacked floating point value</returns>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSys">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.MediaVersion">
-            <summary>
-            Current version of the media data for the prim
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.FaceMedia">
-            <summary>
-            Array of media entries indexed by face number
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.Textures">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnim">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.Type">
-            <summary>Uses basic heuristics to estimate the primitive shape</summary>
-        </member>
-        <member name="T:OpenMetaverse.Primitive.ConstructionData">
-            <summary>
-            Parameters used to construct a visual representation of a primitive
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.profileCurve">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathCurve">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathEnd">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathRadiusOffset">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathSkew">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathScaleX">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathScaleY">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathShearX">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathShearY">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTaperX">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTaperY">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathBegin">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTwist">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTwistBegin">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathRevolutions">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.ProfileBegin">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.ProfileEnd">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.ProfileHollow">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.Material">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.State">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PCode">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.ConstructionData.AttachmentPoint">
-            <summary>Attachment point to an avatar</summary>
+        <member name="M:OpenMetaverse.InstantMessage.ToString">
+            <summary>Print the struct data as a string</summary>
+            <returns>A string containing the field name, and field value</returns>
         </member>
-        <member name="P:OpenMetaverse.Primitive.ConstructionData.ProfileCurve">
-            <summary></summary>
+        <member name="T:OpenMetaverse.MuteEntry">
+            <summary>Represents muted object or resident</summary>
         </member>
-        <member name="P:OpenMetaverse.Primitive.ConstructionData.ProfileHole">
-            <summary></summary>
+        <member name="F:OpenMetaverse.MuteEntry.Type">
+            <summary>Type of the mute entry</summary>
         </member>
-        <member name="P:OpenMetaverse.Primitive.ConstructionData.PathBeginScale">
-            <summary></summary>
+        <member name="F:OpenMetaverse.MuteEntry.ID">
+            <summary>UUID of the mute etnry</summary>
         </member>
-        <member name="P:OpenMetaverse.Primitive.ConstructionData.PathEndScale">
-            <summary></summary>
+        <member name="F:OpenMetaverse.MuteEntry.Name">
+            <summary>Mute entry name</summary>
         </member>
-        <member name="T:OpenMetaverse.Primitive.FlexibleData">
-            <summary>
-            Information on the flexible properties of a primitive
-            </summary>
+        <member name="F:OpenMetaverse.MuteEntry.Flags">
+            <summary>Mute flags</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.FlexibleData.Softness">
-            <summary></summary>
+        <member name="T:OpenMetaverse.TransactionInfo">
+            <summary>Transaction detail sent with MoneyBalanceReply message</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.FlexibleData.Gravity">
-            <summary></summary>
+        <member name="F:OpenMetaverse.TransactionInfo.TransactionType">
+            <summary>Type of the transaction</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.FlexibleData.Drag">
-            <summary></summary>
+        <member name="F:OpenMetaverse.TransactionInfo.SourceID">
+            <summary>UUID of the transaction source</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.FlexibleData.Wind">
-            <summary></summary>
+        <member name="F:OpenMetaverse.TransactionInfo.IsSourceGroup">
+            <summary>Is the transaction source a group</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.FlexibleData.Tension">
-            <summary></summary>
+        <member name="F:OpenMetaverse.TransactionInfo.DestID">
+            <summary>UUID of the transaction destination</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.FlexibleData.Force">
-            <summary></summary>
+        <member name="F:OpenMetaverse.TransactionInfo.IsDestGroup">
+            <summary>Is transaction destination a group</summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.FlexibleData.#ctor">
-            <summary>
-            Default constructor
-            </summary>
+        <member name="F:OpenMetaverse.TransactionInfo.Amount">
+            <summary>Transaction amount</summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.FlexibleData.#ctor(System.Byte[],System.Int32)">
-            <summary>
-            
-            </summary>
-            <param name="data"></param>
-            <param name="pos"></param>
-        </member>
-        <member name="M:OpenMetaverse.Primitive.FlexibleData.GetBytes">
-            <summary>
-            
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:OpenMetaverse.Primitive.FlexibleData.GetOSD">
-            <summary>
-            
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="T:OpenMetaverse.Primitive.LightData">
-            <summary>
-            Information on the light properties of a primitive
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.LightData.Color">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.LightData.Intensity">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.LightData.Radius">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.LightData.Cutoff">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.LightData.Falloff">
-            <summary></summary>
+        <member name="F:OpenMetaverse.TransactionInfo.ItemDescription">
+            <summary>Transaction description</summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.LightData.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Primitive.LightData.#ctor(System.Byte[],System.Int32)">
-            <summary>
-            
-            </summary>
-            <param name="data"></param>
-            <param name="pos"></param>
-        </member>
-        <member name="M:OpenMetaverse.Primitive.LightData.GetBytes">
-            <summary>
-            
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:OpenMetaverse.Primitive.LightData.ToString">
-            <summary>
-            
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="T:OpenMetaverse.Primitive.SculptData">
-            <summary>
-            Information on the sculpt properties of a sculpted primitive
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Primitive.SculptData.#ctor">
+        <member name="T:OpenMetaverse.AgentManager">
             <summary>
-            Default constructor
+            Manager class for our own avatar
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.SculptData.#ctor(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.AgentManager.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            
+            Constructor, setup callbacks for packets related to our avatar
             </summary>
-            <param name="data"></param>
-            <param name="pos"></param>
+            <param name="client">A reference to the <seealso cref="T:OpenMetaverse.GridClient" /> Class</param>
         </member>
-        <member name="P:OpenMetaverse.Primitive.SculptData.Invert">
+        <member name="T:OpenMetaverse.AgentManager.AgentMovement">
             <summary>
-            Render inside out (inverts the normals).
+            Agent movement and camera control
+            Agent movement is controlled by setting specific <seealso cref="T:AgentManager.ControlFlags" />
+            After the control flags are set, An AgentUpdate is required to update the simulator of the specified flags
+            This is most easily accomplished by setting one or more of the AgentMovement properties
+            Movement of an avatar is always based on a compass direction, for example AtPos will move the
+            agent from West to East or forward on the X Axis, AtNeg will of course move agent from
+            East to West or backward on the X Axis, LeftPos will be South to North or forward on the Y Axis
+            The Z axis is Up, finer grained control of movements can be done using the Nudge properties
             </summary>
         </member>
-        <member name="P:OpenMetaverse.Primitive.SculptData.Mirror">
-            <summary>
-            Render an X axis mirror of the sculpty.
-            </summary>
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.#ctor(OpenMetaverse.GridClient)">
+            <summary>Default constructor</summary>
         </member>
-        <member name="T:OpenMetaverse.Primitive.ObjectProperties">
+        <member name="T:OpenMetaverse.AgentManager.AgentMovement.AgentCamera">
             <summary>
-            Extended properties to describe an object
+            Camera controls for the agent, mostly a thin wrapper around
+            CoordinateFrame. This class is only responsible for state
+            tracking and math, it does not send any packets
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.ObjectID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.CreatorID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.OwnerID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.GroupID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.CreationDate">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Permissions">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.OwnershipCost">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.SaleType">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.SalePrice">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.AggregatePerms">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.AggregatePermTextures">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.AggregatePermTexturesOwner">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Category">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.InventorySerial">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.ItemID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.FolderID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.FromTaskID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.LastOwnerID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Name">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Description">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.TouchName">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.SitName">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.TextureIDs">
-            <summary></summary>
-        </member>
-        <member name="M:OpenMetaverse.Primitive.ObjectProperties.#ctor">
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.#ctor">
             <summary>
             Default constructor
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.ObjectProperties.SetFamilyProperties(OpenMetaverse.Primitive.ObjectProperties)">
-            <summary>
-            Set the properties that are set in an ObjectPropertiesFamily packet
-            </summary>
-            <param name="props"><seealso cref="T:OpenMetaverse.Primitive.ObjectProperties"/> that has
-            been partially filled by an ObjectPropertiesFamily packet</param>
-        </member>
-        <member name="T:OpenMetaverse.Primitive.ParticleSystem">
-            <summary>
-            Complete structure for the particle system
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartFlags">
-            <summary>Particle Flags</summary>
-            <remarks>There appears to be more data packed in to this area
-            for many particle systems. It doesn't appear to be flag values
-            and serialization breaks unless there is a flag for every
-            possible bit so it is left as an unsigned integer</remarks>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.Pattern">
-            <summary><seealso cref="T:SourcePattern"/> pattern of particles</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.MaxAge">
-            <summary>A <see langword="float"/> representing the maximimum age (in seconds) particle will be displayed</summary>
-            <remarks>Maximum value is 30 seconds</remarks>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.StartAge">
-            <summary>A <see langword="float"/> representing the number of seconds, 
-            from when the particle source comes into view, 
-            or the particle system's creation, that the object will emits particles; 
-            after this time period no more particles are emitted</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.InnerAngle">
-            <summary>A <see langword="float"/> in radians that specifies where particles will not be created</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.OuterAngle">
-            <summary>A <see langword="float"/> in radians that specifies where particles will be created</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BurstRate">
-            <summary>A <see langword="float"/> representing the number of seconds between burts.</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BurstRadius">
-            <summary>A <see langword="float"/> representing the number of meters
-            around the center of the source where particles will be created.</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BurstSpeedMin">
-            <summary>A <see langword="float"/> representing in seconds, the minimum speed between bursts of new particles 
-            being emitted</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BurstSpeedMax">
-            <summary>A <see langword="float"/> representing in seconds the maximum speed of new particles being emitted.</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BurstPartCount">
-            <summary>A <see langword="byte"/> representing the maximum number of particles emitted per burst</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.AngularVelocity">
-            <summary>A <see cref="T:Vector3"/> which represents the velocity (speed) from the source which particles are emitted</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartAcceleration">
-            <summary>A <see cref="T:Vector3"/> which represents the Acceleration from the source which particles are emitted</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.Texture">
-            <summary>The <see cref="T:UUID"/> Key of the texture displayed on the particle</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.Target">
-            <summary>The <see cref="T:UUID"/> Key of the specified target object or avatar particles will follow</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartDataFlags">
-            <summary>Flags of particle from <seealso cref="T:ParticleDataFlags"/></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartMaxAge">
-            <summary>Max Age particle system will emit particles for</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartStartColor">
-            <summary>The <see cref="T:Color4"/> the particle has at the beginning of its lifecycle</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartEndColor">
-            <summary>The <see cref="T:Color4"/> the particle has at the ending of its lifecycle</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartStartScaleX">
-            <summary>A <see langword="float"/> that represents the starting X size of the particle</summary>
-            <remarks>Minimum value is 0, maximum value is 4</remarks>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartStartScaleY">
-            <summary>A <see langword="float"/> that represents the starting Y size of the particle</summary>
-            <remarks>Minimum value is 0, maximum value is 4</remarks>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartEndScaleX">
-            <summary>A <see langword="float"/> that represents the ending X size of the particle</summary>
-            <remarks>Minimum value is 0, maximum value is 4</remarks>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartEndScaleY">
-            <summary>A <see langword="float"/> that represents the ending Y size of the particle</summary>
-            <remarks>Minimum value is 0, maximum value is 4</remarks>
-        </member>
-        <member name="M:OpenMetaverse.Primitive.ParticleSystem.#ctor(System.Byte[],System.Int32)">
-            <summary>
-            Decodes a byte[] array into a ParticleSystem Object
-            </summary>
-            <param name="data">ParticleSystem object</param>
-            <param name="pos">Start position for BitPacker</param>
-        </member>
-        <member name="M:OpenMetaverse.Primitive.ParticleSystem.GetBytes">
-            <summary>
-            Generate byte[] array from particle data
-            </summary>
-            <returns>Byte array</returns>
-        </member>
-        <member name="T:OpenMetaverse.Primitive.ParticleSystem.SourcePattern">
-            <summary>
-            Particle source pattern
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.None">
-            <summary>None</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.Drop">
-            <summary>Drop particles from source position with no force</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.Explode">
-            <summary>"Explode" particles in all directions</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.Angle">
-            <summary>Particles shoot across a 2D area</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.AngleCone">
-            <summary>Particles shoot across a 3D Cone</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.AngleConeEmpty">
-            <summary>Inverse of AngleCone (shoot particles everywhere except the 3D cone defined</summary>
-        </member>
-        <member name="T:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags">
-            <summary>
-            Particle Data Flags
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.None">
-            <summary>None</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.InterpColor">
-            <summary>Interpolate color and alpha from start to end</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.InterpScale">
-            <summary>Interpolate scale from start to end</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Bounce">
-            <summary>Bounce particles off particle sources Z height</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Wind">
-            <summary>velocity of particles is dampened toward the simulators wind</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.FollowSrc">
-            <summary>Particles follow the source</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.FollowVelocity">
-            <summary>Particles point towards the direction of source's velocity</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.TargetPos">
-            <summary>Target of the particles</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.TargetLinear">
-            <summary>Particles are sent in a straight line</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Emissive">
-            <summary>Particles emit a glow</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Beam">
-            <summary>used for point/grab/touch</summary>
-        </member>
-        <member name="T:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags">
-            <summary>
-            Particle Flags Enum
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags.None">
-            <summary>None</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags.ObjectRelative">
-            <summary>Acceleration and velocity for particles are
-            relative to the object rotation</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags.UseNewAngle">
-            <summary>Particles use new 'correct' angle parameters</summary>
-        </member>
-        <member name="T:OpenMetaverse.Primitive.TextureAnimMode">
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.Far">
             <summary>
-            Texture animation mode
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.ANIM_OFF">
-            <summary>Disable texture animation</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.ANIM_ON">
-            <summary>Enable texture animation</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.LOOP">
-            <summary>Loop when animating textures</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.REVERSE">
-            <summary>Animate in reverse direction</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.PING_PONG">
-            <summary>Animate forward then reverse</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.SMOOTH">
-            <summary>Slide texture smoothly instead of frame-stepping</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.ROTATE">
-            <summary>Rotate texture instead of using frames</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.SCALE">
-            <summary>Scale texture instead of using frames</summary>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.Frame">
+            <summary>The camera is a local frame of reference inside of
+            the larger grid space. This is where the math happens</summary>
         </member>
-        <member name="T:OpenMetaverse.Primitive.TextureEntryFace">
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.Position">
             <summary>
-            A single textured face. Don't instantiate this class yourself, use the
-            methods in TextureEntry
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntryFace.#ctor(OpenMetaverse.Primitive.TextureEntryFace)">
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.AtAxis">
             <summary>
-            Contains the definition for individual faces
             </summary>
-            <param name="defaultTexture"></param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntryFace.ToString">
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.LeftAxis">
             <summary>
-            
             </summary>
-            <returns></returns>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.material">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.media">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.RGBA">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.RepeatU">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.RepeatV">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.OffsetU">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.OffsetV">
-            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.Rotation">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.Glow">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.Bump">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.MediaFlags">
-            <summary>In the future this will specify whether a webpage is
-            attached to this face</summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.TextureID">
-            <summary></summary>
-        </member>
-        <member name="T:OpenMetaverse.Primitive.TextureEntry">
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.UpAxis">
             <summary>
-            Represents all of the texturable faces for an object
             </summary>
-            <remarks>Grid objects have infinite faces, with each face
-            using the properties of the default face unless set otherwise. So if
-            you have a TextureEntry with a default texture uuid of X, and face 18
-            has a texture UUID of Y, every face would be textured with X except for
-            face 18 that uses Y. In practice however, primitives utilize a maximum
-            of nine faces</remarks>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.TextureEntry.DefaultTexture">
-            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureEntry.FaceTextures">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.Camera">
+            <summary>Agent camera controls</summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.#ctor(OpenMetaverse.UUID)">
-            <summary>
-            Constructor that takes a default texture UUID
-            </summary>
-            <param name="defaultTextureID">Texture UUID to use as the default texture</param>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.Flags">
+            <summary>Currently only used for hiding your group title</summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.#ctor(OpenMetaverse.Primitive.TextureEntryFace)">
-            <summary>
-            Constructor that takes a <code>TextureEntryFace</code> for the
-            default face
-            </summary>
-            <param name="defaultFace">Face to use as the default face</param>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.State">
+            <summary>Action state of the avatar, which can currently be
+            typing and editing</summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.#ctor(System.Byte[],System.Int32,System.Int32)">
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.BodyRotation">
             <summary>
-            Constructor that creates the TextureEntry class from a byte array
             </summary>
-            <param name="data">Byte array containing the TextureEntry field</param>
-            <param name="pos">Starting position of the TextureEntry field in 
-            the byte array</param>
-            <param name="length">Length of the TextureEntry field, in bytes</param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.CreateFace(System.UInt32)">
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.HeadRotation">
             <summary>
-            This will either create a new face if a custom face for the given
-            index is not defined, or return the custom face for that index if
-            it already exists
             </summary>
-            <param name="index">The index number of the face to create or 
-            retrieve</param>
-            <returns>A TextureEntryFace containing all the properties for that
-            face</returns>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.GetFace(System.UInt32)">
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastBodyRotation">
             <summary>
-            
             </summary>
-            <param name="index"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.GetOSD">
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastHeadRotation">
             <summary>
-            
             </summary>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.GetBytes">
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastCameraCenter">
             <summary>
-            
             </summary>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.ToString">
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastCameraXAxis">
             <summary>
-            
             </summary>
-            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Primitive.TextureAnimation">
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastCameraYAxis">
             <summary>
-            Controls the texture animation of a particular prim
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Flags">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Face">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimation.SizeX">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimation.SizeY">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Start">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Length">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Rate">
-            <summary></summary>
-        </member>
-        <member name="M:OpenMetaverse.Primitive.TextureAnimation.#ctor(System.Byte[],System.Int32)">
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastCameraZAxis">
             <summary>
-            
             </summary>
-            <param name="data"></param>
-            <param name="pos"></param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureAnimation.GetBytes">
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastFar">
             <summary>
-            
             </summary>
-            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Imaging.OpenJPEG">
-            <summary>
-            A Wrapper around openjpeg to encode and decode images to and from byte arrays
-            </summary>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.updateTimer">
+            <summary>Timer for sending AgentUpdate packets</summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.OpenJPEG.TGA_HEADER_SIZE">
-            <summary>TGA Header size</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AtPos">
+            <summary>Move agent positive along the X axis</summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.OpenJPEG.OpenJPEGLock">
-            <summary>OpenJPEG is not threadsafe, so this object is used to lock
-            during calls into unmanaged code</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AtNeg">
+            <summary>Move agent negative along the X axis</summary>
         </member>
-        <member name="M:OpenMetaverse.Imaging.OpenJPEG.Encode(OpenMetaverse.Imaging.ManagedImage,System.Boolean)">
-            <summary>
-            Encode a <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object into a byte array
-            </summary>
-            <param name="image">The <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object to encode</param>
-            <param name="lossless">true to enable lossless conversion, only useful for small images ie: sculptmaps</param>
-            <returns>A byte array containing the encoded Image object</returns>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.LeftPos">
+            <summary>Move agent positive along the Y axis</summary>
         </member>
-        <member name="M:OpenMetaverse.Imaging.OpenJPEG.Encode(OpenMetaverse.Imaging.ManagedImage)">
-            <summary>
-            Encode a <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object into a byte array
-            </summary>
-            <param name="image">The <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object to encode</param>
-            <returns>a byte array of the encoded image</returns>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.LeftNeg">
+            <summary>Move agent negative along the Y axis</summary>
         </member>
-        <member name="M:OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(System.Byte[],OpenMetaverse.Imaging.ManagedImage@,System.Drawing.Image@)">
-            <summary>
-            Decode JPEG2000 data to an <seealso cref="T:System.Drawing.Image"/> and
-            <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/>
-            </summary>
-            <param name="encoded">JPEG2000 encoded data</param>
-            <param name="managedImage">ManagedImage object to decode to</param>
-            <param name="image">Image object to decode to</param>
-            <returns>True if the decode succeeds, otherwise false</returns>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.UpPos">
+            <summary>Move agent positive along the Z axis</summary>
         </member>
-        <member name="M:OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(System.Byte[],OpenMetaverse.Imaging.ManagedImage@)">
-            <summary>
-            
-            </summary>
-            <param name="encoded"></param>
-            <param name="managedImage"></param>
-            <returns></returns>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.UpNeg">
+            <summary>Move agent negative along the Z axis</summary>
         </member>
-        <member name="M:OpenMetaverse.Imaging.OpenJPEG.DecodeLayerBoundaries(System.Byte[],OpenMetaverse.Imaging.OpenJPEG.J2KLayerInfo[]@,System.Int32@)">
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.PitchPos">
             <summary>
-            
             </summary>
-            <param name="encoded"></param>
-            <param name="layerInfo"></param>
-            <param name="components"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Imaging.OpenJPEG.EncodeFromImage(System.Drawing.Bitmap,System.Boolean)">
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.PitchNeg">
             <summary>
-            Encode a <seealso cref="T:System.Drawing.Bitmap"/> object into a byte array
             </summary>
-            <param name="bitmap">The source <seealso cref="T:System.Drawing.Bitmap"/> object to encode</param>
-            <param name="lossless">true to enable lossless decoding</param>
-            <returns>A byte array containing the source Bitmap object</returns>
         </member>
-        <member name="T:OpenMetaverse.Imaging.OpenJPEG.J2KLayerInfo">
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.YawPos">
             <summary>
-            Defines the beginning and ending file positions of a layer in an
-            LRCP-progression JPEG2000 file
             </summary>
         </member>
-        <member name="T:OpenMetaverse.Imaging.OpenJPEG.MarshalledImage">
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.YawNeg">
             <summary>
-            This structure is used to marshal both encoded and decoded images.
-            MUST MATCH THE STRUCT IN dotnet.h!
             </summary>
         </member>
-        <member name="T:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket">
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FastAt">
             <summary>
-            Information about a single packet in a JPEG2000 stream
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket.start_pos">
-            <summary>Packet start position</summary>
-        </member>
-        <member name="F:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket.end_ph_pos">
-            <summary>Packet header end position</summary>
-        </member>
-        <member name="F:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket.end_pos">
-            <summary>Packet end position</summary>
-        </member>
-        <member name="T:OpenMetaverse.Assets.AssetBodypart">
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FastLeft">
             <summary>
-            Represents an <seealso cref="T:OpenMetaverse.Assets.AssetWearable"/> that represents an avatars body ie: Hair, Etc.
             </summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetWearable">
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FastUp">
             <summary>
-            Represents a Wearable Asset, Clothing, Hair, Skin, Etc
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.Name">
-            <summary>A string containing the name of the asset</summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.Description">
-            <summary>A string containing a short description of the asset</summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.WearableType">
-            <summary>The Assets WearableType</summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.ForSale">
-            <summary>The For-Sale status of the object</summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.SalePrice">
-            <summary>An Integer representing the purchase price of the asset</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.Fly">
+            <summary>Causes simulator to make agent fly</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.Creator">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the assets creator</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.Stop">
+            <summary>Stop movement</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.Owner">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the assets current owner</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FinishAnim">
+            <summary>Finish animation</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.LastOwner">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the assets prior owner</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.StandUp">
+            <summary>Stand up from a sit</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.Group">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the Group this asset is set to</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.SitOnGround">
+            <summary>Tells simulator to sit agent on ground</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.GroupOwned">
-            <summary>True if the asset is owned by a <seealso cref="F:OpenMetaverse.Assets.AssetWearable.Group"/></summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.Mouselook">
+            <summary>Place agent into mouselook mode</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.Permissions">
-            <summary>The Permissions mask of the asset</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeAtPos">
+            <summary>Nudge agent positive along the X axis</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.Params">
-            <summary>A Dictionary containing Key/Value pairs of the objects parameters</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeAtNeg">
+            <summary>Nudge agent negative along the X axis</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.Textures">
-            <summary>A Dictionary containing Key/Value pairs where the Key is the textures Index and the Value is the Textures <seealso cref="T:OpenMetaverse.UUID"/></summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeLeftPos">
+            <summary>Nudge agent positive along the Y axis</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetWearable.#ctor">
-            <summary>Initializes a new instance of an AssetWearable object</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeLeftNeg">
+            <summary>Nudge agent negative along the Y axis</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetWearable.#ctor(OpenMetaverse.UUID,System.Byte[])">
-            <summary>Initializes a new instance of an AssetWearable object with parameters</summary>
-            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
-            <param name="assetData">A byte array containing the raw asset data</param>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeUpPos">
+            <summary>Nudge agent positive along the Z axis</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetWearable.Decode">
-            <summary>
-            Decode an assets byte encoded data to a string
-            </summary>
-            <returns>true if the asset data was decoded successfully</returns>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeUpNeg">
+            <summary>Nudge agent negative along the Z axis</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetWearable.Encode">
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.TurnLeft">
             <summary>
-            Encode the assets string represantion into a format consumable by the asset server
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetBodypart.#ctor">
-            <summary>Initializes a new instance of an AssetBodyPart object</summary>
-        </member>
-        <member name="M:OpenMetaverse.Assets.AssetBodypart.#ctor(OpenMetaverse.UUID,System.Byte[])">
-            <summary>Initializes a new instance of an AssetBodyPart object with parameters</summary>
-            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
-            <param name="assetData">A byte array containing the raw asset data</param>
-        </member>
-        <member name="P:OpenMetaverse.Assets.AssetBodypart.AssetType">
-            <summary>Override the base classes AssetType</summary>
-        </member>
-        <member name="T:OpenMetaverse.FieldType">
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.TurnRight">
             <summary>
-            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.U8">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FieldType.U16">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FieldType.U32">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FieldType.U64">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FieldType.S8">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FieldType.S16">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FieldType.S32">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FieldType.F32">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FieldType.F64">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FieldType.UUID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FieldType.BOOL">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FieldType.Vector3">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FieldType.Vector3d">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FieldType.Vector4">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FieldType.Quaternion">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FieldType.IPADDR">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FieldType.IPPORT">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FieldType.Variable">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FieldType.Fixed">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FieldType.Single">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FieldType.Multiple">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.Away">
+            <summary>Tell simulator to mark agent as away</summary>
         </member>
-        <member name="T:OpenMetaverse.MapField">
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.LButtonDown">
             <summary>
-            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MapField.KeywordPosition">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MapField.Name">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MapField.Type">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MapField.Count">
-            <summary></summary>
-        </member>
-        <member name="M:OpenMetaverse.MapField.CompareTo(System.Object)">
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.LButtonUp">
             <summary>
-            
             </summary>
-            <param name="obj"></param>
-            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.MapBlock">
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.MLButtonDown">
             <summary>
-            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MapBlock.KeywordPosition">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MapBlock.Name">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MapBlock.Count">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MapBlock.Fields">
-            <summary></summary>
-        </member>
-        <member name="M:OpenMetaverse.MapBlock.CompareTo(System.Object)">
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.MLButtonUp">
             <summary>
-            
             </summary>
-            <param name="obj"></param>
-            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.MapPacket">
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AlwaysRun">
             <summary>
-            
+            Returns "always run" value, or changes it by sending a SetAlwaysRunPacket
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MapPacket.ID">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MapPacket.Name">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MapPacket.Frequency">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentControls">
+            <summary>The current value of the agent control flags</summary>
         </member>
-        <member name="F:OpenMetaverse.MapPacket.Trusted">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.UpdateInterval">
+            <summary>Gets or sets the interval in milliseconds at which
+            AgentUpdate packets are sent to the current simulator. Setting
+            this to a non-zero value will also enable the packet sending if
+            it was previously off, and setting it to zero will disable</summary>
         </member>
-        <member name="F:OpenMetaverse.MapPacket.Encoded">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.UpdateEnabled">
+            <summary>Gets or sets whether AgentUpdate packets are sent to
+            the current simulator</summary>
         </member>
-        <member name="F:OpenMetaverse.MapPacket.Blocks">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AutoResetControls">
+            <summary>Reset movement controls every time we send an update</summary>
         </member>
-        <member name="T:OpenMetaverse.ProtocolManager">
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.UpdateFromHeading(System.Double,System.Boolean)">
             <summary>
-            
+            Send an AgentUpdate with the camera set at the current agent
+            position and pointing towards the heading specified
             </summary>
+            <param name="heading">Camera rotation in radians</param>
+            <param name="reliable">Whether to send the AgentUpdate reliable
+            or not</param>
         </member>
-        <member name="F:OpenMetaverse.ProtocolManager.TypeSizes">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.ProtocolManager.KeywordPositions">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.ProtocolManager.LowMaps">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.ProtocolManager.MediumMaps">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.ProtocolManager.HighMaps">
-            <summary></summary>
-        </member>
-        <member name="M:OpenMetaverse.ProtocolManager.#ctor(System.String,OpenMetaverse.GridClient)">
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.TurnToward(OpenMetaverse.Vector3)">
             <summary>
-            
+            Rotates the avatar body and camera toward a target position.
+            This will also anchor the camera position on the avatar
             </summary>
-            <param name="mapFile"></param>
-            <param name="client"></param>
+            <param name="target">Region coordinates to turn toward</param>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.Command(System.String)">
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.SendUpdate">
             <summary>
-            
+            Send new AgentUpdate packet to update our current camera
+            position and rotation
             </summary>
-            <param name="command"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.Command(System.Byte[])">
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.SendUpdate(System.Boolean)">
             <summary>
-            
+            Send new AgentUpdate packet to update our current camera
+            position and rotation
             </summary>
-            <param name="data"></param>
-            <returns></returns>
+            <param name="reliable">Whether to require server acknowledgement
+            of this packet</param>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.Command(System.UInt16,OpenMetaverse.PacketFrequency)">
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.SendUpdate(System.Boolean,OpenMetaverse.Simulator)">
             <summary>
-            
+            Send new AgentUpdate packet to update our current camera
+            position and rotation
             </summary>
-            <param name="command"></param>
-            <param name="frequency"></param>
-            <returns></returns>
+            <param name="reliable">Whether to require server acknowledgement
+            of this packet</param>
+            <param name="simulator">Simulator to send the update to</param>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.PrintMap">
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.SendManualUpdate(OpenMetaverse.AgentManager.ControlFlags,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Quaternion,OpenMetaverse.Quaternion,System.Single,OpenMetaverse.AgentFlags,OpenMetaverse.AgentState,System.Boolean)">
             <summary>
-            
+            Builds an AgentUpdate packet entirely from parameters. This
+            will not touch the state of Self.Movement or
+            Self.Movement.Camera in any way
             </summary>
+            <param name="controlFlags">
+            </param>
+            <param name="position">
+            </param>
+            <param name="forwardAxis">
+            </param>
+            <param name="leftAxis">
+            </param>
+            <param name="upAxis">
+            </param>
+            <param name="bodyRotation">
+            </param>
+            <param name="headRotation">
+            </param>
+            <param name="farClip">
+            </param>
+            <param name="reliable">
+            </param>
+            <param name="flags">
+            </param>
+            <param name="state">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.PrintOneMap(OpenMetaverse.MapPacket[],System.String)">
+        <member name="T:OpenMetaverse.AgentManager.ControlFlags">
             <summary>
-            
+            Used to specify movement actions for your agent
             </summary>
-            <param name="map"></param>
-            <param name="frequency"></param>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.DecodeMapFile(System.String,System.String)">
-            <summary>
-            
-            </summary>
-            <param name="mapFile"></param>
-            <param name="outputFile"></param>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.NONE">
+            <summary>Empty flag</summary>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.LoadMapFile(System.String)">
-            <summary>
-            
-            </summary>
-            <param name="mapFile"></param>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_AT_POS">
+            <summary>Move Forward (SL Keybinding: W/Up Arrow)</summary>
         </member>
-        <member name="T:OpenMetaverse.ScriptPermission">
-            <summary>
-            Permission request flags, asked when a script wants to control an Avatar
-            </summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG">
+            <summary>Move Backward (SL Keybinding: S/Down Arrow)</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.None">
-            <summary>Placeholder for empty values, shouldn't ever see this</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS">
+            <summary>Move Left (SL Keybinding: Shift-(A/Left Arrow))</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.Debit">
-            <summary>Script wants ability to take money from you</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG">
+            <summary>Move Right (SL Keybinding: Shift-(D/Right Arrow))</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.TakeControls">
-            <summary>Script wants to take camera controls for you</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_UP_POS">
+            <summary>Not Flying: Jump/Flying: Move Up (SL Keybinding: E)</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.RemapControls">
-            <summary>Script wants to remap avatars controls</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG">
+            <summary>Not Flying: Croutch/Flying: Move Down (SL Keybinding: C)</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.TriggerAnimation">
-            <summary>Script wants to trigger avatar animations</summary>
-            <remarks>This function is not implemented on the grid</remarks>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_PITCH_POS">
+            <summary>Unused</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.Attach">
-            <summary>Script wants to attach or detach the prim or primset to your avatar</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_PITCH_NEG">
+            <summary>Unused</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.ReleaseOwnership">
-            <summary>Script wants permission to release ownership</summary>
-            <remarks>This function is not implemented on the grid
-            The concept of "public" objects does not exist anymore.</remarks>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_YAW_POS">
+            <summary>Unused</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.ChangeLinks">
-            <summary>Script wants ability to link/delink with other prims</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_YAW_NEG">
+            <summary>Unused</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.ChangeJoints">
-            <summary>Script wants permission to change joints</summary>
-            <remarks>This function is not implemented on the grid</remarks>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_FAST_AT">
+            <summary>ORed with AGENT_CONTROL_AT_* if the keyboard is being used</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.ChangePermissions">
-            <summary>Script wants permissions to change permissions</summary>
-            <remarks>This function is not implemented on the grid</remarks>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_FAST_LEFT">
+            <summary>ORed with AGENT_CONTROL_LEFT_* if the keyboard is being used</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.TrackCamera">
-            <summary>Script wants to track avatars camera position and rotation </summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_FAST_UP">
+            <summary>ORed with AGENT_CONTROL_UP_* if the keyboard is being used</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.ControlCamera">
-            <summary>Script wants to control your camera</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_FLY">
+            <summary>Fly</summary>
         </member>
-        <member name="T:OpenMetaverse.InstantMessageDialog">
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_STOP">
             <summary>
-            Special commands used in Instant Messages
             </summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.MessageFromAgent">
-            <summary>Indicates a regular IM from another agent</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.MessageBox">
-            <summary>Simple notification box with an OK button</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GroupInvitation">
-            <summary>You've been invited to join a group.</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.InventoryOffered">
-            <summary>Inventory offer</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.InventoryAccepted">
-            <summary>Accepted inventory offer</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.InventoryDeclined">
-            <summary>Declined inventory offer</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GroupVote">
-            <summary>Group vote</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.TaskInventoryOffered">
-            <summary>An object is offering its inventory</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.TaskInventoryAccepted">
-            <summary>Accept an inventory offer from an object</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.TaskInventoryDeclined">
-            <summary>Decline an inventory offer from an object</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.NewUserDefault">
-            <summary>Unknown</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.SessionAdd">
-            <summary>Start a session, or add users to a session</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.SessionOfflineAdd">
-            <summary>Start a session, but don't prune offline users</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.SessionGroupStart">
-            <summary>Start a session with your group</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.SessionCardlessStart">
-            <summary>Start a session without a calling card (finder or objects)</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.SessionSend">
-            <summary>Send a message to a session</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.SessionDrop">
-            <summary>Leave a session</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.MessageFromObject">
-            <summary>Indicates that the IM is from an object</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.BusyAutoResponse">
-            <summary>Sent an IM to a busy user, this is the auto response</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.ConsoleAndChatHistory">
-            <summary>Shows the message in the console and chat history</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.RequestTeleport">
-            <summary>Send a teleport lure</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.AcceptTeleport">
-            <summary>Response sent to the agent which inititiated a teleport invitation</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.DenyTeleport">
-            <summary>Response sent to the agent which inititiated a teleport invitation</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GodLikeRequestTeleport">
-            <summary>Only useful if you have Linden permissions</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.CurrentlyUnused">
-            <summary>A placeholder type for future expansion, currently not
-            used</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GotoUrl">
-            <summary>IM to tell the user to go to an URL</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.Session911Start">
-            <summary>IM for help</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.Lure911">
-            <summary>IM sent automatically on call for help, sends a lure 
-            to each Helper reached</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.FromTaskAsAlert">
-            <summary>Like an IM but won't go to email</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GroupNotice">
-            <summary>IM from a group officer to all group members</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GroupNoticeInventoryAccepted">
-            <summary>Unknown</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GroupNoticeInventoryDeclined">
-            <summary>Unknown</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GroupInvitationAccept">
-            <summary>Accept a group invitation</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GroupInvitationDecline">
-            <summary>Decline a group invitation</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_FINISH_ANIM">
+            <summary>Finish our current animation</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GroupNoticeRequested">
-            <summary>Unknown</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP">
+            <summary>Stand up from the ground or a prim seat</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.FriendshipOffered">
-            <summary>An avatar is offering you friendship</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND">
+            <summary>Sit on the ground at our current location</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.FriendshipAccepted">
-            <summary>An avatar has accepted your friendship offer</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK">
+            <summary>Whether mouselook is currently enabled</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.FriendshipDeclined">
-            <summary>An avatar has declined your friendship offer</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS">
+            <summary>Legacy, used if a key was pressed for less than a certain amount of time</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.StartTyping">
-            <summary>Indicates that a user has started typing</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_NEG">
+            <summary>Legacy, used if a key was pressed for less than a certain amount of time</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.StopTyping">
-            <summary>Indicates that a user has stopped typing</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_POS">
+            <summary>Legacy, used if a key was pressed for less than a certain amount of time</summary>
         </member>
-        <member name="T:OpenMetaverse.InstantMessageOnline">
-            <summary>
-            Flag in Instant Messages, whether the IM should be delivered to
-            offline avatars as well
-            </summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_NEG">
+            <summary>Legacy, used if a key was pressed for less than a certain amount of time</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageOnline.Online">
-            <summary>Only deliver to online avatars</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_POS">
+            <summary>Legacy, used if a key was pressed for less than a certain amount of time</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageOnline.Offline">
-            <summary>If the avatar is offline the message will be held until
-            they login next, and possibly forwarded to their e-mail account</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG">
+            <summary>Legacy, used if a key was pressed for less than a certain amount of time</summary>
         </member>
-        <member name="T:OpenMetaverse.ChatType">
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT">
             <summary>
-            Conversion type to denote Chat Packet types in an easier-to-understand format
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ChatType.Whisper">
-            <summary>Whisper (5m radius)</summary>
-        </member>
-        <member name="F:OpenMetaverse.ChatType.Normal">
-            <summary>Normal chat (10/20m radius), what the official viewer typically sends</summary>
-        </member>
-        <member name="F:OpenMetaverse.ChatType.Shout">
-            <summary>Shouting! (100m radius)</summary>
-        </member>
-        <member name="F:OpenMetaverse.ChatType.StartTyping">
-            <summary>Event message when an Avatar has begun to type</summary>
-        </member>
-        <member name="F:OpenMetaverse.ChatType.StopTyping">
-            <summary>Event message when an Avatar has stopped typing</summary>
-        </member>
-        <member name="F:OpenMetaverse.ChatType.Debug">
-            <summary>Send the message to the debug channel</summary>
-        </member>
-        <member name="F:OpenMetaverse.ChatType.OwnerSay">
-            <summary>Event message when an object uses llOwnerSay</summary>
-        </member>
-        <member name="F:OpenMetaverse.ChatType.RegionSay">
-            <summary>Special value to support llRegionSay, never sent to the client</summary>
-        </member>
-        <member name="T:OpenMetaverse.ChatSourceType">
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT">
             <summary>
-            Identifies the source of a chat message
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ChatSourceType.System">
-            <summary>Chat from the grid or simulator</summary>
-        </member>
-        <member name="F:OpenMetaverse.ChatSourceType.Agent">
-            <summary>Chat from another avatar</summary>
-        </member>
-        <member name="F:OpenMetaverse.ChatSourceType.Object">
-            <summary>Chat from an object</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_AWAY">
+            <summary>Set when the avatar is idled or set to away. Note that the away animation is
+            activated separately from setting this flag</summary>
         </member>
-        <member name="T:OpenMetaverse.ChatAudibleLevel">
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_DOWN">
             <summary>
-            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ChatAudibleLevel.Not">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.ChatAudibleLevel.Barely">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.ChatAudibleLevel.Fully">
-            <summary></summary>
-        </member>
-        <member name="T:OpenMetaverse.EffectType">
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_UP">
             <summary>
-            Effect type used in ViewerEffect packets
             </summary>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Text">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.EffectType.Icon">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.EffectType.Connector">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.EffectType.FlexibleObject">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.EffectType.AnimalControls">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.EffectType.AnimationObject">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.EffectType.Cloth">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.EffectType.Beam">
-            <summary>Project a beam from a source to a destination, such as
-            the one used when editing an object</summary>
-        </member>
-        <member name="F:OpenMetaverse.EffectType.Glow">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.EffectType.Point">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.EffectType.Trail">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.EffectType.Sphere">
-            <summary>Create a swirl of particles around an object</summary>
-        </member>
-        <member name="F:OpenMetaverse.EffectType.Spiral">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.EffectType.Edit">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.EffectType.LookAt">
-            <summary>Cause an avatar to look at an object</summary>
-        </member>
-        <member name="F:OpenMetaverse.EffectType.PointAt">
-            <summary>Cause an avatar to point at an object</summary>
-        </member>
-        <member name="T:OpenMetaverse.LookAtType">
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_ML_LBUTTON_DOWN">
             <summary>
-            The action an avatar is doing when looking at something, used in 
-            ViewerEffect packets for the LookAt effect
             </summary>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.None">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.LookAtType.Idle">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.LookAtType.AutoListen">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.LookAtType.FreeLook">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.LookAtType.Respond">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.LookAtType.Hover">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.LookAtType.Conversation">
-            <summary>Deprecated</summary>
-        </member>
-        <member name="F:OpenMetaverse.LookAtType.Select">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.LookAtType.Focus">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.LookAtType.Mouselook">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.LookAtType.Clear">
-            <summary></summary>
-        </member>
-        <member name="T:OpenMetaverse.PointAtType">
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_ML_LBUTTON_UP">
             <summary>
-            The action an avatar is doing when pointing at something, used in
-            ViewerEffect packets for the PointAt effect
             </summary>
         </member>
-        <member name="F:OpenMetaverse.PointAtType.None">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PointAtType.Select">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PointAtType.Grab">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PointAtType.Clear">
-            <summary></summary>
-        </member>
-        <member name="T:OpenMetaverse.MoneyTransactionType">
+        <member name="T:OpenMetaverse.AgentManager.AttachmentResourcesCallback">
             <summary>
-            Money transaction types
+            Called once attachment resource usage information has been collected
             </summary>
+            <param name="success">Indicates if operation was successfull</param>
+            <param name="info">Attachment resource usage information</param>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.None">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.FailSimulatorTimeout">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.FailDataserverTimeout">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectClaim">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LandClaim">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupCreate">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPublicClaim">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupJoin">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.TeleportCharge">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.UploadCharge">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LandAuction">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ClassifiedCharge">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectTax">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LandTax">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LightTax">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ParcelDirFee">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupTax">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ClassifiedRenew">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GiveInventory">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectSale">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.Gift">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LandSale">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ReferBonus">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.InventorySale">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.RefundPurchase">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LandPassSale">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.DwellBonus">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.PayObject">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPays">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupLandDeed">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupObjectDeed">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupLiability">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupDividend">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupMembershipDues">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectRelease">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LandRelease">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectDelete">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPublicDecay">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPublicDelete">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LindenAdjustment">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LindenGrant">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_Chat">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LindenPenalty">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ChatLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.EventFee">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ScriptDialog">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.EventPrize">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ScriptDialogLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.StipendBasic">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ScriptQuestion">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.StipendDeveloper">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ScriptQuestionLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.StipendAlways">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_LoadURL">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.StipendDaily">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_LoadUrlLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.StipendRating">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_Balance">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.StipendDelta">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_BalanceLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.TransactionFlags">
-            <summary>
-            
-            </summary>
+        <member name="F:OpenMetaverse.AgentManager.m_MoneyBalance">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.TransactionFlags.None">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_MoneyBalanceReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.TransactionFlags.SourceGroup">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_InstantMessage">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.TransactionFlags.DestGroup">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_InstantMessageLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.TransactionFlags.OwnerGroup">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_Teleport">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.TransactionFlags.SimultaneousContribution">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_TeleportLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.TransactionFlags.ContributionRemoval">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_AgentData">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.MeanCollisionType">
-            <summary>
-            
-            </summary>
+        <member name="F:OpenMetaverse.AgentManager.m_AgentDataLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.MeanCollisionType.None">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_AnimationsChanged">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.MeanCollisionType.Bump">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_AnimationsChangedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.MeanCollisionType.LLPushObject">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_MeanCollision">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.MeanCollisionType.SelectedObjectCollide">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_MeanCollisionLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.MeanCollisionType.ScriptedObjectCollide">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_RegionCrossed">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.MeanCollisionType.PhysicalObjectCollide">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_RegionCrossedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.ScriptControlChange">
-            <summary>
-            Flags sent when a script takes or releases a control
-            </summary>
-            <remarks>NOTE: (need to verify) These might be a subset of the ControlFlags enum in Movement,</remarks>
+        <member name="F:OpenMetaverse.AgentManager.m_GroupChatJoined">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.None">
-            <summary>No Flags set</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_GroupChatJoinedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.Forward">
-            <summary>Forward (W or up Arrow)</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_AlertMessage">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.Back">
-            <summary>Back (S or down arrow)</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_AlertMessageLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.Left">
-            <summary>Move left (shift+A or left arrow)</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ScriptControl">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.Right">
-            <summary>Move right (shift+D or right arrow)</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ScriptControlLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.Up">
-            <summary>Up (E or PgUp)</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_CameraConstraint">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.Down">
-            <summary>Down (C or PgDown)</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_CameraConstraintLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.RotateLeft">
-            <summary>Rotate left (A or left arrow)</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ScriptSensorReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.RotateRight">
-            <summary>Rotate right (D or right arrow)</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ScriptSensorReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.LeftButton">
-            <summary>Left Mouse Button</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_AvatarSitResponse">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.MouseLookLeftButton">
-            <summary>Left Mouse button in MouseLook</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_AvatarSitResponseLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.AgentFlags">
-            <summary>
-            Currently only used to hide your group title
-            </summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberAdded">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentFlags.None">
-            <summary>No flags set</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberAddedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentFlags.HideTitle">
-            <summary>Hide your group title</summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberLeft">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.AgentState">
-            <summary>
-            Action state of the avatar, which can currently be typing and
-            editing
-            </summary>
+        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberLeftLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentState.None">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_SetDisplayNameReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentState.Typing">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_SetDisplayNameReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentState.Editing">
-            <summary></summary>
+        <member name="F:OpenMetaverse.AgentManager.m_MuteListUpdated">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.TeleportStatus">
-            <summary>
-            Current teleport status
-            </summary>
+        <member name="F:OpenMetaverse.AgentManager.m_MuteListUpdatedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportStatus.None">
-            <summary>Unknown status</summary>
+        <member name="F:OpenMetaverse.AgentManager.Client">
+            <summary>Reference to the GridClient instance</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportStatus.Start">
-            <summary>Teleport initialized</summary>
+        <member name="F:OpenMetaverse.AgentManager.Movement">
+            <summary>Used for movement and camera tracking</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportStatus.Progress">
-            <summary>Teleport in progress</summary>
+        <member name="F:OpenMetaverse.AgentManager.SignaledAnimations">
+            <summary>Currently playing animations for the agent. Can be used to
+            check the current movement status such as walking, hovering, aiming,
+            etc. by checking against system animations found in the Animations class</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportStatus.Failed">
-            <summary>Teleport failed</summary>
+        <member name="F:OpenMetaverse.AgentManager.GroupChatSessions">
+            <summary>Dictionary containing current Group Chat sessions and members</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportStatus.Finished">
-            <summary>Teleport completed</summary>
+        <member name="F:OpenMetaverse.AgentManager.MuteList">
+            <summary>Dictionary containing mute list keyead on mute name and key</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportStatus.Cancelled">
-            <summary>Teleport cancelled</summary>
+        <member name="E:OpenMetaverse.AgentManager.ChatFromSimulator">
+            <summary>Raised when a scripted object or agent within range sends a public message</summary>
         </member>
-        <member name="T:OpenMetaverse.TeleportFlags">
-            <summary>
-            
-            </summary>
+        <member name="E:OpenMetaverse.AgentManager.ScriptDialog">
+            <summary>Raised when a scripted object sends a dialog box containing possible
+            options an agent can respond to</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.Default">
-            <summary>No flags set, or teleport failed</summary>
+        <member name="E:OpenMetaverse.AgentManager.ScriptQuestion">
+            <summary>Raised when an object requests a change in the permissions an agent has permitted</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.SetHomeToTarget">
-            <summary>Set when newbie leaves help island for first time</summary>
+        <member name="E:OpenMetaverse.AgentManager.LoadURL">
+            <summary>Raised when a script requests an agent open the specified URL</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.SetLastToTarget">
-            <summary></summary>
+        <member name="E:OpenMetaverse.AgentManager.MoneyBalance">
+            <summary>Raised when an agents currency balance is updated</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaLure">
-            <summary>Via Lure</summary>
+        <member name="E:OpenMetaverse.AgentManager.MoneyBalanceReply">
+            <summary>Raised when a transaction occurs involving currency such as a land purchase</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaLandmark">
-            <summary>Via Landmark</summary>
+        <member name="E:OpenMetaverse.AgentManager.IM">
+            <summary>Raised when an ImprovedInstantMessage packet is recieved from the simulator, this is used for everything from
+            private messaging to friendship offers. The Dialog field defines what type of message has arrived</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaLocation">
-            <summary>Via Location</summary>
+        <member name="E:OpenMetaverse.AgentManager.TeleportProgress">
+            <summary>Raised when an agent has requested a teleport to another location, or when responding to a lure. Raised multiple times
+            for each teleport indicating the progress of the request</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaHome">
-            <summary>Via Home</summary>
+        <member name="E:OpenMetaverse.AgentManager.AgentDataReply">
+            <summary>Raised when a simulator sends agent specific information for our avatar.</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaTelehub">
-            <summary>Via Telehub</summary>
+        <member name="E:OpenMetaverse.AgentManager.AnimationsChanged">
+            <summary>Raised when our agents animation playlist changes</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaLogin">
-            <summary>Via Login</summary>
+        <member name="E:OpenMetaverse.AgentManager.MeanCollision">
+            <summary>Raised when an object or avatar forcefully collides with our agent</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaGodlikeLure">
-            <summary>Linden Summoned</summary>
+        <member name="E:OpenMetaverse.AgentManager.RegionCrossed">
+            <summary>Raised when our agent crosses a region border into another region</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.Godlike">
-            <summary>Linden Forced me</summary>
+        <member name="E:OpenMetaverse.AgentManager.GroupChatJoined">
+            <summary>Raised when our agent succeeds or fails to join a group chat session</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.NineOneOne">
-            <summary></summary>
+        <member name="E:OpenMetaverse.AgentManager.AlertMessage">
+            <summary>Raised when a simulator sends an urgent message usually indication the recent failure of
+            another action we have attempted to take such as an attempt to enter a parcel where we are denied access</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.DisableCancel">
-            <summary>Agent Teleported Home via Script</summary>
+        <member name="E:OpenMetaverse.AgentManager.ScriptControlChange">
+            <summary>Raised when a script attempts to take or release specified controls for our agent</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaRegionID">
-            <summary></summary>
+        <member name="E:OpenMetaverse.AgentManager.CameraConstraint">
+            <summary>Raised when the simulator detects our agent is trying to view something
+            beyond its limits</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.IsFlying">
-            <summary></summary>
+        <member name="E:OpenMetaverse.AgentManager.ScriptSensorReply">
+            <summary>Raised when a script sensor reply is received from a simulator</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ResetHome">
-            <summary></summary>
+        <member name="E:OpenMetaverse.AgentManager.AvatarSitResponse">
+            <summary>Raised in response to a <see cref="M:OpenMetaverse.AgentManager.RequestSit(OpenMetaverse.UUID,OpenMetaverse.Vector3)" /> request</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ForceRedirect">
-            <summary>forced to new location for example when avatar is banned or ejected</summary>
+        <member name="E:OpenMetaverse.AgentManager.ChatSessionMemberAdded">
+            <summary>Raised when an avatar enters a group chat session we are participating in</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.FinishedViaLure">
-            <summary>Teleport Finished via a Lure</summary>
+        <member name="E:OpenMetaverse.AgentManager.ChatSessionMemberLeft">
+            <summary>Raised when an agent exits a group chat session we are participating in</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.FinishedViaNewSim">
-            <summary>Finished, Sim Changed</summary>
+        <member name="E:OpenMetaverse.AgentManager.SetDisplayNameReply">
+            <summary>Raised when the simulator sends us data containing
+            the details of display name change</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.FinishedViaSameSim">
-            <summary>Finished, Same Sim</summary>
+        <member name="E:OpenMetaverse.AgentManager.MuteListUpdated">
+            <summary>Raised when a scripted object or agent within range sends a public message</summary>
         </member>
-        <member name="T:OpenMetaverse.TeleportLureFlags">
-            <summary>
-            
-            </summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentID">
+            <summary>Your (client) avatars <see cref="T:OpenMetaverse.UUID" /></summary>
+            <remarks>"client", "agent", and "avatar" all represent the same thing</remarks>
         </member>
-        <member name="F:OpenMetaverse.TeleportLureFlags.NormalLure">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AgentManager.SessionID">
+            <summary>Temporary <seealso cref="T:OpenMetaverse.UUID" /> assigned to this session, used for
+            verifying our identity in packets</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportLureFlags.GodlikeLure">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AgentManager.SecureSessionID">
+            <summary>Shared secret <seealso cref="T:OpenMetaverse.UUID" /> that is never sent over the wire</summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportLureFlags.GodlikePursuit">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AgentManager.LocalID">
+            <summary>Your (client) avatar ID, local to the current region/sim</summary>
         </member>
-        <member name="T:OpenMetaverse.ScriptSensorTypeFlags">
-            <summary>
-            
-            </summary>
+        <member name="P:OpenMetaverse.AgentManager.StartLocation">
+            <summary>Where the avatar started at login. Can be "last", "home"
+            or a login <seealso cref="T:OpenMetaverse.URI" /></summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Agent">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentAccess">
+            <summary>The access level of this agent, usually M or PG</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Active">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AgentManager.CollisionPlane">
+            <summary>The CollisionPlane of Agent</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Passive">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AgentManager.Velocity">
+            <summary>An <seealso cref="T:OpenMetaverse.Vector3" /> representing the velocity of our agent</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Scripted">
-            <summary></summary>
+        <member name="P:OpenMetaverse.AgentManager.Acceleration">
+            <summary>An <seealso cref="T:OpenMetaverse.Vector3" /> representing the acceleration of our agent</summary>
         </member>
-        <member name="T:OpenMetaverse.InstantMessage">
-            <summary>
-            Instant Message
-            </summary>
+        <member name="P:OpenMetaverse.AgentManager.AngularVelocity">
+            <summary>A <seealso cref="T:OpenMetaverse.Vector3" /> which specifies the angular speed, and axis about which an Avatar is rotating.</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.FromAgentID">
-            <summary>Key of sender</summary>
+        <member name="P:OpenMetaverse.AgentManager.HomePosition">
+            <summary>Position avatar client will goto when login to 'home' or during
+            teleport request to 'home' region.</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.FromAgentName">
-            <summary>Name of sender</summary>
+        <member name="P:OpenMetaverse.AgentManager.HomeLookAt">
+            <summary>LookAt point saved/restored with HomePosition</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.ToAgentID">
-            <summary>Key of destination avatar</summary>
+        <member name="P:OpenMetaverse.AgentManager.FirstName">
+            <summary>Avatar First Name (i.e. Philip)</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.ParentEstateID">
-            <summary>ID of originating estate</summary>
+        <member name="P:OpenMetaverse.AgentManager.LastName">
+            <summary>Avatar Last Name (i.e. Linden)</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.RegionID">
-            <summary>Key of originating region</summary>
+        <member name="P:OpenMetaverse.AgentManager.Name">
+            <summary>Avatar Full Name (i.e. Philip Linden)</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.Position">
-            <summary>Coordinates in originating region</summary>
+        <member name="P:OpenMetaverse.AgentManager.Health">
+            <summary>Gets the health of the agent</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.Dialog">
-            <summary>Instant message type</summary>
+        <member name="P:OpenMetaverse.AgentManager.Balance">
+            <summary>Gets the current balance of the agent</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.GroupIM">
-            <summary>Group IM session toggle</summary>
+        <member name="P:OpenMetaverse.AgentManager.SittingOn">
+            <summary>Gets the local ID of the prim the agent is sitting on,
+            zero if the avatar is not currently sitting</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.IMSessionID">
-            <summary>Key of IM session, for Group Messages, the groups UUID</summary>
+        <member name="P:OpenMetaverse.AgentManager.ActiveGroup">
+            <summary>Gets the <seealso cref="T:OpenMetaverse.UUID" /> of the agents active group.</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.Timestamp">
-            <summary>Timestamp of the instant message</summary>
+        <member name="P:OpenMetaverse.AgentManager.ActiveGroupPowers">
+            <summary>Gets the Agents powers in the currently active group</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.Message">
-            <summary>Instant message text</summary>
+        <member name="P:OpenMetaverse.AgentManager.TeleportMessage">
+            <summary>Current status message for teleporting</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.Offline">
-            <summary>Whether this message is held for offline avatars</summary>
+        <member name="P:OpenMetaverse.AgentManager.RelativePosition">
+            <summary>Current position of the agent as a relative offset from
+            the simulator, or the parent object if we are sitting on something</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.BinaryBucket">
-            <summary>Context specific packed data</summary>
+        <member name="P:OpenMetaverse.AgentManager.RelativeRotation">
+            <summary>Current rotation of the agent as a relative rotation from
+            the simulator, or the parent object if we are sitting on something</summary>
         </member>
-        <member name="M:OpenMetaverse.InstantMessage.ToString">
-            <summary>Print the struct data as a string</summary>
-            <returns>A string containing the field name, and field value</returns>
+        <member name="P:OpenMetaverse.AgentManager.SimPosition">
+            <summary>Current position of the agent in the simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.AgentManager">
+        <member name="P:OpenMetaverse.AgentManager.SimRotation">
             <summary>
-            Manager class for our own avatar
+            A <seealso cref="T:OpenMetaverse.Quaternion" /> representing the agents current rotation
             </summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_Chat">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="P:OpenMetaverse.AgentManager.GlobalPosition">
+            <summary>Returns the global grid position of the avatar</summary>
         </member>
         <member name="M:OpenMetaverse.AgentManager.OnChat(OpenMetaverse.ChatEventArgs)">
             <summary>Raises the ChatFromSimulator event</summary>
             <param name="e">A ChatEventArgs object containing the
             data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ChatLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptDialog">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
         <member name="M:OpenMetaverse.AgentManager.OnScriptDialog(OpenMetaverse.ScriptDialogEventArgs)">
             <summary>Raises the ScriptDialog event</summary>
             <param name="e">A SctriptDialogEventArgs object containing the
             data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptDialogLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptQuestion">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
         <member name="M:OpenMetaverse.AgentManager.OnScriptQuestion(OpenMetaverse.ScriptQuestionEventArgs)">
             <summary>Raises the ScriptQuestion event</summary>
             <param name="e">A ScriptQuestionEventArgs object containing the
             data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptQuestionLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.m_LoadURL">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
         <member name="M:OpenMetaverse.AgentManager.OnLoadURL(OpenMetaverse.LoadUrlEventArgs)">
             <summary>Raises the LoadURL event</summary>
             <param name="e">A LoadUrlEventArgs object containing the
             data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_LoadUrlLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.m_Balance">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
         <member name="M:OpenMetaverse.AgentManager.OnBalance(OpenMetaverse.BalanceEventArgs)">
             <summary>Raises the MoneyBalance event</summary>
             <param name="e">A BalanceEventArgs object containing the
             data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_BalanceLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.m_MoneyBalance">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
         <member name="M:OpenMetaverse.AgentManager.OnMoneyBalanceReply(OpenMetaverse.MoneyBalanceReplyEventArgs)">
             <summary>Raises the MoneyBalanceReply event</summary>
             <param name="e">A MoneyBalanceReplyEventArgs object containing the
             data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_MoneyBalanceReplyLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.m_InstantMessage">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
         <member name="M:OpenMetaverse.AgentManager.OnInstantMessage(OpenMetaverse.InstantMessageEventArgs)">
             <summary>Raises the IM event</summary>
             <param name="e">A InstantMessageEventArgs object containing the
             data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_InstantMessageLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.m_Teleport">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
         <member name="M:OpenMetaverse.AgentManager.OnTeleport(OpenMetaverse.TeleportEventArgs)">
             <summary>Raises the TeleportProgress event</summary>
             <param name="e">A TeleportEventArgs object containing the
             data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_TeleportLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AgentData">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
         <member name="M:OpenMetaverse.AgentManager.OnAgentData(OpenMetaverse.AgentDataReplyEventArgs)">
             <summary>Raises the AgentDataReply event</summary>
             <param name="e">A AgentDataReplyEventArgs object containing the
             data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AgentDataLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AnimationsChanged">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
         <member name="M:OpenMetaverse.AgentManager.OnAnimationsChanged(OpenMetaverse.AnimationsChangedEventArgs)">
             <summary>Raises the AnimationsChanged event</summary>
             <param name="e">A AnimationsChangedEventArgs object containing the
             data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AnimationsChangedLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.m_MeanCollision">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
         <member name="M:OpenMetaverse.AgentManager.OnMeanCollision(OpenMetaverse.MeanCollisionEventArgs)">
             <summary>Raises the MeanCollision event</summary>
             <param name="e">A MeanCollisionEventArgs object containing the
             data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_MeanCollisionLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.m_RegionCrossed">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
         <member name="M:OpenMetaverse.AgentManager.OnRegionCrossed(OpenMetaverse.RegionCrossedEventArgs)">
             <summary>Raises the RegionCrossed event</summary>
             <param name="e">A RegionCrossedEventArgs object containing the
             data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_RegionCrossedLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.m_GroupChatJoined">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
         <member name="M:OpenMetaverse.AgentManager.OnGroupChatJoined(OpenMetaverse.GroupChatJoinedEventArgs)">
             <summary>Raises the GroupChatJoined event</summary>
             <param name="e">A GroupChatJoinedEventArgs object containing the
             data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_GroupChatJoinedLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AlertMessage">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
         <member name="M:OpenMetaverse.AgentManager.OnAlertMessage(OpenMetaverse.AlertMessageEventArgs)">
             <summary>Raises the AlertMessage event</summary>
             <param name="e">A AlertMessageEventArgs object containing the
             data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AlertMessageLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptControl">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
         <member name="M:OpenMetaverse.AgentManager.OnScriptControlChange(OpenMetaverse.ScriptControlEventArgs)">
             <summary>Raises the ScriptControlChange event</summary>
             <param name="e">A ScriptControlEventArgs object containing the
             data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptControlLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.m_CameraConstraint">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
         <member name="M:OpenMetaverse.AgentManager.OnCameraConstraint(OpenMetaverse.CameraConstraintEventArgs)">
             <summary>Raises the CameraConstraint event</summary>
             <param name="e">A CameraConstraintEventArgs object containing the
             data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_CameraConstraintLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptSensorReply">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
         <member name="M:OpenMetaverse.AgentManager.OnScriptSensorReply(OpenMetaverse.ScriptSensorReplyEventArgs)">
             <summary>Raises the ScriptSensorReply event</summary>
             <param name="e">A ScriptSensorReplyEventArgs object containing the
             data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptSensorReplyLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AvatarSitResponse">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
         <member name="M:OpenMetaverse.AgentManager.OnAvatarSitResponse(OpenMetaverse.AvatarSitResponseEventArgs)">
             <summary>Raises the AvatarSitResponse event</summary>
             <param name="e">A AvatarSitResponseEventArgs object containing the
             data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AvatarSitResponseLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberAdded">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
         <member name="M:OpenMetaverse.AgentManager.OnChatSessionMemberAdded(OpenMetaverse.ChatSessionMemberAddedEventArgs)">
             <summary>Raises the ChatSessionMemberAdded event</summary>
             <param name="e">A ChatSessionMemberAddedEventArgs object containing the
             data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberAddedLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberLeft">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
         <member name="M:OpenMetaverse.AgentManager.OnChatSessionMemberLeft(OpenMetaverse.ChatSessionMemberLeftEventArgs)">
             <summary>Raises the ChatSessionMemberLeft event</summary>
             <param name="e">A ChatSessionMemberLeftEventArgs object containing the
             data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberLeftLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.Client">
-            <summary>Reference to the GridClient instance</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.Movement">
-            <summary>Used for movement and camera tracking</summary>
+        <member name="M:OpenMetaverse.AgentManager.OnSetDisplayNameReply(OpenMetaverse.SetDisplayNameReplyEventArgs)">
+            <summary>Raises the SetDisplayNameReply Event</summary>
+            <param name="e">A SetDisplayNameReplyEventArgs object containing
+            the data sent from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.SignaledAnimations">
-            <summary>Currently playing animations for the agent. Can be used to
-            check the current movement status such as walking, hovering, aiming,
-            etc. by checking against system animations found in the Animations class</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.GroupChatSessions">
-            <summary>Dictionary containing current Group Chat sessions and members</summary>
-        </member>
-        <member name="M:OpenMetaverse.AgentManager.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Constructor, setup callbacks for packets related to our avatar
-            </summary>
-            <param name="client">A reference to the <seealso cref="T:OpenMetaverse.GridClient"/> Class</param>
+        <member name="M:OpenMetaverse.AgentManager.OnMuteListUpdated(System.EventArgs)">
+            <summary>Raises the MuteListUpdated event</summary>
+            <param name="e">A EventArgs object containing the
+            data returned from the data server</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.Chat(System.String,System.Int32,OpenMetaverse.ChatType)">
             <summary>
             Send a text message from the Agent to the Simulator
             </summary>
-            <param name="message">A <see cref="T:System.String"/> containing the message</param>
+            <param name="message">A <see cref="T:System.String" /> containing the message</param>
             <param name="channel">The channel to send the message on, 0 is the public channel. Channels above 0
             can be used however only scripts listening on the specified channel will see the message</param>
             <param name="type">Denotes the type of message being sent, shout, whisper, etc.</param>
@@ -5582,15 +1837,15 @@
             <summary>
             Send an Instant Message to another Avatar
             </summary>
-            <param name="target">The recipients <see cref="T:OpenMetaverse.UUID"/></param>
-            <param name="message">A <see cref="T:System.String"/> containing the message to send</param>
+            <param name="target">The recipients <see cref="T:OpenMetaverse.UUID" /></param>
+            <param name="message">A <see cref="T:System.String" /> containing the message to send</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.InstantMessage(OpenMetaverse.UUID,System.String,OpenMetaverse.UUID)">
             <summary>
             Send an Instant Message to an existing group chat or conference chat
             </summary>
-            <param name="target">The recipients <see cref="T:OpenMetaverse.UUID"/></param>
-            <param name="message">A <see cref="T:System.String"/> containing the message to send</param>
+            <param name="target">The recipients <see cref="T:OpenMetaverse.UUID" /></param>
+            <param name="message">A <see cref="T:System.String" /> containing the message to send</param>
             <param name="imSessionID">IM session ID (to differentiate between IM windows)</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.InstantMessage(System.String,OpenMetaverse.UUID,System.String,OpenMetaverse.UUID,OpenMetaverse.UUID[])">
@@ -5622,7 +1877,8 @@
             <summary>
             Send an Instant Message to a group
             </summary>
-            <param name="groupID"><seealso cref="T:OpenMetaverse.UUID"/> of the group to send message to</param>
+            <param name="groupID">
+                <seealso cref="T:OpenMetaverse.UUID" /> of the group to send message to</param>
             <param name="message">Text Message being sent.</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.InstantMessageGroup(System.String,OpenMetaverse.UUID,System.String)">
@@ -5630,84 +1886,96 @@
             Send an Instant Message to a group the agent is a member of
             </summary>
             <param name="fromName">The name this IM will show up as being from</param>
-            <param name="groupID"><seealso cref="T:OpenMetaverse.UUID"/> of the group to send message to</param>
+            <param name="groupID">
+                <seealso cref="T:OpenMetaverse.UUID" /> of the group to send message to</param>
             <param name="message">Text message being sent</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.RequestJoinGroupChat(OpenMetaverse.UUID)">
             <summary>
             Send a request to join a group chat session
             </summary>
-            <param name="groupID"><seealso cref="T:OpenMetaverse.UUID"/> of Group to leave</param>
+            <param name="groupID">
+                <seealso cref="T:OpenMetaverse.UUID" /> of Group to leave</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.RequestLeaveGroupChat(OpenMetaverse.UUID)">
             <summary>
             Exit a group chat session. This will stop further Group chat messages
             from being sent until session is rejoined.
             </summary>
-            <param name="groupID"><seealso cref="T:OpenMetaverse.UUID"/> of Group chat session to leave</param>
+            <param name="groupID">
+                <seealso cref="T:OpenMetaverse.UUID" /> of Group chat session to leave</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.ReplyToScriptDialog(System.Int32,System.Int32,System.String,OpenMetaverse.UUID)">
             <summary>
-            Reply to script dialog questions. 
+            Reply to script dialog questions.
             </summary>
             <param name="channel">Channel initial request came on</param>
             <param name="buttonIndex">Index of button you're "clicking"</param>
             <param name="buttonlabel">Label of button you're "clicking"</param>
-            <param name="objectID"><seealso cref="T:OpenMetaverse.UUID"/> of Object that sent the dialog request</param>
-            <seealso cref="M:OpenMetaverse.AgentManager.OnScriptDialog(OpenMetaverse.ScriptDialogEventArgs)"/>
+            <param name="objectID">
+                <seealso cref="T:OpenMetaverse.UUID" /> of Object that sent the dialog request</param>
+            <seealso cref="M:OpenMetaverse.AgentManager.OnScriptDialog(OpenMetaverse.ScriptDialogEventArgs)" />
         </member>
         <member name="M:OpenMetaverse.AgentManager.ChatterBoxAcceptInvite(OpenMetaverse.UUID)">
             <summary>
             Accept invite for to a chatterbox session
             </summary>
-            <param name="session_id"><seealso cref="T:OpenMetaverse.UUID"/> of session to accept invite to</param>
+            <param name="session_id">
+                <seealso cref="T:OpenMetaverse.UUID" /> of session to accept invite to</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.StartIMConference(System.Collections.Generic.List{OpenMetaverse.UUID},OpenMetaverse.UUID)">
             <summary>
             Start a friends conference
             </summary>
-            <param name="participants"><seealso cref="T:OpenMetaverse.UUID"/> List of UUIDs to start a conference with</param>
-            <param name="tmp_session_id">the temportary session ID returned in the <see cref="!:OnJoinedGroupChat"/> callback&gt;</param>
+            <param name="participants">
+                <seealso cref="T:OpenMetaverse.UUID" /> List of UUIDs to start a conference with</param>
+            <param name="tmp_session_id">the temportary session ID returned in the <see cref="!:OnJoinedGroupChat" /> callback&gt;</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.PointAtEffect(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.Vector3d,OpenMetaverse.PointAtType,OpenMetaverse.UUID)">
             <summary>
             Start a particle stream between an agent and an object
             </summary>
-            <param name="sourceAvatar"><seealso cref="T:OpenMetaverse.UUID"/> Key of the source agent</param>
-            <param name="targetObject"><seealso cref="T:OpenMetaverse.UUID"/> Key of the target object</param>
-            <param name="globalOffset"></param>
-            <param name="type">The type from the <seealso cref="T:PointAtType"/> enum</param>
-            <param name="effectID">A unique <seealso cref="T:OpenMetaverse.UUID"/> for this effect</param>
+            <param name="sourceAvatar">
+                <seealso cref="T:OpenMetaverse.UUID" /> Key of the source agent</param>
+            <param name="targetObject">
+                <seealso cref="T:OpenMetaverse.UUID" /> Key of the target object</param>
+            <param name="globalOffset">
+            </param>
+            <param name="type">The type from the <seealso cref="T:PointAtType" /> enum</param>
+            <param name="effectID">A unique <seealso cref="T:OpenMetaverse.UUID" /> for this effect</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.LookAtEffect(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.Vector3d,OpenMetaverse.LookAtType,OpenMetaverse.UUID)">
             <summary>
             Start a particle stream between an agent and an object
             </summary>
-            <param name="sourceAvatar"><seealso cref="T:OpenMetaverse.UUID"/> Key of the source agent</param>
-            <param name="targetObject"><seealso cref="T:OpenMetaverse.UUID"/> Key of the target object</param>
-            <param name="globalOffset">A <seealso cref="T:OpenMetaverse.Vector3d"/> representing the beams offset from the source</param>
-            <param name="type">A <seealso cref="T:PointAtType"/> which sets the avatars lookat animation</param>
-            <param name="effectID"><seealso cref="T:OpenMetaverse.UUID"/> of the Effect</param>
+            <param name="sourceAvatar">
+                <seealso cref="T:OpenMetaverse.UUID" /> Key of the source agent</param>
+            <param name="targetObject">
+                <seealso cref="T:OpenMetaverse.UUID" /> Key of the target object</param>
+            <param name="globalOffset">A <seealso cref="T:OpenMetaverse.Vector3d" /> representing the beams offset from the source</param>
+            <param name="type">A <seealso cref="T:PointAtType" /> which sets the avatars lookat animation</param>
+            <param name="effectID">
+                <seealso cref="T:OpenMetaverse.UUID" /> of the Effect</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.BeamEffect(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.Vector3d,OpenMetaverse.Color4,System.Single,OpenMetaverse.UUID)">
             <summary>
-            Create a particle beam between an avatar and an primitive 
+            Create a particle beam between an avatar and an primitive
             </summary>
             <param name="sourceAvatar">The ID of source avatar</param>
             <param name="targetObject">The ID of the target primitive</param>
             <param name="globalOffset">global offset</param>
-            <param name="color">A <see cref="T:OpenMetaverse.Color4"/> object containing the combined red, green, blue and alpha 
+            <param name="color">A <see cref="T:OpenMetaverse.Color4" /> object containing the combined red, green, blue and alpha
             color values of particle beam</param>
             <param name="duration">a float representing the duration the parcicle beam will last</param>
             <param name="effectID">A Unique ID for the beam</param>
-            <seealso cref="T:OpenMetaverse.Packets.ViewerEffectPacket"/>
+            <seealso cref="T:OpenMetaverse.Packets.ViewerEffectPacket" />
         </member>
         <member name="M:OpenMetaverse.AgentManager.SphereEffect(OpenMetaverse.Vector3d,OpenMetaverse.Color4,System.Single,OpenMetaverse.UUID)">
             <summary>
-            Create a particle swirl around a target position using a <seealso cref="T:OpenMetaverse.Packets.ViewerEffectPacket"/> packet
+            Create a particle swirl around a target position using a <seealso cref="T:OpenMetaverse.Packets.ViewerEffectPacket" /> packet
             </summary>
             <param name="globalOffset">global offset</param>
-            <param name="color">A <see cref="T:OpenMetaverse.Color4"/> object containing the combined red, green, blue and alpha 
+            <param name="color">A <see cref="T:OpenMetaverse.Color4" /> object containing the combined red, green, blue and alpha
             color values of particle beam</param>
             <param name="duration">a float representing the duration the parcicle beam will last</param>
             <param name="effectID">A Unique ID for the beam</param>
@@ -5716,12 +1984,13 @@
             <summary>
             Sends a request to sit on the specified object
             </summary>
-            <param name="targetID"><seealso cref="T:OpenMetaverse.UUID"/> of the object to sit on</param>
+            <param name="targetID">
+                <seealso cref="T:OpenMetaverse.UUID" /> of the object to sit on</param>
             <param name="offset">Sit at offset</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.Sit">
             <summary>
-            Follows a call to <seealso cref="M:OpenMetaverse.AgentManager.RequestSit(OpenMetaverse.UUID,OpenMetaverse.Vector3)"/> to actually sit on the object
+            Follows a call to <seealso cref="M:OpenMetaverse.AgentManager.RequestSit(OpenMetaverse.UUID,OpenMetaverse.Vector3)" /> to actually sit on the object
             </summary>
         </member>
         <member name="M:OpenMetaverse.AgentManager.Stand">
@@ -5788,14 +2057,15 @@
             Grabs an object
             </summary>
             <param name="objectLocalID">an unsigned integer of the objects ID within the simulator</param>
-            <seealso cref="F:OpenMetaverse.Simulator.ObjectsPrimitives"/>
+            <seealso cref="F:OpenMetaverse.Simulator.ObjectsPrimitives" />
         </member>
         <member name="M:OpenMetaverse.AgentManager.Grab(System.UInt32,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3,System.Int32,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
             <summary>
             Overload: Grab a simulated object
             </summary>
             <param name="objectLocalID">an unsigned integer of the objects ID within the simulator</param>
-            <param name="grabOffset"></param>
+            <param name="grabOffset">
+            </param>
             <param name="uvCoord">The texture coordinates to grab</param>
             <param name="stCoord">The surface coordinates to grab</param>
             <param name="faceIndex">The face of the position to grab</param>
@@ -5808,16 +2078,19 @@
             <summary>
             Drag an object
             </summary>
-            <param name="objectID"><seealso cref="T:OpenMetaverse.UUID"/> of the object to drag</param>
+            <param name="objectID">
+                <seealso cref="T:OpenMetaverse.UUID" /> of the object to drag</param>
             <param name="grabPosition">Drag target in region coordinates</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.GrabUpdate(OpenMetaverse.UUID,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3,System.Int32,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
             <summary>
             Overload: Drag an object
             </summary>
-            <param name="objectID"><seealso cref="T:OpenMetaverse.UUID"/> of the object to drag</param>
+            <param name="objectID">
+                <seealso cref="T:OpenMetaverse.UUID" /> of the object to drag</param>
             <param name="grabPosition">Drag target in region coordinates</param>
-            <param name="grabOffset"></param>
+            <param name="grabOffset">
+            </param>
             <param name="uvCoord">The texture coordinates to grab</param>
             <param name="stCoord">The surface coordinates to grab</param>
             <param name="faceIndex">The face of the position to grab</param>
@@ -5831,9 +2104,9 @@
             Release a grabbed object
             </summary>
             <param name="objectLocalID">The Objects Simulator Local ID</param>
-            <seealso cref="F:OpenMetaverse.Simulator.ObjectsPrimitives"/>
-            <seealso cref="M:OpenMetaverse.AgentManager.Grab(System.UInt32)"/>
-            <seealso cref="M:OpenMetaverse.AgentManager.GrabUpdate(OpenMetaverse.UUID,OpenMetaverse.Vector3)"/>
+            <seealso cref="F:OpenMetaverse.Simulator.ObjectsPrimitives" />
+            <seealso cref="M:OpenMetaverse.AgentManager.Grab(System.UInt32,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3,System.Int32,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3)" />
+            <seealso cref="M:OpenMetaverse.AgentManager.GrabUpdate(OpenMetaverse.UUID,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3,System.Int32,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3)" />
         </member>
         <member name="M:OpenMetaverse.AgentManager.DeGrab(System.UInt32,OpenMetaverse.Vector3,OpenMetaverse.Vector3,System.Int32,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
             <summary>
@@ -5853,7 +2126,7 @@
             Touches an object
             </summary>
             <param name="objectLocalID">an unsigned integer of the objects ID within the simulator</param>
-            <seealso cref="F:OpenMetaverse.Simulator.ObjectsPrimitives"/>
+            <seealso cref="F:OpenMetaverse.Simulator.ObjectsPrimitives" />
         </member>
         <member name="M:OpenMetaverse.AgentManager.RequestBalance">
             <summary>
@@ -5880,7 +2153,7 @@
             <summary>
             Give L$ to an object
             </summary>
-            <param name="target">object <seealso cref="T:OpenMetaverse.UUID"/> to give money to</param>
+            <param name="target">object <seealso cref="T:OpenMetaverse.UUID" /> to give money to</param>
             <param name="amount">amount of L$ to give</param>
             <param name="objectName">name of object</param>
         </member>
@@ -5888,14 +2161,14 @@
             <summary>
             Give L$ to a group
             </summary>
-            <param name="target">group <seealso cref="T:OpenMetaverse.UUID"/> to give money to</param>
+            <param name="target">group <seealso cref="T:OpenMetaverse.UUID" /> to give money to</param>
             <param name="amount">amount of L$ to give</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.GiveGroupMoney(OpenMetaverse.UUID,System.Int32,System.String)">
             <summary>
             Give L$ to a group
             </summary>
-            <param name="target">group <seealso cref="T:OpenMetaverse.UUID"/> to give money to</param>
+            <param name="target">group <seealso cref="T:OpenMetaverse.UUID" /> to give money to</param>
             <param name="amount">amount of L$ to give</param>
             <param name="description">description of transaction</param>
         </member>
@@ -5925,33 +2198,33 @@
             <summary>
             Plays a gesture
             </summary>
-            <param name="gestureID">Asset <seealso cref="T:OpenMetaverse.UUID"/> of the gesture</param>
+            <param name="gestureID">Asset <seealso cref="T:OpenMetaverse.UUID" /> of the gesture</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.ActivateGesture(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
             Mark gesture active
             </summary>
-            <param name="invID">Inventory <seealso cref="T:OpenMetaverse.UUID"/> of the gesture</param>
-            <param name="assetID">Asset <seealso cref="T:OpenMetaverse.UUID"/> of the gesture</param>
+            <param name="invID">Inventory <seealso cref="T:OpenMetaverse.UUID" /> of the gesture</param>
+            <param name="assetID">Asset <seealso cref="T:OpenMetaverse.UUID" /> of the gesture</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.DeactivateGesture(OpenMetaverse.UUID)">
             <summary>
             Mark gesture inactive
             </summary>
-            <param name="invID">Inventory <seealso cref="T:OpenMetaverse.UUID"/> of the gesture</param>
+            <param name="invID">Inventory <seealso cref="T:OpenMetaverse.UUID" /> of the gesture</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.AnimationStart(OpenMetaverse.UUID,System.Boolean)">
             <summary>
             Send an AgentAnimation packet that toggles a single animation on
             </summary>
-            <param name="animation">The <seealso cref="T:OpenMetaverse.UUID"/> of the animation to start playing</param>
+            <param name="animation">The <seealso cref="T:OpenMetaverse.UUID" /> of the animation to start playing</param>
             <param name="reliable">Whether to ensure delivery of this packet or not</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.AnimationStop(OpenMetaverse.UUID,System.Boolean)">
             <summary>
             Send an AgentAnimation packet that toggles a single animation off
             </summary>
-            <param name="animation">The <seealso cref="T:OpenMetaverse.UUID"/> of a 
+            <param name="animation">The <seealso cref="T:OpenMetaverse.UUID" /> of a
             currently playing animation to stop playing</param>
             <param name="reliable">Whether to ensure delivery of this packet or not</param>
         </member>
@@ -5959,7 +2232,7 @@
             <summary>
             Send an AgentAnimation packet that will toggle animations on or off
             </summary>
-            <param name="animations">A list of animation <seealso cref="T:OpenMetaverse.UUID"/>s, and whether to
+            <param name="animations">A list of animation <seealso cref="T:OpenMetaverse.UUID" />s, and whether to
             turn that animation on or off</param>
             <param name="reliable">Whether to ensure delivery of this packet or not</param>
         </member>
@@ -5973,7 +2246,8 @@
             <summary>
             Teleport agent to a landmark
             </summary>
-            <param name="landmark"><seealso cref="T:OpenMetaverse.UUID"/> of the landmark to teleport agent to</param>
+            <param name="landmark">
+                <seealso cref="T:OpenMetaverse.UUID" /> of the landmark to teleport agent to</param>
             <returns>true on success, false on failure</returns>
         </member>
         <member name="M:OpenMetaverse.AgentManager.Teleport(System.String,OpenMetaverse.Vector3)">
@@ -6002,7 +2276,8 @@
             Teleport agent to another region
             </summary>
             <param name="regionHandle">handle of region to teleport agent to</param>
-            <param name="position"><seealso cref="T:OpenMetaverse.Vector3"/> position in destination sim to teleport to</param>
+            <param name="position">
+                <seealso cref="T:OpenMetaverse.Vector3" /> position in destination sim to teleport to</param>
             <returns>true on success, false on failure</returns>
             <remarks>This call is blocking</remarks>
         </member>
@@ -6011,8 +2286,10 @@
             Teleport agent to another region
             </summary>
             <param name="regionHandle">handle of region to teleport agent to</param>
-            <param name="position"><seealso cref="T:OpenMetaverse.Vector3"/> position in destination sim to teleport to</param>
-            <param name="lookAt"><seealso cref="T:OpenMetaverse.Vector3"/> direction in destination sim agent will look at</param>
+            <param name="position">
+                <seealso cref="T:OpenMetaverse.Vector3" /> position in destination sim to teleport to</param>
+            <param name="lookAt">
+                <seealso cref="T:OpenMetaverse.Vector3" /> direction in destination sim agent will look at</param>
             <returns>true on success, false on failure</returns>
             <remarks>This call is blocking</remarks>
         </member>
@@ -6021,56 +2298,62 @@
             Request teleport to a another simulator
             </summary>
             <param name="regionHandle">handle of region to teleport agent to</param>
-            <param name="position"><seealso cref="T:OpenMetaverse.Vector3"/> position in destination sim to teleport to</param>
+            <param name="position">
+                <seealso cref="T:OpenMetaverse.Vector3" /> position in destination sim to teleport to</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.RequestTeleport(System.UInt64,OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
             <summary>
             Request teleport to a another simulator
             </summary>
             <param name="regionHandle">handle of region to teleport agent to</param>
-            <param name="position"><seealso cref="T:OpenMetaverse.Vector3"/> position in destination sim to teleport to</param>
-            <param name="lookAt"><seealso cref="T:OpenMetaverse.Vector3"/> direction in destination sim agent will look at</param>
+            <param name="position">
+                <seealso cref="T:OpenMetaverse.Vector3" /> position in destination sim to teleport to</param>
+            <param name="lookAt">
+                <seealso cref="T:OpenMetaverse.Vector3" /> direction in destination sim agent will look at</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.RequestTeleport(OpenMetaverse.UUID)">
             <summary>
             Teleport agent to a landmark
             </summary>
-            <param name="landmark"><seealso cref="T:OpenMetaverse.UUID"/> of the landmark to teleport agent to</param>
+            <param name="landmark">
+                <seealso cref="T:OpenMetaverse.UUID" /> of the landmark to teleport agent to</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.SendTeleportLure(OpenMetaverse.UUID)">
             <summary>
             Send a teleport lure to another avatar with default "Join me in ..." invitation message
             </summary>
-            <param name="targetID">target avatars <seealso cref="T:OpenMetaverse.UUID"/> to lure</param>
+            <param name="targetID">target avatars <seealso cref="T:OpenMetaverse.UUID" /> to lure</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.SendTeleportLure(OpenMetaverse.UUID,System.String)">
             <summary>
             Send a teleport lure to another avatar with custom invitation message
             </summary>
-            <param name="targetID">target avatars <seealso cref="T:OpenMetaverse.UUID"/> to lure</param>
+            <param name="targetID">target avatars <seealso cref="T:OpenMetaverse.UUID" /> to lure</param>
             <param name="message">custom message to send with invitation</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.TeleportLureRespond(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean)">
             <summary>
-            Respond to a teleport lure by either accepting it and initiating 
+            Respond to a teleport lure by either accepting it and initiating
             the teleport, or denying it
             </summary>
-            <param name="requesterID"><seealso cref="T:OpenMetaverse.UUID"/> of the avatar sending the lure</param>
-            <param name="sessionID">IM session <seealso cref="T:OpenMetaverse.UUID"/> of the incoming lure request</param>
+            <param name="requesterID">
+                <seealso cref="T:OpenMetaverse.UUID" /> of the avatar sending the lure</param>
+            <param name="sessionID">IM session <seealso cref="T:OpenMetaverse.UUID" /> of the incoming lure request</param>
             <param name="accept">true to accept the lure, false to decline it</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.UpdateProfile(OpenMetaverse.Avatar.AvatarProperties)">
             <summary>
             Update agent profile
             </summary>
-            <param name="profile"><seealso cref="T:OpenMetaverse.Avatar.AvatarProperties"/> struct containing updated 
+            <param name="profile">
+                <seealso cref="T:OpenMetaverse.Avatar.AvatarProperties" /> struct containing updated
             profile information</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.UpdateInterests(OpenMetaverse.Avatar.Interests)">
             <summary>
             Update agents profile interests
             </summary>
-            <param name="interests">selection of interests from <seealso cref="T:OpenMetaverse.Avatar.Interests"/> struct</param>
+            <param name="interests">selection of interests from <seealso cref="T:OpenMetaverse.Avatar.Interests" /> struct</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.SetHeightWidth(System.UInt16,System.UInt16)">
             <summary>
@@ -6085,11 +2368,35 @@
             Request the list of muted objects and avatars for this agent
             </summary>
         </member>
+        <member name="M:OpenMetaverse.AgentManager.UpdateMuteListEntry(OpenMetaverse.MuteType,OpenMetaverse.UUID,System.String)">
+            <summary>
+            Mute an object, resident, etc.
+            </summary>
+            <param name="type">Mute type</param>
+            <param name="id">Mute UUID</param>
+            <param name="name">Mute name</param>
+        </member>
+        <member name="M:OpenMetaverse.AgentManager.UpdateMuteListEntry(OpenMetaverse.MuteType,OpenMetaverse.UUID,System.String,OpenMetaverse.MuteFlags)">
+            <summary>
+            Mute an object, resident, etc.
+            </summary>
+            <param name="type">Mute type</param>
+            <param name="id">Mute UUID</param>
+            <param name="name">Mute name</param>
+            <param name="flags">Mute flags</param>
+        </member>
+        <member name="M:OpenMetaverse.AgentManager.RemoveMuteListEntry(OpenMetaverse.UUID,System.String)">
+            <summary>
+            Unmute an object, resident, etc.
+            </summary>
+            <param name="id">Mute UUID</param>
+            <param name="name">Mute name</param>
+        </member>
         <member name="M:OpenMetaverse.AgentManager.SetHome">
             <summary>
             Sets home location to agents current position
             </summary>
-            <remarks>will fire an AlertMessage (<seealso cref="E:OpenMetaverse.AgentManager.OnAlertMessage"/>) with 
+            <remarks>will fire an AlertMessage (<seealso cref="E:OpenMetaverse.AgentManager.OnAlertMessage" />) with
             success or failure message</remarks>
         </member>
         <member name="M:OpenMetaverse.AgentManager.CompleteAgentMovement(OpenMetaverse.Simulator)">
@@ -6097,16 +2404,21 @@
             Move an agent in to a simulator. This packet is the last packet
             needed to complete the transition in to a new simulator
             </summary>
-            <param name="simulator"><seealso cref="T:OpenMetaverse.Simulator"/> Object</param>
+            <param name="simulator">
+                <seealso cref="T:OpenMetaverse.Simulator" /> Object</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.ScriptQuestionReply(OpenMetaverse.Simulator,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.ScriptPermission)">
             <summary>
             Reply to script permissions request
             </summary>
-            <param name="simulator"><seealso cref="T:OpenMetaverse.Simulator"/> Object</param>
-            <param name="itemID"><seealso cref="T:OpenMetaverse.UUID"/> of the itemID requesting permissions</param>
-            <param name="taskID"><seealso cref="T:OpenMetaverse.UUID"/> of the taskID requesting permissions</param>
-            <param name="permissions"><seealso cref="T:OpenMetaverse.ScriptPermission"/> list of permissions to allow</param>
+            <param name="simulator">
+                <seealso cref="T:OpenMetaverse.Simulator" /> Object</param>
+            <param name="itemID">
+                <seealso cref="T:OpenMetaverse.UUID" /> of the itemID requesting permissions</param>
+            <param name="taskID">
+                <seealso cref="T:OpenMetaverse.UUID" /> of the taskID requesting permissions</param>
+            <param name="permissions">
+                <seealso cref="T:OpenMetaverse.ScriptPermission" /> list of permissions to allow</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.GroupInviteRespond(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean)">
             <summary>
@@ -6183,6 +2495,20 @@
             </summary>
             <param name="callback">Called when the requested information is collected</param>
         </member>
+        <member name="M:OpenMetaverse.AgentManager.SetDisplayName(System.String,System.String)">
+            <summary>
+            Initates request to set a new display name
+            </summary>
+            <param name="oldName">Previous display name</param>
+            <param name="newName">Desired new display name</param>
+        </member>
+        <member name="M:OpenMetaverse.AgentManager.UpdateAgentLanguage(System.String,System.Boolean)">
+            <summary>
+            Tells the sim what UI language is used, and if it's ok to share that with scripts
+            </summary>
+            <param name="language">Two letter language code</param>
+            <param name="isPublic">Share language info with scripts</param>
+        </member>
         <member name="M:OpenMetaverse.AgentManager.InstantMessageHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>
             Take an incoming ImprovedInstantMessage packet, auto-parse, and if
@@ -6193,8 +2519,8 @@
         </member>
         <member name="M:OpenMetaverse.AgentManager.ChatHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>
-            Take an incoming Chat packet, auto-parse, and if OnChat is defined call 
-              that with the appropriate arguments.
+            Take an incoming Chat packet, auto-parse, and if OnChat is defined call
+            that with the appropriate arguments.
             </summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
@@ -6250,6 +2576,14 @@
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
         </member>
+        <member name="M:OpenMetaverse.AgentManager.SetDisplayNameReplyEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
+            <summary>
+            EQ Message fired with the result of SetDisplayName request
+            </summary>
+            <param name="capsKey">The message key</param>
+            <param name="message">the IMessage object containing the deserialized data sent from the simulator</param>
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator" /> which originated the packet</param>
+        </member>
         <member name="M:OpenMetaverse.AgentManager.TeleportFailedEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
             Process TeleportFailed message sent via EventQueue, informs agent its last teleport has failed and why.
@@ -6288,7 +2622,7 @@
             </summary>
             <param name="capsKey">The message key</param>
             <param name="message">the IMessage object containing the deserialized data sent from the simulator</param>
-            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> which originated the packet</param>
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator" /> which originated the packet</param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.CrossedRegionHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>Process an incoming packet and raise the appropriate events</summary>
@@ -6302,23 +2636,28 @@
             </summary>
             <param name="capsKey">The capability Key</param>
             <param name="message">IMessage object containing decoded data from OSD</param>
-            <param name="simulator"></param>
+            <param name="simulator">
+            </param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.ChatterBoxSessionStartReplyEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
             Response from request to join a group chat
             </summary>
-            <param name="capsKey"></param>
+            <param name="capsKey">
+            </param>
             <param name="message">IMessage object containing decoded data from OSD</param>
-            <param name="simulator"></param>
+            <param name="simulator">
+            </param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.ChatterBoxSessionAgentListUpdatesEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
             Someone joined or left group chat
             </summary>
-            <param name="capsKey"></param>
+            <param name="capsKey">
+            </param>
             <param name="message">IMessage object containing decoded data from OSD</param>
-            <param name="simulator"></param>
+            <param name="simulator">
+            </param>
         </member>
         <member name="M:OpenMetaverse.AgentManager.ChatterBoxInvitationEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
@@ -6332,8 +2671,8 @@
             <summary>
             Moderate a chat session
             </summary>
-            <param name="sessionID">the <see cref="T:OpenMetaverse.UUID"/> of the session to moderate, for group chats this will be the groups UUID</param>
-            <param name="memberID">the <see cref="T:OpenMetaverse.UUID"/> of the avatar to moderate</param>
+            <param name="sessionID">the <see cref="T:OpenMetaverse.UUID" /> of the session to moderate, for group chats this will be the groups UUID</param>
+            <param name="memberID">the <see cref="T:OpenMetaverse.UUID" /> of the avatar to moderate</param>
             <param name="key">Either "voice" to moderate users voice, or "text" to moderate users text session</param>
             <param name="moderate">true to moderate (silence user), false to allow avatar to speak</param>
         </member>
@@ -6357,535 +2696,8 @@
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="E:OpenMetaverse.AgentManager.ChatFromSimulator">
-            <summary>Raised when a scripted object or agent within range sends a public message</summary>
-        </member>
-        <member name="E:OpenMetaverse.AgentManager.ScriptDialog">
-            <summary>Raised when a scripted object sends a dialog box containing possible
-            options an agent can respond to</summary>
-        </member>
-        <member name="E:OpenMetaverse.AgentManager.ScriptQuestion">
-            <summary>Raised when an object requests a change in the permissions an agent has permitted</summary>
-        </member>
-        <member name="E:OpenMetaverse.AgentManager.LoadURL">
-            <summary>Raised when a script requests an agent open the specified URL</summary>
-        </member>
-        <member name="E:OpenMetaverse.AgentManager.MoneyBalance">
-            <summary>Raised when an agents currency balance is updated</summary>
-        </member>
-        <member name="E:OpenMetaverse.AgentManager.MoneyBalanceReply">
-            <summary>Raised when a transaction occurs involving currency such as a land purchase</summary>
-        </member>
-        <member name="E:OpenMetaverse.AgentManager.IM">
-            <summary>Raised when an ImprovedInstantMessage packet is recieved from the simulator, this is used for everything from
-            private messaging to friendship offers. The Dialog field defines what type of message has arrived</summary>
-        </member>
-        <member name="E:OpenMetaverse.AgentManager.TeleportProgress">
-            <summary>Raised when an agent has requested a teleport to another location, or when responding to a lure. Raised multiple times
-            for each teleport indicating the progress of the request</summary>
-        </member>
-        <member name="E:OpenMetaverse.AgentManager.AgentDataReply">
-            <summary>Raised when a simulator sends agent specific information for our avatar.</summary>
-        </member>
-        <member name="E:OpenMetaverse.AgentManager.AnimationsChanged">
-            <summary>Raised when our agents animation playlist changes</summary>
-        </member>
-        <member name="E:OpenMetaverse.AgentManager.MeanCollision">
-            <summary>Raised when an object or avatar forcefully collides with our agent</summary>
-        </member>
-        <member name="E:OpenMetaverse.AgentManager.RegionCrossed">
-            <summary>Raised when our agent crosses a region border into another region</summary>
-        </member>
-        <member name="E:OpenMetaverse.AgentManager.GroupChatJoined">
-            <summary>Raised when our agent succeeds or fails to join a group chat session</summary>
-        </member>
-        <member name="E:OpenMetaverse.AgentManager.AlertMessage">
-            <summary>Raised when a simulator sends an urgent message usually indication the recent failure of
-            another action we have attempted to take such as an attempt to enter a parcel where we are denied access</summary>
-        </member>
-        <member name="E:OpenMetaverse.AgentManager.ScriptControlChange">
-            <summary>Raised when a script attempts to take or release specified controls for our agent</summary>
-        </member>
-        <member name="E:OpenMetaverse.AgentManager.CameraConstraint">
-            <summary>Raised when the simulator detects our agent is trying to view something
-            beyond its limits</summary>
-        </member>
-        <member name="E:OpenMetaverse.AgentManager.ScriptSensorReply">
-            <summary>Raised when a script sensor reply is received from a simulator</summary>
-        </member>
-        <member name="E:OpenMetaverse.AgentManager.AvatarSitResponse">
-            <summary>Raised in response to a <see cref="M:OpenMetaverse.AgentManager.RequestSit(OpenMetaverse.UUID,OpenMetaverse.Vector3)"/> request</summary>
-        </member>
-        <member name="E:OpenMetaverse.AgentManager.ChatSessionMemberAdded">
-            <summary>Raised when an avatar enters a group chat session we are participating in</summary>
-        </member>
-        <member name="E:OpenMetaverse.AgentManager.ChatSessionMemberLeft">
-            <summary>Raised when an agent exits a group chat session we are participating in</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentID">
-            <summary>Your (client) avatars <see cref="T:OpenMetaverse.UUID"/></summary>
-            <remarks>"client", "agent", and "avatar" all represent the same thing</remarks>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.SessionID">
-            <summary>Temporary <seealso cref="T:OpenMetaverse.UUID"/> assigned to this session, used for 
-            verifying our identity in packets</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.SecureSessionID">
-            <summary>Shared secret <seealso cref="T:OpenMetaverse.UUID"/> that is never sent over the wire</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.LocalID">
-            <summary>Your (client) avatar ID, local to the current region/sim</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.StartLocation">
-            <summary>Where the avatar started at login. Can be "last", "home" 
-            or a login <seealso cref="T:OpenMetaverse.URI"/></summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentAccess">
-            <summary>The access level of this agent, usually M or PG</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.CollisionPlane">
-            <summary>The CollisionPlane of Agent</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.Velocity">
-            <summary>An <seealso cref="T:OpenMetaverse.Vector3"/> representing the velocity of our agent</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.Acceleration">
-            <summary>An <seealso cref="T:OpenMetaverse.Vector3"/> representing the acceleration of our agent</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AngularVelocity">
-            <summary>A <seealso cref="T:OpenMetaverse.Vector3"/> which specifies the angular speed, and axis about which an Avatar is rotating.</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.HomePosition">
-            <summary>Position avatar client will goto when login to 'home' or during
-            teleport request to 'home' region.</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.HomeLookAt">
-            <summary>LookAt point saved/restored with HomePosition</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.FirstName">
-            <summary>Avatar First Name (i.e. Philip)</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.LastName">
-            <summary>Avatar Last Name (i.e. Linden)</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.Name">
-            <summary>Avatar Full Name (i.e. Philip Linden)</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.Health">
-            <summary>Gets the health of the agent</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.Balance">
-            <summary>Gets the current balance of the agent</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.SittingOn">
-            <summary>Gets the local ID of the prim the agent is sitting on,
-            zero if the avatar is not currently sitting</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.ActiveGroup">
-            <summary>Gets the <seealso cref="T:OpenMetaverse.UUID"/> of the agents active group.</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.ActiveGroupPowers">
-            <summary>Gets the Agents powers in the currently active group</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.TeleportMessage">
-            <summary>Current status message for teleporting</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.RelativePosition">
-            <summary>Current position of the agent as a relative offset from
-            the simulator, or the parent object if we are sitting on something</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.RelativeRotation">
-            <summary>Current rotation of the agent as a relative rotation from
-            the simulator, or the parent object if we are sitting on something</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.SimPosition">
-            <summary>Current position of the agent in the simulator</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.SimRotation">
-            <summary>
-            A <seealso cref="T:OpenMetaverse.Quaternion"/> representing the agents current rotation
-            </summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.GlobalPosition">
-            <summary>Returns the global grid position of the avatar</summary>
-        </member>
-        <member name="T:OpenMetaverse.AgentManager.AttachmentResourcesCallback">
-            <summary>
-            Called once attachment resource usage information has been collected
-            </summary>
-            <param name="success">Indicates if operation was successfull</param>
-            <param name="info">Attachment resource usage information</param>
-        </member>
-        <member name="T:OpenMetaverse.AgentManager.ControlFlags">
-            <summary>
-            Used to specify movement actions for your agent
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.NONE">
-            <summary>Empty flag</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_AT_POS">
-            <summary>Move Forward (SL Keybinding: W/Up Arrow)</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG">
-            <summary>Move Backward (SL Keybinding: S/Down Arrow)</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS">
-            <summary>Move Left (SL Keybinding: Shift-(A/Left Arrow))</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG">
-            <summary>Move Right (SL Keybinding: Shift-(D/Right Arrow))</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_UP_POS">
-            <summary>Not Flying: Jump/Flying: Move Up (SL Keybinding: E)</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG">
-            <summary>Not Flying: Croutch/Flying: Move Down (SL Keybinding: C)</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_PITCH_POS">
-            <summary>Unused</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_PITCH_NEG">
-            <summary>Unused</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_YAW_POS">
-            <summary>Unused</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_YAW_NEG">
-            <summary>Unused</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_FAST_AT">
-            <summary>ORed with AGENT_CONTROL_AT_* if the keyboard is being used</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_FAST_LEFT">
-            <summary>ORed with AGENT_CONTROL_LEFT_* if the keyboard is being used</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_FAST_UP">
-            <summary>ORed with AGENT_CONTROL_UP_* if the keyboard is being used</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_FLY">
-            <summary>Fly</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_STOP">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_FINISH_ANIM">
-            <summary>Finish our current animation</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP">
-            <summary>Stand up from the ground or a prim seat</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND">
-            <summary>Sit on the ground at our current location</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK">
-            <summary>Whether mouselook is currently enabled</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS">
-            <summary>Legacy, used if a key was pressed for less than a certain amount of time</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_NEG">
-            <summary>Legacy, used if a key was pressed for less than a certain amount of time</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_POS">
-            <summary>Legacy, used if a key was pressed for less than a certain amount of time</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_NEG">
-            <summary>Legacy, used if a key was pressed for less than a certain amount of time</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_POS">
-            <summary>Legacy, used if a key was pressed for less than a certain amount of time</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG">
-            <summary>Legacy, used if a key was pressed for less than a certain amount of time</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_AWAY">
-            <summary>Set when the avatar is idled or set to away. Note that the away animation is 
-            activated separately from setting this flag</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_DOWN">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_UP">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_ML_LBUTTON_DOWN">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_ML_LBUTTON_UP">
-            <summary></summary>
-        </member>
-        <member name="T:OpenMetaverse.AgentManager.AgentMovement">
-            <summary> 
-            Agent movement and camera control
-            
-            Agent movement is controlled by setting specific <seealso cref="T:AgentManager.ControlFlags"/>
-            After the control flags are set, An AgentUpdate is required to update the simulator of the specified flags
-            This is most easily accomplished by setting one or more of the AgentMovement properties
-            
-            Movement of an avatar is always based on a compass direction, for example AtPos will move the 
-            agent from West to East or forward on the X Axis, AtNeg will of course move agent from 
-            East to West or backward on the X Axis, LeftPos will be South to North or forward on the Y Axis
-            The Z axis is Up, finer grained control of movements can be done using the Nudge properties
-            </summary> 
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.Camera">
-            <summary>Agent camera controls</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.Flags">
-            <summary>Currently only used for hiding your group title</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.State">
-            <summary>Action state of the avatar, which can currently be
-            typing and editing</summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.BodyRotation">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.HeadRotation">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastBodyRotation">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastHeadRotation">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastCameraCenter">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastCameraXAxis">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastCameraYAxis">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastCameraZAxis">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastFar">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.updateTimer">
-            <summary>Timer for sending AgentUpdate packets</summary>
-        </member>
-        <member name="M:OpenMetaverse.AgentManager.AgentMovement.#ctor(OpenMetaverse.GridClient)">
-            <summary>Default constructor</summary>
-        </member>
-        <member name="M:OpenMetaverse.AgentManager.AgentMovement.UpdateFromHeading(System.Double,System.Boolean)">
-            <summary>
-            Send an AgentUpdate with the camera set at the current agent
-            position and pointing towards the heading specified
-            </summary>
-            <param name="heading">Camera rotation in radians</param>
-            <param name="reliable">Whether to send the AgentUpdate reliable
-            or not</param>
-        </member>
-        <member name="M:OpenMetaverse.AgentManager.AgentMovement.TurnToward(OpenMetaverse.Vector3)">
-            <summary>
-            Rotates the avatar body and camera toward a target position.
-            This will also anchor the camera position on the avatar
-            </summary>
-            <param name="target">Region coordinates to turn toward</param>
-        </member>
-        <member name="M:OpenMetaverse.AgentManager.AgentMovement.SendUpdate">
-            <summary>
-            Send new AgentUpdate packet to update our current camera 
-            position and rotation
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.AgentManager.AgentMovement.SendUpdate(System.Boolean)">
-            <summary>
-            Send new AgentUpdate packet to update our current camera 
-            position and rotation
-            </summary>
-            <param name="reliable">Whether to require server acknowledgement
-            of this packet</param>
-        </member>
-        <member name="M:OpenMetaverse.AgentManager.AgentMovement.SendUpdate(System.Boolean,OpenMetaverse.Simulator)">
-            <summary>
-            Send new AgentUpdate packet to update our current camera 
-            position and rotation
-            </summary>
-            <param name="reliable">Whether to require server acknowledgement
-            of this packet</param>
-            <param name="simulator">Simulator to send the update to</param>
-        </member>
-        <member name="M:OpenMetaverse.AgentManager.AgentMovement.SendManualUpdate(OpenMetaverse.AgentManager.ControlFlags,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Quaternion,OpenMetaverse.Quaternion,System.Single,OpenMetaverse.AgentFlags,OpenMetaverse.AgentState,System.Boolean)">
-            <summary>
-            Builds an AgentUpdate packet entirely from parameters. This
-            will not touch the state of Self.Movement or
-            Self.Movement.Camera in any way
-            </summary>
-            <param name="controlFlags"></param>
-            <param name="position"></param>
-            <param name="forwardAxis"></param>
-            <param name="leftAxis"></param>
-            <param name="upAxis"></param>
-            <param name="bodyRotation"></param>
-            <param name="headRotation"></param>
-            <param name="farClip"></param>
-            <param name="reliable"></param>
-            <param name="flags"></param>
-            <param name="state"></param>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AtPos">
-            <summary>Move agent positive along the X axis</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AtNeg">
-            <summary>Move agent negative along the X axis</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.LeftPos">
-            <summary>Move agent positive along the Y axis</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.LeftNeg">
-            <summary>Move agent negative along the Y axis</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.UpPos">
-            <summary>Move agent positive along the Z axis</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.UpNeg">
-            <summary>Move agent negative along the Z axis</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.PitchPos">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.PitchNeg">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.YawPos">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.YawNeg">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FastAt">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FastLeft">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FastUp">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.Fly">
-            <summary>Causes simulator to make agent fly</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.Stop">
-            <summary>Stop movement</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FinishAnim">
-            <summary>Finish animation</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.StandUp">
-            <summary>Stand up from a sit</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.SitOnGround">
-            <summary>Tells simulator to sit agent on ground</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.Mouselook">
-            <summary>Place agent into mouselook mode</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeAtPos">
-            <summary>Nudge agent positive along the X axis</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeAtNeg">
-            <summary>Nudge agent negative along the X axis</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeLeftPos">
-            <summary>Nudge agent positive along the Y axis</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeLeftNeg">
-            <summary>Nudge agent negative along the Y axis</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeUpPos">
-            <summary>Nudge agent positive along the Z axis</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeUpNeg">
-            <summary>Nudge agent negative along the Z axis</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.TurnLeft">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.TurnRight">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.Away">
-            <summary>Tell simulator to mark agent as away</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.LButtonDown">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.LButtonUp">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.MLButtonDown">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.MLButtonUp">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AlwaysRun">
-            <summary>
-            Returns "always run" value, or changes it by sending a SetAlwaysRunPacket
-            </summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentControls">
-            <summary>The current value of the agent control flags</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.UpdateInterval">
-            <summary>Gets or sets the interval in milliseconds at which
-            AgentUpdate packets are sent to the current simulator. Setting
-            this to a non-zero value will also enable the packet sending if
-            it was previously off, and setting it to zero will disable</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.UpdateEnabled">
-            <summary>Gets or sets whether AgentUpdate packets are sent to
-            the current simulator</summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AutoResetControls">
-            <summary>Reset movement controls every time we send an update</summary>
-        </member>
-        <member name="T:OpenMetaverse.AgentManager.AgentMovement.AgentCamera">
-            <summary>
-            Camera controls for the agent, mostly a thin wrapper around
-            CoordinateFrame. This class is only responsible for state
-            tracking and math, it does not send any packets
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.Far">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.Frame">
-            <summary>The camera is a local frame of reference inside of
-            the larger grid space. This is where the math happens</summary>
-        </member>
-        <member name="M:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.Position">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.AtAxis">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.LeftAxis">
-            <summary></summary>
-        </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.UpAxis">
-            <summary></summary>
-        </member>
         <member name="T:OpenMetaverse.ChatEventArgs">
             <summary>
-            
             </summary>
         </member>
         <member name="M:OpenMetaverse.ChatEventArgs.#ctor(OpenMetaverse.Simulator,System.String,OpenMetaverse.ChatAudibleLevel,OpenMetaverse.ChatType,OpenMetaverse.ChatSourceType,System.String,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.Vector3)">
@@ -6932,7 +2744,7 @@
         <member name="T:OpenMetaverse.ScriptDialogEventArgs">
             <summary>Contains the data sent when a primitive opens a dialog with this agent</summary>
         </member>
-        <member name="M:OpenMetaverse.ScriptDialogEventArgs.#ctor(System.String,System.String,OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.String,System.Int32,System.Collections.Generic.List{System.String})">
+        <member name="M:OpenMetaverse.ScriptDialogEventArgs.#ctor(System.String,System.String,OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.String,System.Int32,System.Collections.Generic.List{System.String},OpenMetaverse.UUID)">
             <summary>
             Construct a new instance of the ScriptDialogEventArgs
             </summary>
@@ -6944,6 +2756,7 @@
             <param name="lastName">The last name of the senders owner</param>
             <param name="chatChannel">The communication channel the dialog was sent on</param>
             <param name="buttons">The string labels containing the options presented in this dialog</param>
+            <param name="ownerID">UUID of the scritped object owner</param>
         </member>
         <member name="P:OpenMetaverse.ScriptDialogEventArgs.Message">
             <summary>Get the dialog message</summary>
@@ -6970,6 +2783,9 @@
         <member name="P:OpenMetaverse.ScriptDialogEventArgs.ButtonLabels">
             <summary>Get the string labels containing the options presented in this dialog</summary>
         </member>
+        <member name="P:OpenMetaverse.ScriptDialogEventArgs.OwnerID">
+            <summary>UUID of the scritped object owner</summary>
+        </member>
         <member name="T:OpenMetaverse.ScriptQuestionEventArgs">
             <summary>Contains the data sent when a primitive requests debit or other permissions
             requesting a YES or NO answer</summary>
@@ -7004,7 +2820,7 @@
             <summary>Get the permissions being requested</summary>
         </member>
         <member name="T:OpenMetaverse.LoadUrlEventArgs">
-            <summary>Contains the data sent when a primitive sends a request 
+            <summary>Contains the data sent when a primitive sends a request
             to an agent to open the specified URL</summary>
         </member>
         <member name="M:OpenMetaverse.LoadUrlEventArgs.#ctor(System.String,OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.String,System.String)">
@@ -7067,10 +2883,10 @@
             </summary>
         </member>
         <member name="T:OpenMetaverse.MoneyBalanceReplyEventArgs">
-            <summary>Contains the transaction summary when an item is purchased, 
+            <summary>Contains the transaction summary when an item is purchased,
             money is given, or land is purchased</summary>
         </member>
-        <member name="M:OpenMetaverse.MoneyBalanceReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Boolean,System.Int32,System.Int32,System.Int32,System.String)">
+        <member name="M:OpenMetaverse.MoneyBalanceReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Boolean,System.Int32,System.Int32,System.Int32,System.String,OpenMetaverse.TransactionInfo)">
             <summary>
             Construct a new instance of the MoneyBalanceReplyEventArgs object
             </summary>
@@ -7099,6 +2915,9 @@
         <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.Description">
             <summary>Get the description of the transaction</summary>
         </member>
+        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.TransactionInfo">
+            <summary>Detailed transaction information</summary>
+        </member>
         <member name="T:OpenMetaverse.AgentDataReplyEventArgs">
             <summary>Data sent from the simulator containing information about your agent and active group information</summary>
         </member>
@@ -7312,7 +3131,7 @@
             <summary>Get the velocity of the primitive sending the sensor</summary>
         </member>
         <member name="T:OpenMetaverse.AvatarSitResponseEventArgs">
-            <summary>Contains the response data returned from the simulator in response to a <see cref="!:RequestSit"/></summary>
+            <summary>Contains the response data returned from the simulator in response to a <see cref="!:RequestSit" /></summary>
         </member>
         <member name="M:OpenMetaverse.AvatarSitResponseEventArgs.#ctor(OpenMetaverse.UUID,System.Boolean,OpenMetaverse.Vector3,OpenMetaverse.Vector3,System.Boolean,OpenMetaverse.Vector3,OpenMetaverse.Quaternion)">
             <summary>Construct a new instance of the AvatarSitResponseEventArgs object</summary>
@@ -7370,2431 +3189,5516 @@
         <member name="P:OpenMetaverse.ChatSessionMemberLeftEventArgs.AgentID">
             <summary>Get the ID of the agent that left</summary>
         </member>
-        <member name="M:OpenMetaverse.Messages.MessageUtils.DecodeEvent(System.String,OpenMetaverse.StructuredData.OSDMap)">
+        <member name="T:OpenMetaverse.SetDisplayNameReplyEventArgs">
+            <summary>Event arguments with the result of setting display name operation</summary>
+        </member>
+        <member name="M:OpenMetaverse.SetDisplayNameReplyEventArgs.#ctor(System.Int32,System.String,OpenMetaverse.AgentDisplayName)">
+            <summary>Default constructor</summary>
+        </member>
+        <member name="P:OpenMetaverse.SetDisplayNameReplyEventArgs.Status">
+            <summary>Status code, 200 indicates settign display name was successful</summary>
+        </member>
+        <member name="P:OpenMetaverse.SetDisplayNameReplyEventArgs.Reason">
+            <summary>Textual description of the status</summary>
+        </member>
+        <member name="P:OpenMetaverse.SetDisplayNameReplyEventArgs.DisplayName">
+            <summary>Details of the newly set display name</summary>
+        </member>
+        <member name="T:OpenMetaverse.AgentThrottle">
             <summary>
-            Return a decoded capabilities message as a strongly typed object
+            Throttles the network traffic for various different traffic types.
+            Access this class through GridClient.Throttle
             </summary>
-            <param name="eventName">A string containing the name of the capabilities message key</param>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> to decode</param>
-            <returns>A strongly typed object containing the decoded information from the capabilities message, or null
-            if no existing Message object exists for the specified event</returns>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetNotecard">
+        <member name="M:OpenMetaverse.AgentThrottle.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            Represents a string of characters encoded with specific formatting properties
+            Default constructor, uses a default high total of 1500 KBps (1536000)
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetNotecard.BodyText">
-            <summary>A text string containing main text of the notecard</summary>
+        <member name="M:OpenMetaverse.AgentThrottle.#ctor(System.Byte[],System.Int32)">
+            <summary>
+            Constructor that decodes an existing AgentThrottle packet in to
+            individual values
+            </summary>
+            <param name="data">Reference to the throttle data in an AgentThrottle
+            packet</param>
+            <param name="pos">Offset position to start reading at in the
+            throttle data</param>
+            <remarks>This is generally not needed in clients as the server will
+            never send a throttle packet to the client</remarks>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetNotecard.EmbeddedItems">
-            <summary>List of <see cref="T:OpenMetaverse.InventoryItem"/>s embedded on the notecard</summary>
+        <member name="P:OpenMetaverse.AgentThrottle.Resend">
+            <summary>Maximum bits per second for resending unacknowledged packets</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetNotecard.#ctor">
-            <summary>Construct an Asset of type Notecard</summary>
+        <member name="P:OpenMetaverse.AgentThrottle.Land">
+            <summary>Maximum bits per second for LayerData terrain</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetNotecard.#ctor(OpenMetaverse.UUID,System.Byte[])">
+        <member name="P:OpenMetaverse.AgentThrottle.Wind">
+            <summary>Maximum bits per second for LayerData wind data</summary>
+        </member>
+        <member name="P:OpenMetaverse.AgentThrottle.Cloud">
+            <summary>Maximum bits per second for LayerData clouds</summary>
+        </member>
+        <member name="P:OpenMetaverse.AgentThrottle.Task">
+            <summary>Unknown, includes object data</summary>
+        </member>
+        <member name="P:OpenMetaverse.AgentThrottle.Texture">
+            <summary>Maximum bits per second for textures</summary>
+        </member>
+        <member name="P:OpenMetaverse.AgentThrottle.Asset">
+            <summary>Maximum bits per second for downloaded assets</summary>
+        </member>
+        <member name="P:OpenMetaverse.AgentThrottle.Total">
+            <summary>Maximum bits per second the entire connection, divided up
+            between invidiual streams using default multipliers</summary>
+        </member>
+        <member name="M:OpenMetaverse.AgentThrottle.Set">
             <summary>
-            Construct an Asset object of type Notecard
+            Send an AgentThrottle packet to the current server using the
+            current values
             </summary>
-            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
-            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetNotecard.Encode">
+        <member name="M:OpenMetaverse.AgentThrottle.Set(OpenMetaverse.Simulator)">
             <summary>
-            Encode the raw contents of a string with the specific Linden Text properties
+            Send an AgentThrottle packet to the specified server using the
+            current values
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetNotecard.Decode">
+        <member name="M:OpenMetaverse.AgentThrottle.ToBytes">
             <summary>
-            Decode the raw asset data including the Linden Text properties
+            Convert the current throttle values to a byte array that can be put
+            in an AgentThrottle packet
             </summary>
-            <returns>true if the AssetData was successfully decoded</returns>
+            <returns>Byte array containing all the throttle values</returns>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetNotecard.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="T:OpenMetaverse.Animations">
+            <summary>
+            Static pre-defined animations available to all agents
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Settings">
+        <member name="F:OpenMetaverse.Animations.AFRAID">
+            <summary>Agent with afraid expression on face</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.AIM_BAZOOKA_R">
+            <summary>Agent aiming a bazooka (right handed)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.AIM_BOW_L">
+            <summary>Agent aiming a bow (left handed)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.AIM_HANDGUN_R">
+            <summary>Agent aiming a hand gun (right handed)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.AIM_RIFLE_R">
+            <summary>Agent aiming a rifle (right handed)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.ANGRY">
+            <summary>Agent with angry expression on face</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.AWAY">
+            <summary>Agent hunched over (away)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.BACKFLIP">
+            <summary>Agent doing a backflip</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.BELLY_LAUGH">
+            <summary>Agent laughing while holding belly</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.BLOW_KISS">
+            <summary>Agent blowing a kiss</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.BORED">
+            <summary>Agent with bored expression on face</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.BOW">
+            <summary>Agent bowing to audience</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.BRUSH">
+            <summary>Agent brushing himself/herself off</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.BUSY">
+            <summary>Agent in busy mode</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.CLAP">
+            <summary>Agent clapping hands</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.COURTBOW">
+            <summary>Agent doing a curtsey bow</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.CROUCH">
+            <summary>Agent crouching</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.CROUCHWALK">
+            <summary>Agent crouching while walking</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.CRY">
+            <summary>Agent crying</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.CUSTOMIZE">
+            <summary>Agent unanimated with arms out (e.g. setting appearance)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.CUSTOMIZE_DONE">
+            <summary>Agent re-animated after set appearance finished</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.DANCE1">
+            <summary>Agent dancing</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.DANCE2">
+            <summary>Agent dancing</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.DANCE3">
+            <summary>Agent dancing</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.DANCE4">
+            <summary>Agent dancing</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.DANCE5">
+            <summary>Agent dancing</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.DANCE6">
+            <summary>Agent dancing</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.DANCE7">
+            <summary>Agent dancing</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.DANCE8">
+            <summary>Agent dancing</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.DEAD">
+            <summary>Agent on ground unanimated</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.DRINK">
+            <summary>Agent boozing it up</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.EMBARRASSED">
+            <summary>Agent with embarassed expression on face</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_AFRAID">
+            <summary>Agent with afraid expression on face</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_ANGER">
+            <summary>Agent with angry expression on face</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_BORED">
+            <summary>Agent with bored expression on face</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_CRY">
+            <summary>Agent crying</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_DISDAIN">
+            <summary>Agent showing disdain (dislike) for something</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_EMBARRASSED">
+            <summary>Agent with embarassed expression on face</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_FROWN">
+            <summary>Agent with frowning expression on face</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_KISS">
+            <summary>Agent with kissy face</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_LAUGH">
+            <summary>Agent expressing laughgter</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_OPEN_MOUTH">
+            <summary>Agent with open mouth</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_REPULSED">
+            <summary>Agent with repulsed expression on face</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_SAD">
+            <summary>Agent expressing sadness</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_SHRUG">
+            <summary>Agent shrugging shoulders</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_SMILE">
+            <summary>Agent with a smile</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_SURPRISE">
+            <summary>Agent expressing surprise</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_TONGUE_OUT">
+            <summary>Agent sticking tongue out</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_TOOTHSMILE">
+            <summary>Agent with big toothy smile</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_WINK">
+            <summary>Agent winking</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_WORRY">
+            <summary>Agent expressing worry</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.FALLDOWN">
+            <summary>Agent falling down</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.FEMALE_WALK">
+            <summary>Agent walking (feminine version)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.FINGER_WAG">
+            <summary>Agent wagging finger (disapproval)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.FIST_PUMP">
+            <summary>I'm not sure I want to know</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.FLY">
+            <summary>Agent in superman position</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.FLYSLOW">
+            <summary>Agent in superman position</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.HELLO">
+            <summary>Agent greeting another</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.HOLD_BAZOOKA_R">
+            <summary>Agent holding bazooka (right handed)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.HOLD_BOW_L">
+            <summary>Agent holding a bow (left handed)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.HOLD_HANDGUN_R">
+            <summary>Agent holding a handgun (right handed)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.HOLD_RIFLE_R">
+            <summary>Agent holding a rifle (right handed)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.HOLD_THROW_R">
+            <summary>Agent throwing an object (right handed)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.HOVER">
+            <summary>Agent in static hover</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.HOVER_DOWN">
+            <summary>Agent hovering downward</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.HOVER_UP">
+            <summary>Agent hovering upward</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.IMPATIENT">
+            <summary>Agent being impatient</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.JUMP">
+            <summary>Agent jumping</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.JUMP_FOR_JOY">
+            <summary>Agent jumping with fervor</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.KISS_MY_BUTT">
+            <summary>Agent point to lips then rear end</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.LAND">
+            <summary>Agent landing from jump, finished flight, etc</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.LAUGH_SHORT">
+            <summary>Agent laughing</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.MEDIUM_LAND">
+            <summary>Agent landing from jump, finished flight, etc</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.MOTORCYCLE_SIT">
+            <summary>Agent sitting on a motorcycle</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.MUSCLE_BEACH">
             <summary>
-            Class for controlling various system settings.
             </summary>
-            <remarks>Some values are readonly because they affect things that
-            happen when the GridClient object is initialized, so changing them at 
-            runtime won't do any good. Non-readonly values may affect things that 
-            happen at login or dynamically</remarks>
         </member>
-        <member name="F:OpenMetaverse.Settings.AGNI_LOGIN_SERVER">
-            <summary>Main grid login server</summary>
+        <member name="F:OpenMetaverse.Animations.NO">
+            <summary>Agent moving head side to side</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.ADITI_LOGIN_SERVER">
-            <summary>Beta grid login server</summary>
+        <member name="F:OpenMetaverse.Animations.NO_UNHAPPY">
+            <summary>Agent moving head side to side with unhappy expression</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.ENABLE_INVENTORY_STORE">
+        <member name="F:OpenMetaverse.Animations.NYAH_NYAH">
+            <summary>Agent taunting another</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.ONETWO_PUNCH">
             <summary>
-            InventoryManager requests inventory information on login,
-            GridClient initializes an Inventory store for main inventory.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.ENABLE_LIBRARY_STORE">
+        <member name="F:OpenMetaverse.Animations.PEACE">
+            <summary>Agent giving peace sign</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.POINT_ME">
+            <summary>Agent pointing at self</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.POINT_YOU">
+            <summary>Agent pointing at another</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.PRE_JUMP">
+            <summary>Agent preparing for jump (bending knees)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.PUNCH_LEFT">
+            <summary>Agent punching with left hand</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.PUNCH_RIGHT">
+            <summary>Agent punching with right hand</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.REPULSED">
+            <summary>Agent acting repulsed</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.ROUNDHOUSE_KICK">
+            <summary>Agent trying to be Chuck Norris</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.RPS_COUNTDOWN">
+            <summary>Rocks, Paper, Scissors 1, 2, 3</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.RPS_PAPER">
+            <summary>Agent with hand flat over other hand</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.RPS_ROCK">
+            <summary>Agent with fist over other hand</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.RPS_SCISSORS">
+            <summary>Agent with two fingers spread over other hand</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.RUN">
+            <summary>Agent running</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SAD">
+            <summary>Agent appearing sad</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SALUTE">
+            <summary>Agent saluting</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SHOOT_BOW_L">
+            <summary>Agent shooting bow (left handed)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SHOUT">
+            <summary>Agent cupping mouth as if shouting</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SHRUG">
+            <summary>Agent shrugging shoulders</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SIT">
+            <summary>Agent in sit position</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SIT_FEMALE">
+            <summary>Agent in sit position (feminine)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SIT_GENERIC">
+            <summary>Agent in sit position (generic)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SIT_GROUND">
+            <summary>Agent sitting on ground</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SIT_GROUND_staticRAINED">
+            <summary>Agent sitting on ground</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animations.SIT_TO_STAND">
             <summary>
-            InventoryManager requests library information on login,
-            GridClient initializes an Inventory store for the library.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.PING_INTERVAL">
-            <summary>Number of milliseconds between sending pings to each sim</summary>
+        <member name="F:OpenMetaverse.Animations.SLEEP">
+            <summary>Agent sleeping on side</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.DEFAULT_AGENT_UPDATE_INTERVAL">
-            <summary>Number of milliseconds between sending camera updates</summary>
+        <member name="F:OpenMetaverse.Animations.SMOKE_IDLE">
+            <summary>Agent smoking</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.INTERPOLATION_INTERVAL">
-            <summary>Number of milliseconds between updating the current
-            positions of moving, non-accelerating and non-colliding objects</summary>
+        <member name="F:OpenMetaverse.Animations.SMOKE_INHALE">
+            <summary>Agent inhaling smoke</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.NETWORK_TICK_INTERVAL">
-            <summary>Millisecond interval between ticks, where all ACKs are 
-            sent out and the age of unACKed packets is checked</summary>
+        <member name="F:OpenMetaverse.Animations.SMOKE_THROW_DOWN">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.PACKET_INBOX_SIZE">
-            <summary>The initial size of the packet inbox, where packets are
-            stored before processing</summary>
+        <member name="F:OpenMetaverse.Animations.SNAPSHOT">
+            <summary>Agent taking a picture</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.MAX_PACKET_SIZE">
-            <summary>Maximum size of packet that we want to send over the wire</summary>
+        <member name="F:OpenMetaverse.Animations.STAND">
+            <summary>Agent standing</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.MAX_SEQUENCE">
-            <summary>The maximum value of a packet sequence number before it
-            rolls over back to one</summary>
+        <member name="F:OpenMetaverse.Animations.STANDUP">
+            <summary>Agent standing up</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.PACKET_ARCHIVE_SIZE">
-            <summary>The maximum size of the sequence number archive, used to
-            check for resent and/or duplicate packets</summary>
+        <member name="F:OpenMetaverse.Animations.STAND_1">
+            <summary>Agent standing</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.RESOURCE_DIR">
-            <summary>The relative directory where external resources are kept</summary>
+        <member name="F:OpenMetaverse.Animations.STAND_2">
+            <summary>Agent standing</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.LOGIN_SERVER">
-            <summary>Login server to connect to</summary>
+        <member name="F:OpenMetaverse.Animations.STAND_3">
+            <summary>Agent standing</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.BIND_ADDR">
-            <summary>IP Address the client will bind to</summary>
+        <member name="F:OpenMetaverse.Animations.STAND_4">
+            <summary>Agent standing</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.USE_LLSD_LOGIN">
-            <summary>Use XML-RPC Login or LLSD Login, default is XML-RPC Login</summary>
+        <member name="F:OpenMetaverse.Animations.STRETCH">
+            <summary>Agent stretching</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.TRANSFER_TIMEOUT">
-            <summary>Number of milliseconds before an asset transfer will time
-            out</summary>
+        <member name="F:OpenMetaverse.Animations.STRIDE">
+            <summary>Agent in stride (fast walk)</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.TELEPORT_TIMEOUT">
-            <summary>Number of milliseconds before a teleport attempt will time
-            out</summary>
+        <member name="F:OpenMetaverse.Animations.SURF">
+            <summary>Agent surfing</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.LOGOUT_TIMEOUT">
-            <summary>Number of milliseconds before NetworkManager.Logout() will
-            time out</summary>
+        <member name="F:OpenMetaverse.Animations.SURPRISE">
+            <summary>Agent acting surprised</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.CAPS_TIMEOUT">
-            <summary>Number of milliseconds before a CAPS call will time out</summary>
-            <remarks>Setting this too low will cause web requests time out and
-            possibly retry repeatedly</remarks>
+        <member name="F:OpenMetaverse.Animations.SWORD_STRIKE">
+            <summary>Agent striking with a sword</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.LOGIN_TIMEOUT">
-            <summary>Number of milliseconds for xml-rpc to timeout</summary>
+        <member name="F:OpenMetaverse.Animations.TALK">
+            <summary>Agent talking (lips moving)</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.RESEND_TIMEOUT">
-            <summary>Milliseconds before a packet is assumed lost and resent</summary>
+        <member name="F:OpenMetaverse.Animations.TANTRUM">
+            <summary>Agent throwing a tantrum</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.SIMULATOR_TIMEOUT">
-            <summary>Milliseconds without receiving a packet before the 
-            connection to a simulator is assumed lost</summary>
+        <member name="F:OpenMetaverse.Animations.THROW_R">
+            <summary>Agent throwing an object (right handed)</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.MAP_REQUEST_TIMEOUT">
-            <summary>Milliseconds to wait for a simulator info request through
-            the grid interface</summary>
+        <member name="F:OpenMetaverse.Animations.TRYON_SHIRT">
+            <summary>Agent trying on a shirt</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.MAX_PENDING_ACKS">
-            <summary>Maximum number of queued ACKs to be sent before SendAcks()
-            is forced</summary>
+        <member name="F:OpenMetaverse.Animations.TURNLEFT">
+            <summary>Agent turning to the left</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.STATS_QUEUE_SIZE">
-            <summary>Network stats queue length (seconds)</summary>
+        <member name="F:OpenMetaverse.Animations.TURNRIGHT">
+            <summary>Agent turning to the right</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.STORE_LAND_PATCHES">
-            <summary>Enable/disable storing terrain heightmaps in the 
-            TerrainManager</summary>
+        <member name="F:OpenMetaverse.Animations.TYPE">
+            <summary>Agent typing</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.SEND_AGENT_UPDATES">
-            <summary>Enable/disable sending periodic camera updates</summary>
+        <member name="F:OpenMetaverse.Animations.WALK">
+            <summary>Agent walking</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.SEND_AGENT_APPEARANCE">
-            <summary>Enable/disable automatically setting agent appearance at
-            login and after sim crossing</summary>
+        <member name="F:OpenMetaverse.Animations.WHISPER">
+            <summary>Agent whispering</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.SEND_AGENT_THROTTLE">
-            <summary>Enable/disable automatically setting the bandwidth throttle
-            after connecting to each simulator</summary>
-            <remarks>The default throttle uses the equivalent of the maximum
-            bandwidth setting in the official client. If you do not set a
-            throttle your connection will by default be throttled well below
-            the minimum values and you may experience connection problems</remarks>
+        <member name="F:OpenMetaverse.Animations.WHISTLE">
+            <summary>Agent whispering with fingers in mouth</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.SEND_PINGS">
-            <summary>Enable/disable the sending of pings to monitor lag and 
-            packet loss</summary>
+        <member name="F:OpenMetaverse.Animations.WINK">
+            <summary>Agent winking</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.MULTIPLE_SIMS">
-            <summary>Should we connect to multiple sims? This will allow
-            viewing in to neighboring simulators and sim crossings
-            (Experimental)</summary>
+        <member name="F:OpenMetaverse.Animations.WINK_HOLLYWOOD">
+            <summary>Agent winking</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.ALWAYS_DECODE_OBJECTS">
-            <summary>If true, all object update packets will be decoded in to
-            native objects. If false, only updates for our own agent will be
-            decoded. Registering an event handler will force objects for that
-            type to always be decoded. If this is disabled the object tracking
-            will have missing or partial prim and avatar information</summary>
+        <member name="F:OpenMetaverse.Animations.WORRY">
+            <summary>Agent worried</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.ALWAYS_REQUEST_OBJECTS">
-            <summary>If true, when a cached object check is received from the
-            server the full object info will automatically be requested</summary>
+        <member name="F:OpenMetaverse.Animations.YES">
+            <summary>Agent nodding yes</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.ENABLE_CAPS">
-            <summary>Whether to establish connections to HTTP capabilities
-            servers for simulators</summary>
+        <member name="F:OpenMetaverse.Animations.YES_HAPPY">
+            <summary>Agent nodding yes with happy face</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.ENABLE_SIMSTATS">
-            <summary>Whether to decode sim stats</summary>
+        <member name="F:OpenMetaverse.Animations.YOGA_FLOAT">
+            <summary>Agent floating with legs and arms crossed</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.LOG_ALL_CAPS_ERRORS">
-            <summary>The capabilities servers are currently designed to
-            periodically return a 502 error which signals for the client to
-            re-establish a connection. Set this to true to log those 502 errors</summary>
+        <member name="M:OpenMetaverse.Animations.ToDictionary">
+            <summary>
+            A dictionary containing all pre-defined animations
+            </summary>
+            <returns>A dictionary containing the pre-defined animations,
+            where the key is the animations ID, and the value is a string
+            containing a name to identify the purpose of the animation</returns>
         </member>
-        <member name="F:OpenMetaverse.Settings.FETCH_MISSING_INVENTORY">
-            <summary>If true, any reference received for a folder or item
-            the library is not aware of will automatically be fetched</summary>
+        <member name="T:OpenMetaverse.AvatarTextureIndex">
+            <summary>
+            Index of TextureEntry slots for avatar appearances
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.DISABLE_AGENT_UPDATE_DUPLICATE_CHECK">
-            <summary>If true, and <code>SEND_AGENT_UPDATES</code> is true,
-            AgentUpdate packets will continuously be sent out to give the bot
-            smoother movement and autopiloting</summary>
+        <member name="T:OpenMetaverse.BakeType">
+            <summary>
+            Bake layers for avatar appearance
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.AVATAR_TRACKING">
-            <summary>If true, currently visible avatars will be stored
-            in dictionaries inside <code>Simulator.ObjectAvatars</code>.
-            If false, a new Avatar or Primitive object will be created
-            each time an object update packet is received</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Default constructor
+            </summary>
+            <param name="client">A reference to our agent</param>
         </member>
-        <member name="F:OpenMetaverse.Settings.OBJECT_TRACKING">
-            <summary>If true, currently visible avatars will be stored
-            in dictionaries inside <code>Simulator.ObjectPrimitives</code>.
-            If false, a new Avatar or Primitive object will be created
-            each time an object update packet is received</summary>
+        <member name="T:OpenMetaverse.AppearanceManager.WearableData">
+            <summary>
+            Contains information about a wearable inventory item
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.USE_INTERPOLATION_TIMER">
-            <summary>If true, position and velocity will periodically be
-            interpolated (extrapolated, technically) for objects and 
-            avatars that are being tracked by the library. This is
-            necessary to increase the accuracy of speed and position
-            estimates for simulated objects</summary>
+        <member name="F:OpenMetaverse.AppearanceManager.WearableData.ItemID">
+            <summary>Inventory ItemID of the wearable</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.TRACK_UTILIZATION">
+        <member name="F:OpenMetaverse.AppearanceManager.WearableData.AssetID">
+            <summary>AssetID of the wearable asset</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.WearableData.WearableType">
+            <summary>WearableType of the wearable</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.WearableData.AssetType">
+            <summary>AssetType of the wearable</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.WearableData.Asset">
+            <summary>Asset data for the wearable</summary>
+        </member>
+        <member name="T:OpenMetaverse.AppearanceManager.ColorParamInfo">
             <summary>
-            If true, utilization statistics will be tracked. There is a minor penalty
-            in CPU time for enabling this option.
+            Data collected from visual params for each wearable
+            needed for the calculation of the color
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.PARCEL_TRACKING">
-            <summary>If true, parcel details will be stored in the 
-            <code>Simulator.Parcels</code> dictionary as they are received</summary>
+        <member name="T:OpenMetaverse.AppearanceManager.TextureData">
+            <summary>
+            Holds a texture assetID and the data needed to bake this layer into
+            an outfit texture. Used to keep track of currently worn textures
+            and baking data
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.ALWAYS_REQUEST_PARCEL_ACL">
+        <member name="F:OpenMetaverse.AppearanceManager.TextureData.TextureID">
+            <summary>A texture AssetID</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.TextureData.Texture">
+            <summary>Asset data for the texture</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.TextureData.AlphaMasks">
+            <summary>Collection of alpha masks that needs applying</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.TextureData.Color">
+            <summary>Tint that should be applied to the texture</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.TextureData.TextureIndex">
+            <summary>Where on avatar does this texture belong</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.MAX_CONCURRENT_DOWNLOADS">
+            <summary>Maximum number of concurrent downloads for wearable assets and textures</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.MAX_CONCURRENT_UPLOADS">
+            <summary>Maximum number of concurrent uploads for baked textures</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.INVENTORY_TIMEOUT">
+            <summary>Timeout for fetching inventory listings</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.WEARABLE_TIMEOUT">
+            <summary>Timeout for fetching a single wearable, or receiving a single packet response</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.TEXTURE_TIMEOUT">
+            <summary>Timeout for fetching a single texture</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.UPLOAD_TIMEOUT">
+            <summary>Timeout for uploading a single baked texture</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.UPLOAD_RETRIES">
+            <summary>Number of times to retry bake upload</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.REBAKE_DELAY">
+            <summary>When changing outfit, kick off rebake after
+            20 seconds has passed since the last change</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.WEARABLE_COUNT">
+            <summary>Total number of wearables for each avatar</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.BAKED_TEXTURE_COUNT">
+            <summary>Total number of baked textures on each avatar</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.WEARABLES_PER_LAYER">
+            <summary>Total number of wearables per bake layer</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.BakeIndexToTextureIndex">
+            <summary>Mapping between BakeType and AvatarTextureIndex</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.WEARABLE_BAKE_MAP">
+            <summary>Map of what wearables are included in each bake</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.BAKED_TEXTURE_HASH">
+            <summary>Magic values to finalize the cache check hashes for each
+            bake</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.DEFAULT_AVATAR_TEXTURE">
+            <summary>Default avatar texture, used to detect when a custom
+            texture is not set for a face</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.m_AgentWearablesReply">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.m_AgentWearablesLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.m_AgentCachedBakesReply">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.m_AgentCachedBakesLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.m_AppearanceSet">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.m_AppearanceSetLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.m_RebakeAvatarReply">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.m_RebakeAvatarLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.MyVisualParameters">
+            <summary>Visual parameters last sent to the sim</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.MyTextures">
+            <summary>Textures about this client sent to the sim</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.Wearables">
+            <summary>A cache of wearables currently being worn</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.Textures">
+            <summary>A cache of textures currently being worn</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.CacheCheckSerialNum">
+            <summary>Incrementing serial number for AgentCachedTexture packets</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.SetAppearanceSerialNum">
+            <summary>Incrementing serial number for AgentSetAppearance packets</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.AppearanceThreadRunning">
+            <summary>Indicates whether or not the appearance thread is currently
+            running, to prevent multiple appearance threads from running
+            simultaneously</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.Client">
+            <summary>Reference to our agent</summary>
+        </member>
+        <member name="F:OpenMetaverse.AppearanceManager.RebakeScheduleTimer">
             <summary>
-            If true, an incoming parcel properties reply will automatically send
-            a request for the parcel access list
+            Timer used for delaying rebake on changing outfit
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.ALWAYS_REQUEST_PARCEL_DWELL">
+        <member name="F:OpenMetaverse.AppearanceManager.AppearanceThread">
             <summary>
-            if true, an incoming parcel properties reply will automatically send 
-            a request for the traffic count.
+            Main appearance thread
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.USE_ASSET_CACHE">
+        <member name="E:OpenMetaverse.AppearanceManager.AgentWearablesReply">
+            <summary>Triggered when an AgentWearablesUpdate packet is received,
+            telling us what our avatar is currently wearing
+            <see cref="M:OpenMetaverse.AppearanceManager.RequestAgentWearables" /> request.</summary>
+        </member>
+        <member name="E:OpenMetaverse.AppearanceManager.CachedBakesReply">
+            <summary>Raised when an AgentCachedTextureResponse packet is
+            received, giving a list of cached bakes that were found on the
+            simulator
+            <seealso cref="M:OpenMetaverse.AppearanceManager.RequestCachedBakes" /> request.</summary>
+        </member>
+        <member name="E:OpenMetaverse.AppearanceManager.AppearanceSet">
             <summary>
-            If true, images, and other assets downloaded from the server 
-            will be cached in a local directory
+            Raised when appearance data is sent to the simulator, also indicates
+            the main appearance thread is finished.
+            </summary>
+            <seealso cref="M:OpenMetaverse.AppearanceManager.RequestAgentSetAppearance" /> request.</member>
+        <member name="E:OpenMetaverse.AppearanceManager.RebakeAvatarRequested">
+            <summary>
+            Triggered when the simulator requests the agent rebake its appearance.
             </summary>
+            <seealso cref="!:RebakeAvatarRequest" />
         </member>
-        <member name="F:OpenMetaverse.Settings.ASSET_CACHE_DIR">
-            <summary>Path to store cached texture data</summary>
+        <member name="P:OpenMetaverse.AppearanceManager.ManagerBusy">
+            <summary>
+            Returns true if AppearanceManager is busy and trying to set or change appearance will fail
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.ASSET_CACHE_MAX_SIZE">
-            <summary>Maximum size cached files are allowed to take on disk (bytes)</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.OnAgentWearables(OpenMetaverse.AgentWearablesReplyEventArgs)">
+            <summary>Raises the AgentWearablesReply event</summary>
+            <param name="e">An AgentWearablesReplyEventArgs object containing the
+            data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.Settings.DEFAULT_EFFECT_COLOR">
-            <summary>Default color used for viewer particle effects</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.OnAgentCachedBakes(OpenMetaverse.AgentCachedBakesReplyEventArgs)">
+            <summary>Raises the CachedBakesReply event</summary>
+            <param name="e">An AgentCachedBakesReplyEventArgs object containing the
+            data returned from the data server AgentCachedTextureResponse</param>
         </member>
-        <member name="F:OpenMetaverse.Settings.MAX_RESEND_COUNT">
-            <summary>Maximum number of times to resend a failed packet</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.OnAppearanceSet(OpenMetaverse.AppearanceSetEventArgs)">
+            <summary>Raises the AppearanceSet event</summary>
+            <param name="e">An AppearanceSetEventArgs object indicating if the operatin was successfull</param>
         </member>
-        <member name="F:OpenMetaverse.Settings.THROTTLE_OUTGOING_PACKETS">
-            <summary>Throttle outgoing packet rate</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.OnRebakeAvatar(OpenMetaverse.RebakeAvatarTexturesEventArgs)">
+            <summary>Raises the RebakeAvatarRequested event</summary>
+            <param name="e">An RebakeAvatarTexturesEventArgs object containing the
+            data returned from the data server</param>
         </member>
-        <member name="F:OpenMetaverse.Settings.CLIENT_IDENTIFICATION_TAG">
-            <summary>UUID of a texture used by some viewers to indentify type of client used</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.SetPreviousAppearance">
+            <summary>
+            Obsolete method for setting appearance. This function no longer does anything.
+            Use RequestSetAppearance() to manually start the appearance thread
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.USE_HTTP_TEXTURES">
+        <member name="M:OpenMetaverse.AppearanceManager.SetPreviousAppearance(System.Boolean)">
             <summary>
-            Download textures using GetTexture capability when available
+            Obsolete method for setting appearance. This function no longer does anything.
+            Use RequestSetAppearance() to manually start the appearance thread
             </summary>
+            <param name="allowBake">Unused parameter</param>
         </member>
-        <member name="F:OpenMetaverse.Settings.MAX_CONCURRENT_TEXTURE_DOWNLOADS">
-            <summary>The maximum number of concurrent texture downloads allowed</summary>
-            <remarks>Increasing this number will not necessarily increase texture retrieval times due to
-            simulator throttles</remarks>
+        <member name="M:OpenMetaverse.AppearanceManager.RequestSetAppearance">
+            <summary>
+            Starts the appearance setting thread
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.PIPELINE_REFRESH_INTERVAL">
+        <member name="M:OpenMetaverse.AppearanceManager.RequestSetAppearance(System.Boolean)">
             <summary>
-            The Refresh timer inteval is used to set the delay between checks for stalled texture downloads
+            Starts the appearance setting thread
             </summary>
-            <remarks>This is a static variable which applies to all instances</remarks>
+            <param name="forceRebake">True to force rebaking, otherwise false</param>
         </member>
-        <member name="F:OpenMetaverse.Settings.PIPELINE_REQUEST_TIMEOUT">
+        <member name="M:OpenMetaverse.AppearanceManager.RequestAgentWearables">
             <summary>
-            Textures taking longer than this value will be flagged as timed out and removed from the pipeline
+            Ask the server what textures our agent is currently wearing
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.LOG_LEVEL">
+        <member name="M:OpenMetaverse.AppearanceManager.RequestCachedBakes">
             <summary>
-            Get or set the minimum log level to output to the console by default
-            
-            If the library is not compiled with DEBUG defined and this level is set to DEBUG
-            You will get no output on the console. This behavior can be overriden by creating
-            a logger configuration file for log4net
+            Build hashes out of the texture assetIDs for each baking layer to
+            ask the simulator whether it has cached copies of each baked texture
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.LOG_NAMES">
-            <summary>Attach avatar names to log messages</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.GetWearableAsset(OpenMetaverse.WearableType)">
+            <summary>
+            Returns the AssetID of the asset that is currently being worn in a
+            given WearableType slot
+            </summary>
+            <param name="type">WearableType slot to get the AssetID for</param>
+            <returns>The UUID of the asset being worn in the given slot, or
+            UUID.Zero if no wearable is attached to the given slot or wearables
+            have not been downloaded yet</returns>
         </member>
-        <member name="F:OpenMetaverse.Settings.LOG_RESENDS">
-            <summary>Log packet retransmission info</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.AddToOutfit(OpenMetaverse.InventoryItem)">
+            <summary>
+            Add a wearable to the current outfit and set appearance
+            </summary>
+            <param name="wearableItem">Wearable to be added to the outfit</param>
         </member>
-        <member name="M:OpenMetaverse.Settings.#ctor(OpenMetaverse.GridClient)">
-            <summary>Constructor</summary>
-            <param name="client">Reference to a GridClient object</param>
+        <member name="M:OpenMetaverse.AppearanceManager.AddToOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryItem})">
+            <summary>
+            Add a list of wearables to the current outfit and set appearance
+            </summary>
+            <param name="wearableItems">List of wearable inventory items to
+            be added to the outfit</param>
         </member>
-        <member name="M:OpenMetaverse.Settings.EconomyDataHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.AppearanceManager.RemoveFromOutfit(OpenMetaverse.InventoryItem)">
+            <summary>
+            Remove a wearable from the current outfit and set appearance
+            </summary>
+            <param name="wearableItem">Wearable to be removed from the outfit</param>
         </member>
-        <member name="P:OpenMetaverse.Settings.UPLOAD_COST">
-            <summary>Cost of uploading an asset</summary>
-            <remarks>Read-only since this value is dynamically fetched at login</remarks>
+        <member name="M:OpenMetaverse.AppearanceManager.RemoveFromOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryItem})">
+            <summary>
+            Removes a list of wearables from the current outfit and set appearance
+            </summary>
+            <param name="wearableItems">List of wearable inventory items to
+            be removed from the outfit</param>
         </member>
-        <member name="T:OpenMetaverse.NetworkManager">
+        <member name="M:OpenMetaverse.AppearanceManager.ReplaceOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryItem})">
             <summary>
-            NetworkManager is responsible for managing the network layer of 
-            OpenMetaverse. It tracks all the server connections, serializes 
-            outgoing traffic and deserializes incoming traffic, and provides
-            instances of delegates for network-related events.
+            Replace the current outfit with a list of wearables and set appearance
             </summary>
+            <param name="wearableItems">List of wearable inventory items that
+            define a new outfit</param>
+        </member>
+        <member name="M:OpenMetaverse.AppearanceManager.ReplaceOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryItem},System.Boolean)">
             <summary>
-            Login Routines
+            Replace the current outfit with a list of wearables and set appearance
             </summary>
+            <param name="wearableItems">List of wearable inventory items that
+            define a new outfit</param>
+            <param name="safe">Check if we have all body parts, set this to false only
+            if you know what you're doing</param>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_PacketSent">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.IsItemWorn(OpenMetaverse.InventoryItem)">
+            <summary>
+            Checks if an inventory item is currently being worn
+            </summary>
+            <param name="item">The inventory item to check against the agent
+            wearables</param>
+            <returns>The WearableType slot that the item is being worn in,
+            or WearbleType.Invalid if it is not currently being worn</returns>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnPacketSent(OpenMetaverse.PacketSentEventArgs)">
-            <summary>Raises the PacketSent Event</summary>
-             <param name="e">A PacketSentEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="M:OpenMetaverse.AppearanceManager.GetWearables">
+            <summary>
+            Returns a copy of the agents currently worn wearables
+            </summary>
+            <returns>A copy of the agents currently worn wearables</returns>
+            <remarks>Avoid calling this function multiple times as it will make
+            a copy of all of the wearable data each time</remarks>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_PacketSentLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.WearOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryBase},System.Boolean)">
+            <summary>
+            Calls either <seealso cref="M:OpenMetaverse.AppearanceManager.ReplaceOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryWearable})" /> or
+            <seealso cref="M:OpenMetaverse.AppearanceManager.AddToOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryItem})" /> depending on the value of
+            replaceItems
+            </summary>
+            <param name="wearables">List of wearable inventory items to add
+            to the outfit or become a new outfit</param>
+            <param name="replaceItems">True to replace existing items with the
+            new list of items, false to add these items to the existing outfit</param>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_LoggedOut">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.AddAttachments(System.Collections.Generic.List{OpenMetaverse.InventoryItem},System.Boolean)">
+            <summary>
+            Adds a list of attachments to our agent
+            </summary>
+            <param name="attachments">A List containing the attachments to add</param>
+            <param name="removeExistingFirst">If true, tells simulator to remove existing attachment
+            first</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnLoggedOut(OpenMetaverse.LoggedOutEventArgs)">
-            <summary>Raises the LoggedOut Event</summary>
-             <param name="e">A LoggedOutEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="M:OpenMetaverse.AppearanceManager.Attach(OpenMetaverse.InventoryItem,OpenMetaverse.AttachmentPoint)">
+            <summary>
+            Attach an item to our agent at a specific attach point
+            </summary>
+            <param name="item">A <seealso cref="T:OpenMetaverse.InventoryItem" /> to attach</param>
+            <param name="attachPoint">the <seealso cref="T:OpenMetaverse.AttachmentPoint" /> on the avatar
+            to attach the item to</param>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_LoggedOutLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.Attach(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.Permissions,System.UInt32,OpenMetaverse.AttachmentPoint)">
+            <summary>
+            Attach an item to our agent specifying attachment details
+            </summary>
+            <param name="itemID">The <seealso cref="T:OpenMetaverse.UUID" /> of the item to attach</param>
+            <param name="ownerID">The <seealso cref="T:OpenMetaverse.UUID" /> attachments owner</param>
+            <param name="name">The name of the attachment</param>
+            <param name="description">The description of the attahment</param>
+            <param name="perms">The <seealso cref="T:OpenMetaverse.Permissions" /> to apply when attached</param>
+            <param name="itemFlags">The <seealso cref="T:OpenMetaverse.InventoryItemFlags" /> of the attachment</param>
+            <param name="attachPoint">The <seealso cref="T:OpenMetaverse.AttachmentPoint" /> on the agent
+            to attach the item to</param>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimConnecting">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.Detach(OpenMetaverse.InventoryItem)">
+            <summary>
+            Detach an item from our agent using an <seealso cref="T:OpenMetaverse.InventoryItem" /> object
+            </summary>
+            <param name="item">An <seealso cref="T:OpenMetaverse.InventoryItem" /> object</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnSimConnecting(OpenMetaverse.SimConnectingEventArgs)">
-            <summary>Raises the SimConnecting Event</summary>
-             <param name="e">A SimConnectingEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="M:OpenMetaverse.AppearanceManager.Detach(OpenMetaverse.UUID)">
+            <summary>
+            Detach an item from our agent
+            </summary>
+            <param name="itemID">The inventory itemID of the item to detach</param>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimConnectingLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.SendAgentIsNowWearing">
+            <summary>
+            Inform the sim which wearables are part of our current outfit
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimConnected">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.ReplaceOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryWearable})">
+            <summary>
+            Replaces the Wearables collection with a list of new wearable items
+            </summary>
+            <param name="wearableItems">Wearable items to replace the Wearables collection with</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnSimConnected(OpenMetaverse.SimConnectedEventArgs)">
-            <summary>Raises the SimConnected Event</summary>
-             <param name="e">A SimConnectedEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="M:OpenMetaverse.AppearanceManager.GetColorFromParams(System.Collections.Generic.List{OpenMetaverse.AppearanceManager.ColorParamInfo})">
+            <summary>
+            Calculates base color/tint for a specific wearable
+            based on its params
+            </summary>
+            <param name="param">All the color info gathered from wearable's VisualParams
+            passed as list of ColorParamInfo tuples</param>
+            <returns>Base color/tint for the wearable</returns>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimConnectedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.GetAgentWearables">
+            <summary>
+            Blocking method to populate the Wearables dictionary
+            </summary>
+            <returns>True on success, otherwise false</returns>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimDisconnected">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.GetCachedBakes">
+            <summary>
+            Blocking method to populate the Textures array with cached bakes
+            </summary>
+            <returns>True on success, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnSimDisconnected(OpenMetaverse.SimDisconnectedEventArgs)">
-            <summary>Raises the SimDisconnected Event</summary>
-             <param name="e">A SimDisconnectedEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="M:OpenMetaverse.AppearanceManager.DecodeWearableParams(OpenMetaverse.AppearanceManager.WearableData)">
+            <summary>
+            Populates textures and visual params from a decoded asset
+            </summary>
+            <param name="wearable">Wearable to decode</param>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimDisconnectedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.DownloadWearables">
+            <summary>
+            Blocking method to download and parse currently worn wearable assets
+            </summary>
+            <returns>True on success, otherwise false</returns>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_Disconnected">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="M:OpenMetaverse.AppearanceManager.GetTextureDownloadList(OpenMetaverse.BakeType)">
+            <summary>
+            Get a list of all of the textures that need to be downloaded for a
+            single bake layer
+            </summary>
+            <param name="bakeType">Bake layer to get texture AssetIDs for</param>
+            <returns>A list of texture AssetIDs to download</returns>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnDisconnected(OpenMetaverse.DisconnectedEventArgs)">
-            <summary>Raises the Disconnected Event</summary>
-             <param name="e">A DisconnectedEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="M:OpenMetaverse.AppearanceManager.AddTextureDownload(OpenMetaverse.AvatarTextureIndex,System.Collections.Generic.List{OpenMetaverse.UUID})">
+            <summary>
+            Helper method to lookup the TextureID for a single layer and add it
+            to a list if it is not already present
+            </summary>
+            <param name="index">
+            </param>
+            <param name="textures">
+            </param>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_DisconnectedLock">
+        <member name="M:OpenMetaverse.AppearanceManager.DownloadTextures(System.Collections.Generic.List{OpenMetaverse.BakeType})">
+            <summary>
+            Blocking method to download all of the textures needed for baking
+            the given bake layers
+            </summary>
+            <param name="bakeLayers">A list of layers that need baking</param>
+            <remarks>No return value is given because the baking will happen
+            whether or not all textures are successfully downloaded</remarks>
+        </member>
+        <member name="M:OpenMetaverse.AppearanceManager.CreateBakes">
+            <summary>
+            Blocking method to create and upload baked textures for all of the
+            missing bakes
+            </summary>
+            <returns>True on success, otherwise false</returns>
+        </member>
+        <member name="M:OpenMetaverse.AppearanceManager.CreateBake(OpenMetaverse.BakeType)">
+            <summary>
+            Blocking method to create and upload a baked texture for a single
+            bake layer
+            </summary>
+            <param name="bakeType">Layer to bake</param>
+            <returns>True on success, otherwise false</returns>
+        </member>
+        <member name="M:OpenMetaverse.AppearanceManager.UploadBake(System.Byte[])">
+            <summary>
+            Blocking method to upload a baked texture
+            </summary>
+            <param name="textureData">Five channel JPEG2000 texture data to upload</param>
+            <returns>UUID of the newly created asset on success, otherwise UUID.Zero</returns>
+        </member>
+        <member name="M:OpenMetaverse.AppearanceManager.MakeParamValues">
+            <summary>
+            Creates a dictionary of visual param values from the downloaded wearables
+            </summary>
+            <returns>A dictionary of visual param indices mapping to visual param
+            values for our agent that can be fed to the Baker class</returns>
+        </member>
+        <member name="M:OpenMetaverse.AppearanceManager.RequestAgentSetAppearance">
+            <summary>
+            Create an AgentSetAppearance packet from Wearables data and the
+            Textures array and send it
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.AppearanceManager.WearableTypeToAssetType(OpenMetaverse.WearableType)">
+            <summary>
+            Converts a WearableType to a bodypart or clothing WearableType
+            </summary>
+            <param name="type">A WearableType</param>
+            <returns>AssetType.Bodypart or AssetType.Clothing or AssetType.Unknown</returns>
+        </member>
+        <member name="M:OpenMetaverse.AppearanceManager.BakeTypeToAgentTextureIndex(OpenMetaverse.BakeType)">
+            <summary>
+            Converts a BakeType to the corresponding baked texture slot in AvatarTextureIndex
+            </summary>
+            <param name="index">A BakeType</param>
+            <returns>The AvatarTextureIndex slot that holds the given BakeType</returns>
+        </member>
+        <member name="M:OpenMetaverse.AppearanceManager.MorphLayerForBakeType(OpenMetaverse.BakeType)">
+            <summary>
+            Gives the layer number that is used for morph mask
+            </summary>
+            <param name="bakeType">&gt;A BakeType</param>
+            <returns>Which layer number as defined in BakeTypeToTextures is used for morph mask</returns>
+        </member>
+        <member name="M:OpenMetaverse.AppearanceManager.BakeTypeToTextures(OpenMetaverse.BakeType)">
+            <summary>
+            Converts a BakeType to a list of the texture slots that make up that bake
+            </summary>
+            <param name="bakeType">A BakeType</param>
+            <returns>A list of texture slots that are inputs for the given bake</returns>
+        </member>
+        <member name="T:OpenMetaverse.AgentWearablesReplyEventArgs">
+            <summary>Contains the Event data returned from the data server from an AgentWearablesRequest</summary>
+        </member>
+        <member name="M:OpenMetaverse.AgentWearablesReplyEventArgs.#ctor">
+            <summary>Construct a new instance of the AgentWearablesReplyEventArgs class</summary>
+        </member>
+        <member name="T:OpenMetaverse.AgentCachedBakesReplyEventArgs">
+            <summary>Contains the Event data returned from the data server from an AgentCachedTextureResponse</summary>
+        </member>
+        <member name="M:OpenMetaverse.AgentCachedBakesReplyEventArgs.#ctor">
+            <summary>Construct a new instance of the AgentCachedBakesReplyEventArgs class</summary>
+        </member>
+        <member name="T:OpenMetaverse.AppearanceSetEventArgs">
+            <summary>Contains the Event data returned from an AppearanceSetRequest</summary>
+        </member>
+        <member name="M:OpenMetaverse.AppearanceSetEventArgs.#ctor(System.Boolean)">
+            <summary>
+            Triggered when appearance data is sent to the sim and
+            the main appearance thread is done.</summary>
+            <param name="success">Indicates whether appearance setting was successful</param>
+        </member>
+        <member name="P:OpenMetaverse.AppearanceSetEventArgs.Success">
+            <summary>Indicates whether appearance setting was successful</summary>
+        </member>
+        <member name="T:OpenMetaverse.RebakeAvatarTexturesEventArgs">
+            <summary>Contains the Event data returned from the data server from an RebakeAvatarTextures</summary>
+        </member>
+        <member name="M:OpenMetaverse.RebakeAvatarTexturesEventArgs.#ctor(OpenMetaverse.UUID)">
+            <summary>
+            Triggered when the simulator sends a request for this agent to rebake
+            its appearance
+            </summary>
+            <param name="textureID">The ID of the Texture Layer to bake</param>
+        </member>
+        <member name="P:OpenMetaverse.RebakeAvatarTexturesEventArgs.TextureID">
+            <summary>The ID of the Texture Layer to bake</summary>
+        </member>
+        <member name="T:OpenMetaverse.AssetCache">
+            <summary>
+            Class that handles the local asset cache
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.AssetCache.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Default constructor
+            </summary>
+            <param name="client">A reference to the GridClient object</param>
+        </member>
+        <member name="T:OpenMetaverse.AssetCache.SortFilesByAccesTimeHelper">
+            <summary>
+            Helper class for sorting files by their last accessed time
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.AssetCache.AutoPruneEnabled">
+            <summary>
+            Allows setting weather to periodicale prune the cache if it grows too big
+            Default is enabled, when caching is enabled
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.AssetCache.AutoPruneInterval">
+            <summary>
+            How long (in ms) between cache checks (default is 5 min.)
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.AssetCache.DestroyTimer">
+            <summary>
+            Disposes cleanup timer
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.AssetCache.SetupTimer">
+            <summary>
+            Only create timer when needed
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.AssetCache.GetCachedAssetBytes(OpenMetaverse.UUID)">
+            <summary>
+            Return bytes read from the local asset cache, null if it does not exist
+            </summary>
+            <param name="assetID">UUID of the asset we want to get</param>
+            <returns>Raw bytes of the asset, or null on failure</returns>
+        </member>
+        <member name="M:OpenMetaverse.AssetCache.GetCachedImage(OpenMetaverse.UUID)">
+            <summary>
+            Returns ImageDownload object of the
+            image from the local image cache, null if it does not exist
+            </summary>
+            <param name="imageID">UUID of the image we want to get</param>
+            <returns>ImageDownload object containing the image, or null on failure</returns>
+        </member>
+        <member name="M:OpenMetaverse.AssetCache.FileName(OpenMetaverse.UUID)">
+            <summary>
+            Constructs a file name of the cached asset
+            </summary>
+            <param name="assetID">UUID of the asset</param>
+            <returns>String with the file name of the cahced asset</returns>
+        </member>
+        <member name="M:OpenMetaverse.AssetCache.StaticFileName(OpenMetaverse.UUID)">
+            <summary>
+            Constructs a file name of the static cached asset
+            </summary>
+            <param name="assetID">UUID of the asset</param>
+            <returns>String with the file name of the static cached asset</returns>
+        </member>
+        <member name="M:OpenMetaverse.AssetCache.SaveAssetToCache(OpenMetaverse.UUID,System.Byte[])">
+            <summary>
+            Saves an asset to the local cache
+            </summary>
+            <param name="assetID">UUID of the asset</param>
+            <param name="assetData">Raw bytes the asset consists of</param>
+            <returns>Weather the operation was successfull</returns>
+        </member>
+        <member name="M:OpenMetaverse.AssetCache.AssetFileName(OpenMetaverse.UUID)">
+            <summary>
+            Get the file name of the asset stored with gived UUID
+            </summary>
+            <param name="assetID">UUID of the asset</param>
+            <returns>Null if we don't have that UUID cached on disk, file name if found in the cache folder</returns>
+        </member>
+        <member name="M:OpenMetaverse.AssetCache.HasAsset(OpenMetaverse.UUID)">
+            <summary>
+            Checks if the asset exists in the local cache
+            </summary>
+            <param name="assetID">UUID of the asset</param>
+            <returns>True is the asset is stored in the cache, otherwise false</returns>
+        </member>
+        <member name="M:OpenMetaverse.AssetCache.Clear">
+            <summary>
+            Wipes out entire cache
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.AssetCache.Prune">
+            <summary>
+            Brings cache size to the 90% of the max size
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.AssetCache.BeginPrune">
+            <summary>
+            Asynchronously brings cache size to the 90% of the max size
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.AssetCache.GetFileSize(System.IO.FileInfo[])">
+            <summary>
+            Adds up file sizes passes in a FileInfo array
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.AssetCache.Operational">
+            <summary>
+            Checks whether caching is enabled
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.AssetCache.cleanerTimer_Elapsed(System.Object,System.Timers.ElapsedEventArgs)">
+            <summary>
+            Periodically prune the cache
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.AssetCache.NiceFileSize(System.Int64)">
+            <summary>
+            Nicely formats file sizes
+            </summary>
+            <param name="byteCount">Byte size we want to output</param>
+            <returns>String with humanly readable file size</returns>
+        </member>
+        <member name="T:OpenMetaverse.StatusCode">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.StatusCode.OK">
+            <summary>OK</summary>
+        </member>
+        <member name="F:OpenMetaverse.StatusCode.Done">
+            <summary>Transfer completed</summary>
+        </member>
+        <member name="F:OpenMetaverse.StatusCode.Skip">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.StatusCode.Abort">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.StatusCode.Error">
+            <summary>Unknown error occurred</summary>
+        </member>
+        <member name="F:OpenMetaverse.StatusCode.UnknownSource">
+            <summary>Equivalent to a 404 error</summary>
+        </member>
+        <member name="F:OpenMetaverse.StatusCode.InsufficientPermissions">
+            <summary>Client does not have permission for that resource</summary>
+        </member>
+        <member name="F:OpenMetaverse.StatusCode.Unknown">
+            <summary>Unknown status</summary>
+        </member>
+        <member name="T:OpenMetaverse.ChannelType">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ChannelType.Unknown">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ChannelType.Misc">
+            <summary>Unknown</summary>
+        </member>
+        <member name="F:OpenMetaverse.ChannelType.Asset">
+            <summary>Virtually all asset transfers use this channel</summary>
+        </member>
+        <member name="T:OpenMetaverse.SourceType">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.SourceType.Unknown">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.SourceType.Asset">
+            <summary>Asset from the asset server</summary>
+        </member>
+        <member name="F:OpenMetaverse.SourceType.SimInventoryItem">
+            <summary>Inventory item</summary>
+        </member>
+        <member name="F:OpenMetaverse.SourceType.SimEstate">
+            <summary>Estate asset, such as an estate covenant</summary>
+        </member>
+        <member name="T:OpenMetaverse.TargetType">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.TargetType.Unknown">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.TargetType.File">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.TargetType.VFile">
+            <summary>
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.ImageType">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ImageType.Normal">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ImageType.Baked">
+            <summary>
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.ImageCodec">
+            <summary>
+            Image file format
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.Transfer">
+            <summary>
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.Transfer.TimeSinceLastPacket">
+            <summary>Number of milliseconds passed since the last transfer
+            packet was received</summary>
+        </member>
+        <member name="T:OpenMetaverse.AssetDownload">
+            <summary>
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.XferDownload">
+            <summary>
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.ImageDownload">
+            <summary>
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.AssetUpload">
+            <summary>
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.ImageRequest">
+            <summary>
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.ImageRequest.#ctor(OpenMetaverse.UUID,OpenMetaverse.ImageType,System.Single,System.Int32)">
+            <summary>
+            </summary>
+            <param name="imageid">
+            </param>
+            <param name="type">
+            </param>
+            <param name="priority">
+            </param>
+            <param name="discardLevel">
+            </param>
+        </member>
+        <member name="T:OpenMetaverse.AssetManager">
+            <summary>
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.AssetManager.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Default constructor
+            </summary>
+            <param name="client">A reference to the GridClient object</param>
+        </member>
+        <member name="T:OpenMetaverse.AssetManager.AssetReceivedCallback">
+            <summary>
+            Callback used for various asset download requests
+            </summary>
+            <param name="transfer">Transfer information</param>
+            <param name="asset">Downloaded asset, null on fail</param>
+        </member>
+        <member name="T:OpenMetaverse.AssetManager.BakedTextureUploadedCallback">
+            <summary>
+            Callback used upon competition of baked texture upload
+            </summary>
+            <param name="newAssetID">Asset UUID of the newly uploaded baked texture</param>
+        </member>
+        <member name="T:OpenMetaverse.AssetManager.MeshDownloadCallback">
+            <summary>
+            A callback that fires upon the completition of the RequestMesh call
+            </summary>
+            <param name="success">Was the download successfull</param>
+            <param name="assetMesh">Resulting mesh or null on problems</param>
+        </member>
+        <member name="F:OpenMetaverse.AssetManager.TRANSFER_HEADER_TIMEOUT">
+            <summary>Number of milliseconds to wait for a transfer header packet if out of order data was received</summary>
+        </member>
+        <member name="F:OpenMetaverse.AssetManager.m_XferReceivedEvent">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.AssetManager.m_XferReceivedLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimChanged">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.AssetManager.m_AssetUploadedEvent">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnSimChanged(OpenMetaverse.SimChangedEventArgs)">
-            <summary>Raises the SimChanged Event</summary>
-             <param name="e">A SimChangedEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.AssetManager.m_AssetUploadedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimChangedLock">
+        <member name="F:OpenMetaverse.AssetManager.m_UploadProgressEvent">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.AssetManager.m_UploadProgressLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_EventQueueRunning">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.AssetManager.m_InitiateDownloadEvent">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnEventQueueRunning(OpenMetaverse.EventQueueRunningEventArgs)">
-            <summary>Raises the EventQueueRunning Event</summary>
-             <param name="e">A EventQueueRunningEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.AssetManager.m_InitiateDownloadLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_EventQueueRunningLock">
+        <member name="F:OpenMetaverse.AssetManager.m_ImageReceiveProgressEvent">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.AssetManager.m_ImageReceiveProgressLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.Simulators">
-            <summary>All of the simulators we are currently connected to</summary>
+        <member name="F:OpenMetaverse.AssetManager.Cache">
+            <summary>Texture download cache</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.CapsEvents">
-            <summary>Handlers for incoming capability events</summary>
+        <member name="E:OpenMetaverse.AssetManager.XferReceived">
+            <summary>Raised when the simulator responds sends </summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.PacketEvents">
-            <summary>Handlers for incoming packets</summary>
+        <member name="E:OpenMetaverse.AssetManager.AssetUploaded">
+            <summary>Raised during upload completes</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.PacketInbox">
-            <summary>Incoming packets that are awaiting handling</summary>
+        <member name="E:OpenMetaverse.AssetManager.UploadProgress">
+            <summary>Raised during upload with progres update</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.PacketOutbox">
-            <summary>Outgoing packets that are awaiting handling</summary>
+        <member name="E:OpenMetaverse.AssetManager.InitiateDownload">
+            <summary>Fired when the simulator sends an InitiateDownloadPacket, used to download terrain .raw files</summary>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="E:OpenMetaverse.AssetManager.ImageReceiveProgress">
+            <summary>Fired when a texture is in the process of being downloaded by the TexturePipeline class</summary>
+        </member>
+        <member name="M:OpenMetaverse.AssetManager.OnXferReceived(OpenMetaverse.XferReceivedEventArgs)">
+            <summary>Raises the XferReceived event</summary>
+            <param name="e">A XferReceivedEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.AssetManager.OnAssetUploaded(OpenMetaverse.AssetUploadEventArgs)">
+            <summary>Raises the AssetUploaded event</summary>
+            <param name="e">A AssetUploadedEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.AssetManager.OnUploadProgress(OpenMetaverse.AssetUploadEventArgs)">
+            <summary>Raises the UploadProgress event</summary>
+            <param name="e">A UploadProgressEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.AssetManager.OnInitiateDownload(OpenMetaverse.InitiateDownloadEventArgs)">
+            <summary>Raises the InitiateDownload event</summary>
+            <param name="e">A InitiateDownloadEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.AssetManager.OnImageReceiveProgress(OpenMetaverse.ImageReceiveProgressEventArgs)">
+            <summary>Raises the ImageReceiveProgress event</summary>
+            <param name="e">A ImageReceiveProgressEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.AssetManager.RequestAsset(OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.AssetManager.AssetReceivedCallback)">
             <summary>
-            Default constructor
+            Request an asset download
             </summary>
-            <param name="client">Reference to the GridClient object</param>
+            <param name="assetID">Asset UUID</param>
+            <param name="type">Asset type, must be correct for the transfer to succeed</param>
+            <param name="priority">Whether to give this transfer an elevated priority</param>
+            <param name="callback">The callback to fire when the simulator responds with the asset data</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.RegisterCallback(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs})">
+        <member name="M:OpenMetaverse.AssetManager.RequestAsset(OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.SourceType,OpenMetaverse.AssetManager.AssetReceivedCallback)">
             <summary>
-            Register an event handler for a packet. This is a low level event
-            interface and should only be used if you are doing something not
-            supported in the library
+            Request an asset download
             </summary>
-            <param name="type">Packet type to trigger events for</param>
-            <param name="callback">Callback to fire when a packet of this type
-            is received</param>
+            <param name="assetID">Asset UUID</param>
+            <param name="type">Asset type, must be correct for the transfer to succeed</param>
+            <param name="priority">Whether to give this transfer an elevated priority</param>
+            <param name="sourceType">Source location of the requested asset</param>
+            <param name="callback">The callback to fire when the simulator responds with the asset data</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.RegisterCallback(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs},System.Boolean)">
+        <member name="M:OpenMetaverse.AssetManager.RequestAsset(OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.SourceType,OpenMetaverse.UUID,OpenMetaverse.AssetManager.AssetReceivedCallback)">
             <summary>
-            Register an event handler for a packet. This is a low level event
-            interface and should only be used if you are doing something not
-            supported in the library
+            Request an asset download
             </summary>
-            <param name="type">Packet type to trigger events for</param>
-            <param name="callback">Callback to fire when a packet of this type
-            is received</param>
-            <param name="isAsync">True if the callback should be ran 
-            asynchronously. Only set this to false (synchronous for callbacks 
-            that will always complete quickly)</param>
-            <remarks>If any callback for a packet type is marked as 
-            asynchronous, all callbacks for that packet type will be fired
-            asynchronously</remarks>
+            <param name="assetID">Asset UUID</param>
+            <param name="type">Asset type, must be correct for the transfer to succeed</param>
+            <param name="priority">Whether to give this transfer an elevated priority</param>
+            <param name="sourceType">Source location of the requested asset</param>
+            <param name="transactionID">UUID of the transaction</param>
+            <param name="callback">The callback to fire when the simulator responds with the asset data</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.UnregisterCallback(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs})">
+        <member name="M:OpenMetaverse.AssetManager.RequestAssetXfer(System.String,System.Boolean,System.Boolean,OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean)">
             <summary>
-            Unregister an event handler for a packet. This is a low level event
-            interface and should only be used if you are doing something not 
-            supported in the library
+            Request an asset download through the almost deprecated Xfer system
             </summary>
-            <param name="type">Packet type this callback is registered with</param>
-            <param name="callback">Callback to stop firing events for</param>
+            <param name="filename">Filename of the asset to request</param>
+            <param name="deleteOnCompletion">Whether or not to delete the asset
+            off the server after it is retrieved</param>
+            <param name="useBigPackets">Use large transfer packets or not</param>
+            <param name="vFileID">UUID of the file to request, if filename is
+            left empty</param>
+            <param name="vFileType">Asset type of <code>vFileID</code>, or
+            <code>AssetType.Unknown</code> if filename is not empty</param>
+            <param name="fromCache">Sets the FilePath in the request to Cache
+            (4) if true, otherwise Unknown (0) is used</param>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.RegisterEventCallback(System.String,OpenMetaverse.Caps.EventQueueCallback)">
+        <member name="M:OpenMetaverse.AssetManager.RequestInventoryAsset(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.AssetManager.AssetReceivedCallback)">
             <summary>
-            Register a CAPS event handler. This is a low level event interface
-            and should only be used if you are doing something not supported in
-            the library
             </summary>
-            <param name="capsEvent">Name of the CAPS event to register a handler for</param>
-            <param name="callback">Callback to fire when a CAPS event is received</param>
+            <param name="assetID">Use UUID.Zero if you do not have the
+            asset ID but have all the necessary permissions</param>
+            <param name="itemID">The item ID of this asset in the inventory</param>
+            <param name="taskID">Use UUID.Zero if you are not requesting an
+            asset from an object inventory</param>
+            <param name="ownerID">The owner of this asset</param>
+            <param name="type">Asset type</param>
+            <param name="priority">Whether to prioritize this asset download or not</param>
+            <param name="callback">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.UnregisterEventCallback(System.String,OpenMetaverse.Caps.EventQueueCallback)">
+        <member name="M:OpenMetaverse.AssetManager.SetPendingAssetUploadData(OpenMetaverse.AssetUpload)">
             <summary>
-            Unregister a CAPS event handler. This is a low level event interface
-            and should only be used if you are doing something not supported in
-            the library
+            Used to force asset data into the PendingUpload property, ie: for raw terrain uploads
             </summary>
-            <param name="capsEvent">Name of the CAPS event this callback is
-            registered with</param>
-            <param name="callback">Callback to stop firing events for</param>
+            <param name="assetData">An AssetUpload object containing the data to upload to the simulator</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.SendPacket(OpenMetaverse.Packets.Packet)">
+        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.Assets.Asset,System.Boolean)">
             <summary>
-            Send a packet to the simulator the avatar is currently occupying
+            Request an asset be uploaded to the simulator
             </summary>
-            <param name="packet">Packet to send</param>
+            <param name="asset">The <seealso cref="T:OpenMetaverse.Assets.Asset" /> Object containing the asset data</param>
+            <param name="storeLocal">If True, the asset once uploaded will be stored on the simulator
+            in which the client was connected in addition to being stored on the asset server</param>
+            <returns>The <seealso cref="T:OpenMetaverse.UUID" /> of the transfer, can be used to correlate the upload with
+            events being fired</returns>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.SendPacket(OpenMetaverse.Packets.Packet,OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.AssetType,System.Byte[],System.Boolean)">
             <summary>
-            Send a packet to a specified simulator
+            Request an asset be uploaded to the simulator
             </summary>
-            <param name="packet">Packet to send</param>
-            <param name="simulator">Simulator to send the packet to</param>
+            <param name="type">The <seealso cref="T:OpenMetaverse.AssetType" /> of the asset being uploaded</param>
+            <param name="data">A byte array containing the encoded asset data</param>
+            <param name="storeLocal">If True, the asset once uploaded will be stored on the simulator
+            in which the client was connected in addition to being stored on the asset server</param>
+            <returns>The <seealso cref="T:OpenMetaverse.UUID" /> of the transfer, can be used to correlate the upload with
+            events being fired</returns>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.Connect(System.Net.IPAddress,System.UInt16,System.UInt64,System.Boolean,System.String)">
+        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.UUID@,OpenMetaverse.AssetType,System.Byte[],System.Boolean)">
             <summary>
-            Connect to a simulator
+            Request an asset be uploaded to the simulator
             </summary>
-            <param name="ip">IP address to connect to</param>
-            <param name="port">Port to connect to</param>
-            <param name="handle">Handle for this simulator, to identify its
-            location in the grid</param>
-            <param name="setDefault">Whether to set CurrentSim to this new
-            connection, use this if the avatar is moving in to this simulator</param>
-            <param name="seedcaps">URL of the capabilities server to use for
-            this sim connection</param>
-            <returns>A Simulator object on success, otherwise null</returns>
+            <param name="assetID">
+            </param>
+            <param name="type">Asset type to upload this data as</param>
+            <param name="data">A byte array containing the encoded asset data</param>
+            <param name="storeLocal">If True, the asset once uploaded will be stored on the simulator
+            in which the client was connected in addition to being stored on the asset server</param>
+            <returns>The <seealso cref="T:OpenMetaverse.UUID" /> of the transfer, can be used to correlate the upload with
+            events being fired</returns>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.Connect(System.Net.IPEndPoint,System.UInt64,System.Boolean,System.String)">
+        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.UUID@,OpenMetaverse.AssetType,System.Byte[],System.Boolean,OpenMetaverse.UUID)">
             <summary>
-            Connect to a simulator
+            Initiate an asset upload
             </summary>
-            <param name="endPoint">IP address and port to connect to</param>
-            <param name="handle">Handle for this simulator, to identify its
-            location in the grid</param>
-            <param name="setDefault">Whether to set CurrentSim to this new
-            connection, use this if the avatar is moving in to this simulator</param>
-            <param name="seedcaps">URL of the capabilities server to use for
-            this sim connection</param>
-            <returns>A Simulator object on success, otherwise null</returns>
+            <param name="assetID">The ID this asset will have if the
+            upload succeeds</param>
+            <param name="type">Asset type to upload this data as</param>
+            <param name="data">Raw asset data to upload</param>
+            <param name="storeLocal">Whether to store this asset on the local
+            simulator or the grid-wide asset server</param>
+            <param name="transactionID">The tranaction id for the upload <see cref="!:RequestCreateItem" /></param>
+            <returns>The transaction ID of this transfer</returns>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.Logout">
+        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.ImageType,System.Single,System.Int32,System.UInt32,OpenMetaverse.TextureDownloadCallback,System.Boolean)">
             <summary>
-            Initiate a blocking logout request. This will return when the logout
-            handshake has completed or when <code>Settings.LOGOUT_TIMEOUT</code>
-            has expired and the network layer is manually shut down
+            Request a texture asset from the simulator using the <see cref="T:OpenMetaverse.TexturePipeline" /> system to
+            manage the requests and re-assemble the image from the packets received from the simulator
             </summary>
+            <param name="textureID">The <see cref="T:OpenMetaverse.UUID" /> of the texture asset to download</param>
+            <param name="imageType">The <see cref="T:OpenMetaverse.ImageType" /> of the texture asset.
+            Use <see cref="F:OpenMetaverse.ImageType.Normal" /> for most textures, or <see cref="F:OpenMetaverse.ImageType.Baked" /> for baked layer texture assets</param>
+            <param name="priority">A float indicating the requested priority for the transfer. Higher priority values tell the simulator
+            to prioritize the request before lower valued requests. An image already being transferred using the <see cref="T:OpenMetaverse.TexturePipeline" /> can have
+            its priority changed by resending the request with the new priority value</param>
+            <param name="discardLevel">Number of quality layers to discard.
+            This controls the end marker of the data sent. Sending with value -1 combined with priority of 0 cancels an in-progress
+            transfer.</param>
+            <remarks>A bug exists in the Linden Simulator where a -1 will occasionally be sent with a non-zero priority
+            indicating an off-by-one error.</remarks>
+            <param name="packetStart">The packet number to begin the request at. A value of 0 begins the request
+            from the start of the asset texture</param>
+            <param name="callback">The <see cref="T:OpenMetaverse.TextureDownloadCallback" /> callback to fire when the image is retrieved. The callback
+            will contain the result of the request and the texture asset data</param>
+            <param name="progress">If true, the callback will be fired for each chunk of the downloaded image.
+            The callback asset parameter will contain all previously received chunks of the texture asset starting
+            from the beginning of the request</param>
+            <example>
+            Request an image and fire a callback when the request is complete
+            <code>
+            Client.Assets.RequestImage(UUID.Parse("c307629f-e3a1-4487-5e88-0d96ac9d4965"), ImageType.Normal, TextureDownloader_OnDownloadFinished);
+            private void TextureDownloader_OnDownloadFinished(TextureRequestState state, AssetTexture asset)
+            {
+            if(state == TextureRequestState.Finished)
+            {
+            Console.WriteLine("Texture {0} ({1} bytes) has been successfully downloaded",
+            asset.AssetID,
+            asset.AssetData.Length);
+            }
+            }
+            </code>
+            Request an image and use an inline anonymous method to handle the downloaded texture data
+            <code>
+            Client.Assets.RequestImage(UUID.Parse("c307629f-e3a1-4487-5e88-0d96ac9d4965"), ImageType.Normal, delegate(TextureRequestState state, AssetTexture asset)
+            {
+            if(state == TextureRequestState.Finished)
+            {
+            Console.WriteLine("Texture {0} ({1} bytes) has been successfully downloaded",
+            asset.AssetID,
+            asset.AssetData.Length);
+            }
+            }
+            );
+            </code>
+            Request a texture, decode the texture to a bitmap image and apply it to a imagebox
+            <code>
+            Client.Assets.RequestImage(UUID.Parse("c307629f-e3a1-4487-5e88-0d96ac9d4965"), ImageType.Normal, TextureDownloader_OnDownloadFinished);
+            private void TextureDownloader_OnDownloadFinished(TextureRequestState state, AssetTexture asset)
+            {
+            if(state == TextureRequestState.Finished)
+            {
+            ManagedImage imgData;
+            Image bitmap;
+            if (state == TextureRequestState.Finished)
+            {
+            OpenJPEG.DecodeToImage(assetTexture.AssetData, out imgData, out bitmap);
+            picInsignia.Image = bitmap;
+            }
+            }
+            }
+            </code></example>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.RequestLogout">
+        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.TextureDownloadCallback)">
             <summary>
-            Initiate the logout process. Check if logout succeeded with the
-            <code>OnLogoutReply</code> event, and if this does not fire the
-            <code>Shutdown()</code> function needs to be manually called
+            Overload: Request a texture asset from the simulator using the <see cref="T:OpenMetaverse.TexturePipeline" /> system to
+            manage the requests and re-assemble the image from the packets received from the simulator
             </summary>
+            <param name="textureID">The <see cref="T:OpenMetaverse.UUID" /> of the texture asset to download</param>
+            <param name="callback">The <see cref="T:OpenMetaverse.TextureDownloadCallback" /> callback to fire when the image is retrieved. The callback
+            will contain the result of the request and the texture asset data</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.DisconnectSim(OpenMetaverse.Simulator,System.Boolean)">
+        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.ImageType,OpenMetaverse.TextureDownloadCallback)">
             <summary>
-            Close a connection to the given simulator
+            Overload: Request a texture asset from the simulator using the <see cref="T:OpenMetaverse.TexturePipeline" /> system to
+            manage the requests and re-assemble the image from the packets received from the simulator
             </summary>
-            <param name="simulator"></param>
-            <param name="sendCloseCircuit"></param>
+            <param name="textureID">The <see cref="T:OpenMetaverse.UUID" /> of the texture asset to download</param>
+            <param name="imageType">The <see cref="T:OpenMetaverse.ImageType" /> of the texture asset.
+            Use <see cref="F:OpenMetaverse.ImageType.Normal" /> for most textures, or <see cref="F:OpenMetaverse.ImageType.Baked" /> for baked layer texture assets</param>
+            <param name="callback">The <see cref="T:OpenMetaverse.TextureDownloadCallback" /> callback to fire when the image is retrieved. The callback
+            will contain the result of the request and the texture asset data</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.Shutdown(OpenMetaverse.NetworkManager.DisconnectType)">
+        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.ImageType,OpenMetaverse.TextureDownloadCallback,System.Boolean)">
             <summary>
-            Shutdown will disconnect all the sims except for the current sim
-            first, and then kill the connection to CurrentSim. This should only
-            be called if the logout process times out on <code>RequestLogout</code>
+            Overload: Request a texture asset from the simulator using the <see cref="T:OpenMetaverse.TexturePipeline" /> system to
+            manage the requests and re-assemble the image from the packets received from the simulator
             </summary>
-            <param name="type">Type of shutdown</param>
+            <param name="textureID">The <see cref="T:OpenMetaverse.UUID" /> of the texture asset to download</param>
+            <param name="imageType">The <see cref="T:OpenMetaverse.ImageType" /> of the texture asset.
+            Use <see cref="F:OpenMetaverse.ImageType.Normal" /> for most textures, or <see cref="F:OpenMetaverse.ImageType.Baked" /> for baked layer texture assets</param>
+            <param name="callback">The <see cref="T:OpenMetaverse.TextureDownloadCallback" /> callback to fire when the image is retrieved. The callback
+            will contain the result of the request and the texture asset data</param>
+            <param name="progress">If true, the callback will be fired for each chunk of the downloaded image.
+            The callback asset parameter will contain all previously received chunks of the texture asset starting
+            from the beginning of the request</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.Shutdown(OpenMetaverse.NetworkManager.DisconnectType,System.String)">
+        <member name="M:OpenMetaverse.AssetManager.RequestImageCancel(OpenMetaverse.UUID)">
             <summary>
-            Shutdown will disconnect all the sims except for the current sim
-            first, and then kill the connection to CurrentSim. This should only
-            be called if the logout process times out on <code>RequestLogout</code>
+            Cancel a texture request
             </summary>
-            <param name="type">Type of shutdown</param>
-            <param name="message">Shutdown message</param>
+            <param name="textureID">The texture assets <see cref="T:OpenMetaverse.UUID" /></param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.FindSimulator(System.Net.IPEndPoint)">
+        <member name="M:OpenMetaverse.AssetManager.RequestMesh(OpenMetaverse.UUID,OpenMetaverse.AssetManager.MeshDownloadCallback)">
             <summary>
-            Searches through the list of currently connected simulators to find
-            one attached to the given IPEndPoint
+            Requests download of a mesh asset
             </summary>
-            <param name="endPoint">IPEndPoint of the Simulator to search for</param>
-            <returns>A Simulator reference on success, otherwise null</returns>
+            <param name="meshID">UUID of the mesh asset</param>
+            <param name="callback">Callback when the request completes</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.RaiseConnectedEvent(OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.AssetManager.FireImageProgressEvent(OpenMetaverse.UUID,System.Int32,System.Int32)">
             <summary>
-            Fire an event when an event queue connects for capabilities
+            Lets TexturePipeline class fire the progress event
             </summary>
-            <param name="simulator">Simulator the event queue is attached to</param>
+            <param name="texureID">The texture ID currently being downloaded</param>
+            <param name="transferredBytes">the number of bytes transferred</param>
+            <param name="totalBytes">the total number of bytes expected</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.LogoutReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.AssetManager.TransferInfoHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>Process an incoming packet and raise the appropriate events</summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.StartPingCheckHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.AssetManager.TransferPacketHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>Process an incoming packet and raise the appropriate events</summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.CompletePingCheckHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.AssetManager.InitiateDownloadPacketHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>Process an incoming packet and raise the appropriate events</summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.SimStatsHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.AssetManager.RequestXferHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>Process an incoming packet and raise the appropriate events</summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.RegionHandshakeHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.AssetManager.ConfirmXferPacketHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>Process an incoming packet and raise the appropriate events</summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.DisableSimulatorHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.AssetManager.AssetUploadCompleteHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>Process an incoming packet and raise the appropriate events</summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.KickUserHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.AssetManager.SendXferPacketHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>Process an incoming packet and raise the appropriate events</summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_LoginProgress">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="M:OpenMetaverse.AssetManager.AbortXferHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.OnLoginProgress(OpenMetaverse.LoginProgressEventArgs)">
-            <summary>Raises the LoginProgress Event</summary>
-             <param name="e">A LoginProgressEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="P:OpenMetaverse.XferReceivedEventArgs.Xfer">
+            <summary>Xfer data</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_LoginProgressLock">
-            <summary>Thread sync lock object</summary>
+        <member name="P:OpenMetaverse.AssetUploadEventArgs.Upload">
+            <summary>Upload data</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.LoginSeedCapability">
-            <summary>Seed CAPS URL returned from the login server</summary>
+        <member name="P:OpenMetaverse.InitiateDownloadEventArgs.SimFileName">
+            <summary>Filename used on the simulator</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.UDPBlacklist">
-            <summary>A list of packets obtained during the login process which 
-            networkmanager will log but not process</summary>
+        <member name="P:OpenMetaverse.InitiateDownloadEventArgs.ViewerFileName">
+            <summary>Filename used by the client</summary>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.DefaultLoginParams(System.String,System.String,System.String,System.String,System.String)">
+        <member name="P:OpenMetaverse.ImageReceiveProgressEventArgs.ImageID">
+            <summary>UUID of the image that is in progress</summary>
+        </member>
+        <member name="P:OpenMetaverse.ImageReceiveProgressEventArgs.Received">
+            <summary>Number of bytes received so far</summary>
+        </member>
+        <member name="P:OpenMetaverse.ImageReceiveProgressEventArgs.Total">
+            <summary>Image size in bytes</summary>
+        </member>
+        <member name="T:OpenMetaverse.ProfileFlags">
             <summary>
-            Generate sane default values for a login request
+            Avatar profile flags
             </summary>
-            <param name="firstName">Account first name</param>
-            <param name="lastName">Account last name</param>
-            <param name="password">Account password</param>
-            <param name="userAgent">Client application name</param>
-            <param name="userVersion">Client application version</param>
-            <returns>A populated <seealso cref="T:OpenMetaverse.LoginParams"/> struct containing
-            sane defaults</returns>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.Login(System.String,System.String,System.String,System.String,System.String)">
+        <member name="T:OpenMetaverse.Avatar">
             <summary>
-            Simplified login that takes the most common and required fields
+            Represents an avatar (other than your own)
             </summary>
-            <param name="firstName">Account first name</param>
-            <param name="lastName">Account last name</param>
-            <param name="password">Account password</param>
-            <param name="userAgent">Client application name</param>
-            <param name="userVersion">Client application version</param>
-            <returns>Whether the login was successful or not. On failure the
-            LoginErrorKey string will contain the error code and LoginMessage
-            will contain a description of the error</returns>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.Login(System.String,System.String,System.String,System.String,System.String,System.String)">
+        <member name="M:OpenMetaverse.Avatar.#ctor">
             <summary>
-            Simplified login that takes the most common fields along with a
-            starting location URI, and can accept an MD5 string instead of a
-            plaintext password
+            Default constructor
             </summary>
-            <param name="firstName">Account first name</param>
-            <param name="lastName">Account last name</param>
-            <param name="password">Account password or MD5 hash of the password
-            such as $1$1682a1e45e9f957dcdf0bb56eb43319c</param>
-            <param name="userAgent">Client application name</param>
-            <param name="start">Starting location URI that can be built with
-            StartLocation()</param>
-            <param name="userVersion">Client application version</param>
-            <returns>Whether the login was successful or not. On failure the
-            LoginErrorKey string will contain the error code and LoginMessage
-            will contain a description of the error</returns>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.Login(OpenMetaverse.LoginParams)">
+        <member name="T:OpenMetaverse.Avatar.Statistics">
             <summary>
-            Login that takes a struct of all the values that will be passed to
-            the login server
+            Positive and negative ratings
             </summary>
-            <param name="loginParams">The values that will be passed to the login
-            server, all fields must be set even if they are String.Empty</param>
-            <returns>Whether the login was successful or not. On failure the
-            LoginErrorKey string will contain the error code and LoginMessage
-            will contain a description of the error</returns>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.StartLocation(System.String,System.Int32,System.Int32,System.Int32)">
+        <member name="F:OpenMetaverse.Avatar.Statistics.BehaviorPositive">
+            <summary>Positive ratings for Behavior</summary>
+        </member>
+        <member name="F:OpenMetaverse.Avatar.Statistics.BehaviorNegative">
+            <summary>Negative ratings for Behavior</summary>
+        </member>
+        <member name="F:OpenMetaverse.Avatar.Statistics.AppearancePositive">
+            <summary>Positive ratings for Appearance</summary>
+        </member>
+        <member name="F:OpenMetaverse.Avatar.Statistics.AppearanceNegative">
+            <summary>Negative ratings for Appearance</summary>
+        </member>
+        <member name="F:OpenMetaverse.Avatar.Statistics.BuildingPositive">
+            <summary>Positive ratings for Building</summary>
+        </member>
+        <member name="F:OpenMetaverse.Avatar.Statistics.BuildingNegative">
+            <summary>Negative ratings for Building</summary>
+        </member>
+        <member name="F:OpenMetaverse.Avatar.Statistics.GivenPositive">
+            <summary>Positive ratings given by this avatar</summary>
+        </member>
+        <member name="F:OpenMetaverse.Avatar.Statistics.GivenNegative">
+            <summary>Negative ratings given by this avatar</summary>
+        </member>
+        <member name="T:OpenMetaverse.Avatar.AvatarProperties">
             <summary>
-            Build a start location URI for passing to the Login function
+            Avatar properties including about text, profile URL, image IDs and
+            publishing settings
             </summary>
-            <param name="sim">Name of the simulator to start in</param>
-            <param name="x">X coordinate to start at</param>
-            <param name="y">Y coordinate to start at</param>
-            <param name="z">Z coordinate to start at</param>
-            <returns>String with a URI that can be used to login to a specified
-            location</returns>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.LoginReplyXmlRpcHandler(Nwc.XmlRpc.XmlRpcResponse,OpenMetaverse.LoginParams)">
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.FirstLifeText">
+            <summary>First Life about text</summary>
+        </member>
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.FirstLifeImage">
+            <summary>First Life image ID</summary>
+        </member>
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.Partner">
             <summary>
-            Handles response from XML-RPC login replies
             </summary>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.LoginReplyLLSDHandler(OpenMetaverse.Http.CapsClient,OpenMetaverse.StructuredData.OSD,System.Exception)">
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.AboutText">
             <summary>
-            Handle response from LLSD login replies
             </summary>
-            <param name="client"></param>
-            <param name="result"></param>
-            <param name="error"></param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.GetPlatform">
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.BornOn">
             <summary>
-            Get current OS
             </summary>
-            <returns>Either "Win" or "Linux"</returns>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.GetMAC">
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.CharterMember">
             <summary>
-            Get clients default Mac Address
             </summary>
-            <returns>A string containing the first found Mac Address</returns>
         </member>
-        <member name="E:OpenMetaverse.NetworkManager.PacketSent">
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.ProfileImage">
+            <summary>Profile image ID</summary>
+        </member>
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.Flags">
+            <summary>Flags of the profile</summary>
+        </member>
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.ProfileURL">
+            <summary>Web URL for this profile</summary>
+        </member>
+        <member name="P:OpenMetaverse.Avatar.AvatarProperties.AllowPublish">
+            <summary>Should this profile be published on the web</summary>
+        </member>
+        <member name="P:OpenMetaverse.Avatar.AvatarProperties.Online">
+            <summary>Avatar Online Status</summary>
+        </member>
+        <member name="P:OpenMetaverse.Avatar.AvatarProperties.MaturePublish">
+            <summary>Is this a mature profile</summary>
+        </member>
+        <member name="P:OpenMetaverse.Avatar.AvatarProperties.Identified">
+            <summary>
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.Avatar.AvatarProperties.Transacted">
+            <summary>
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.Avatar.Interests">
+            <summary>
+            Avatar interests including spoken languages, skills, and "want to"
+            choices
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Avatar.Interests.LanguagesText">
+            <summary>Languages profile field</summary>
+        </member>
+        <member name="F:OpenMetaverse.Avatar.Interests.SkillsMask">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Avatar.Interests.SkillsText">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Avatar.Interests.WantToMask">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Avatar.Interests.WantToText">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Avatar.Groups">
+            <summary>Groups that this avatar is a member of</summary>
+        </member>
+        <member name="F:OpenMetaverse.Avatar.ProfileStatistics">
+            <summary>Positive and negative ratings</summary>
+        </member>
+        <member name="F:OpenMetaverse.Avatar.ProfileProperties">
+            <summary>Avatar properties including about text, profile URL, image IDs and
+            publishing settings</summary>
+        </member>
+        <member name="F:OpenMetaverse.Avatar.ProfileInterests">
+            <summary>Avatar interests including spoken languages, skills, and "want to"
+            choices</summary>
+        </member>
+        <member name="F:OpenMetaverse.Avatar.ControlFlags">
+            <summary>Movement control flags for avatars. Typically not set or used by
+            clients. To move your avatar, use Client.Self.Movement instead</summary>
+        </member>
+        <member name="F:OpenMetaverse.Avatar.VisualParameters">
+            <summary>
+            Contains the visual parameters describing the deformation of the avatar
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.Avatar.FirstName">
+            <summary>First name</summary>
+        </member>
+        <member name="P:OpenMetaverse.Avatar.LastName">
+            <summary>Last name</summary>
+        </member>
+        <member name="P:OpenMetaverse.Avatar.Name">
+            <summary>Full name</summary>
+        </member>
+        <member name="P:OpenMetaverse.Avatar.GroupName">
+            <summary>Active group</summary>
+        </member>
+        <member name="T:OpenMetaverse.AgentDisplayName">
+            <summary> Information about agents display name </summary>
+        </member>
+        <member name="F:OpenMetaverse.AgentDisplayName.ID">
+            <summary> Agent UUID </summary>
+        </member>
+        <member name="F:OpenMetaverse.AgentDisplayName.UserName">
+            <summary> Username </summary>
+        </member>
+        <member name="F:OpenMetaverse.AgentDisplayName.DisplayName">
+            <summary> Display name </summary>
+        </member>
+        <member name="F:OpenMetaverse.AgentDisplayName.LegacyFirstName">
+            <summary> First name (legacy) </summary>
+        </member>
+        <member name="F:OpenMetaverse.AgentDisplayName.LegacyLastName">
+            <summary> Last name (legacy) </summary>
+        </member>
+        <member name="F:OpenMetaverse.AgentDisplayName.IsDefaultDisplayName">
+            <summary> Is display name default display name </summary>
+        </member>
+        <member name="F:OpenMetaverse.AgentDisplayName.NextUpdate">
+            <summary> Cache display name until </summary>
+        </member>
+        <member name="P:OpenMetaverse.AgentDisplayName.LegacyFullName">
+            <summary> Full name (legacy) </summary>
+        </member>
+        <member name="M:OpenMetaverse.AgentDisplayName.FromOSD(OpenMetaverse.StructuredData.OSD)">
+            <summary>
+            Creates AgentDisplayName object from OSD
+            </summary>
+            <param name="data">Incoming OSD data</param>
+            <returns>AgentDisplayName object</returns>
+        </member>
+        <member name="M:OpenMetaverse.AgentDisplayName.GetOSD">
+            <summary>
+            Return object as OSD map
+            </summary>
+            <returns>OSD containing agent's display name data</returns>
+        </member>
+        <member name="T:OpenMetaverse.AvatarGroup">
+            <summary>
+            Holds group information for Avatars such as those you might find in a profile
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarGroup.AcceptNotices">
+            <summary>true of Avatar accepts group notices</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarGroup.GroupID">
+            <summary>Groups Key</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarGroup.GroupInsigniaID">
+            <summary>Texture Key for groups insignia</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarGroup.GroupName">
+            <summary>Name of the group</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarGroup.GroupPowers">
+            <summary>Powers avatar has in the group</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarGroup.GroupTitle">
+            <summary>Avatars Currently selected title</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarGroup.ListInProfile">
+            <summary>true of Avatar has chosen to list this in their profile</summary>
+        </member>
+        <member name="T:OpenMetaverse.Animation">
+            <summary>
+            Contains an animation currently being played by an agent
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Animation.AnimationID">
+            <summary>The ID of the animation asset</summary>
+        </member>
+        <member name="F:OpenMetaverse.Animation.AnimationSequence">
+            <summary>A number to indicate start order of currently playing animations</summary>
+            <remarks>On Linden Grids this number is unique per region, with OpenSim it is per client</remarks>
+        </member>
+        <member name="F:OpenMetaverse.Animation.AnimationSourceObjectID">
+            <summary>
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.ProfilePick">
+            <summary>
+            Holds group information on an individual profile pick
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.AvatarManager">
+            <summary>
+            Retrieve friend status notifications, and retrieve avatar names and
+            profiles
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.AvatarManager.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Represents other avatars
+            </summary>
+            <param name="client">
+            </param>
+        </member>
+        <member name="T:OpenMetaverse.AvatarManager.DisplayNamesCallback">
+            <summary>
+            Callback giving results when fetching display names
+            </summary>
+            <param name="success">If the request was successful</param>
+            <param name="names">Array of display names</param>
+            <param name="badIDs">Array of UUIDs that could not be fetched</param>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAnimation">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAnimationLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAppearance">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAppearanceLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_UUIDNameReply">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_UUIDNameReplyLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarInterestsReply">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarInterestsReplyLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPropertiesReply">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPropertiesReplyLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarGroupsReply">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarGroupsReplyLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPickerReply">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPickerReplyLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectPointAt">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectPointAtLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectLookAt">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectLookAtLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffect">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPicksReply">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPicksReplyLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_PickInfoReply">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_PickInfoReplyLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarClassifiedReply">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarClassifiedReplyLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_ClassifiedInfoReply">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_ClassifiedInfoReplyLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_DisplayNameUpdate">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.AvatarManager.m_DisplayNameUpdateLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="E:OpenMetaverse.AvatarManager.AvatarAnimation">
             <summary>Raised when the simulator sends us data containing
-            ...</summary>
+            an agents animation playlist</summary>
         </member>
-        <member name="E:OpenMetaverse.NetworkManager.LoggedOut">
+        <member name="E:OpenMetaverse.AvatarManager.AvatarAppearance">
             <summary>Raised when the simulator sends us data containing
-            ...</summary>
+            the appearance information for an agent</summary>
         </member>
-        <member name="E:OpenMetaverse.NetworkManager.SimConnecting">
+        <member name="E:OpenMetaverse.AvatarManager.UUIDNameReply">
             <summary>Raised when the simulator sends us data containing
-            ...</summary>
+            agent names/id values</summary>
         </member>
-        <member name="E:OpenMetaverse.NetworkManager.SimConnected">
+        <member name="E:OpenMetaverse.AvatarManager.AvatarInterestsReply">
             <summary>Raised when the simulator sends us data containing
-            ...</summary>
+            the interests listed in an agents profile</summary>
         </member>
-        <member name="E:OpenMetaverse.NetworkManager.SimDisconnected">
+        <member name="E:OpenMetaverse.AvatarManager.AvatarPropertiesReply">
             <summary>Raised when the simulator sends us data containing
-            ...</summary>
+            profile property information for an agent</summary>
         </member>
-        <member name="E:OpenMetaverse.NetworkManager.Disconnected">
+        <member name="E:OpenMetaverse.AvatarManager.AvatarGroupsReply">
             <summary>Raised when the simulator sends us data containing
-            ...</summary>
+            the group membership an agent is a member of</summary>
         </member>
-        <member name="E:OpenMetaverse.NetworkManager.SimChanged">
+        <member name="E:OpenMetaverse.AvatarManager.AvatarPickerReply">
             <summary>Raised when the simulator sends us data containing
-            ...</summary>
+            name/id pair</summary>
         </member>
-        <member name="E:OpenMetaverse.NetworkManager.EventQueueRunning">
+        <member name="E:OpenMetaverse.AvatarManager.ViewerEffectPointAt">
             <summary>Raised when the simulator sends us data containing
-            ...</summary>
+            the objects and effect when an agent is pointing at</summary>
         </member>
-        <member name="P:OpenMetaverse.NetworkManager.CircuitCode">
-            <summary>Unique identifier associated with our connections to
-            simulators</summary>
+        <member name="E:OpenMetaverse.AvatarManager.ViewerEffectLookAt">
+            <summary>Raised when the simulator sends us data containing
+            the objects and effect when an agent is looking at</summary>
         </member>
-        <member name="P:OpenMetaverse.NetworkManager.CurrentSim">
-            <summary>The simulator that the logged in avatar is currently 
-            occupying</summary>
+        <member name="E:OpenMetaverse.AvatarManager.ViewerEffect">
+            <summary>Raised when the simulator sends us data containing
+            an agents viewer effect information</summary>
         </member>
-        <member name="P:OpenMetaverse.NetworkManager.Connected">
-            <summary>Shows whether the network layer is logged in to the
-            grid or not</summary>
+        <member name="E:OpenMetaverse.AvatarManager.AvatarPicksReply">
+            <summary>Raised when the simulator sends us data containing
+            the top picks from an agents profile</summary>
         </member>
-        <member name="P:OpenMetaverse.NetworkManager.InboxCount">
-            <summary>Number of packets in the incoming queue</summary>
+        <member name="E:OpenMetaverse.AvatarManager.PickInfoReply">
+            <summary>Raised when the simulator sends us data containing
+            the Pick details</summary>
         </member>
-        <member name="P:OpenMetaverse.NetworkManager.OutboxCount">
-            <summary>Number of packets in the outgoing queue</summary>
+        <member name="E:OpenMetaverse.AvatarManager.AvatarClassifiedReply">
+            <summary>Raised when the simulator sends us data containing
+            the classified ads an agent has placed</summary>
         </member>
-        <member name="E:OpenMetaverse.NetworkManager.LoginProgress">
+        <member name="E:OpenMetaverse.AvatarManager.ClassifiedInfoReply">
             <summary>Raised when the simulator sends us data containing
-            ...</summary>
+            the details of a classified ad</summary>
         </member>
-        <member name="E:OpenMetaverse.NetworkManager.OnLoginResponse">
-            <summary>Called when a reply is received from the login server, the
-            login sequence will block until this event returns</summary>
+        <member name="E:OpenMetaverse.AvatarManager.DisplayNameUpdate">
+            <summary>Raised when the simulator sends us data containing
+            the details of display name change</summary>
         </member>
-        <member name="P:OpenMetaverse.NetworkManager.LoginStatusCode">
-            <summary>Current state of logging in</summary>
+        <member name="M:OpenMetaverse.AvatarManager.OnAvatarAnimation(OpenMetaverse.AvatarAnimationEventArgs)">
+            <summary>Raises the AvatarAnimation Event</summary>
+            <param name="e">An AvatarAnimationEventArgs object containing
+            the data sent from the simulator</param>
         </member>
-        <member name="P:OpenMetaverse.NetworkManager.LoginErrorKey">
-            <summary>Upon login failure, contains a short string key for the
-            type of login error that occurred</summary>
+        <member name="M:OpenMetaverse.AvatarManager.OnAvatarAppearance(OpenMetaverse.AvatarAppearanceEventArgs)">
+            <summary>Raises the AvatarAppearance Event</summary>
+            <param name="e">A AvatarAppearanceEventArgs object containing
+            the data sent from the simulator</param>
         </member>
-        <member name="P:OpenMetaverse.NetworkManager.RawLoginReply">
-            <summary>The raw XML-RPC reply from the login server, exactly as it
-            was received (minus the HTTP header)</summary>
+        <member name="M:OpenMetaverse.AvatarManager.OnUUIDNameReply(OpenMetaverse.UUIDNameReplyEventArgs)">
+            <summary>Raises the UUIDNameReply Event</summary>
+            <param name="e">A UUIDNameReplyEventArgs object containing
+            the data sent from the simulator</param>
         </member>
-        <member name="P:OpenMetaverse.NetworkManager.LoginMessage">
-            <summary>During login this contains a descriptive version of 
-            LoginStatusCode. After a successful login this will contain the 
-            message of the day, and after a failed login a descriptive error 
-            message will be returned</summary>
+        <member name="M:OpenMetaverse.AvatarManager.OnAvatarInterestsReply(OpenMetaverse.AvatarInterestsReplyEventArgs)">
+            <summary>Raises the AvatarInterestsReply Event</summary>
+            <param name="e">A AvatarInterestsReplyEventArgs object containing
+            the data sent from the simulator</param>
         </member>
-        <member name="T:OpenMetaverse.NetworkManager.DisconnectType">
+        <member name="M:OpenMetaverse.AvatarManager.OnAvatarPropertiesReply(OpenMetaverse.AvatarPropertiesReplyEventArgs)">
+            <summary>Raises the AvatarPropertiesReply Event</summary>
+            <param name="e">A AvatarPropertiesReplyEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.AvatarManager.OnAvatarGroupsReply(OpenMetaverse.AvatarGroupsReplyEventArgs)">
+            <summary>Raises the AvatarGroupsReply Event</summary>
+            <param name="e">A AvatarGroupsReplyEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.AvatarManager.OnAvatarPickerReply(OpenMetaverse.AvatarPickerReplyEventArgs)">
+            <summary>Raises the AvatarPickerReply Event</summary>
+            <param name="e">A AvatarPickerReplyEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.AvatarManager.OnViewerEffectPointAt(OpenMetaverse.ViewerEffectPointAtEventArgs)">
+            <summary>Raises the ViewerEffectPointAt Event</summary>
+            <param name="e">A ViewerEffectPointAtEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.AvatarManager.OnViewerEffectLookAt(OpenMetaverse.ViewerEffectLookAtEventArgs)">
+            <summary>Raises the ViewerEffectLookAt Event</summary>
+            <param name="e">A ViewerEffectLookAtEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.AvatarManager.OnViewerEffect(OpenMetaverse.ViewerEffectEventArgs)">
+            <summary>Raises the ViewerEffect Event</summary>
+            <param name="e">A ViewerEffectEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.AvatarManager.OnAvatarPicksReply(OpenMetaverse.AvatarPicksReplyEventArgs)">
+            <summary>Raises the AvatarPicksReply Event</summary>
+            <param name="e">A AvatarPicksReplyEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.AvatarManager.OnPickInfoReply(OpenMetaverse.PickInfoReplyEventArgs)">
+            <summary>Raises the PickInfoReply Event</summary>
+            <param name="e">A PickInfoReplyEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.AvatarManager.OnAvatarClassifiedReply(OpenMetaverse.AvatarClassifiedReplyEventArgs)">
+            <summary>Raises the AvatarClassifiedReply Event</summary>
+            <param name="e">A AvatarClassifiedReplyEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.AvatarManager.OnClassifiedInfoReply(OpenMetaverse.ClassifiedInfoReplyEventArgs)">
+            <summary>Raises the ClassifiedInfoReply Event</summary>
+            <param name="e">A ClassifiedInfoReplyEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.AvatarManager.OnDisplayNameUpdate(OpenMetaverse.DisplayNameUpdateEventArgs)">
+            <summary>Raises the DisplayNameUpdate Event</summary>
+            <param name="e">A DisplayNameUpdateEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.AvatarManager.RequestTrackAgent(OpenMetaverse.UUID)">
+            <summary>Tracks the specified avatar on your map</summary>
+            <param name="preyID">Avatar ID to track</param>
+        </member>
+        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarName(OpenMetaverse.UUID)">
             <summary>
-            Explains why a simulator or the grid disconnected from us
+            Request a single avatar name
             </summary>
+            <param name="id">The avatar key to retrieve a name for</param>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.ClientInitiated">
-            <summary>The client requested the logout or simulator disconnect</summary>
+        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarNames(System.Collections.Generic.List{OpenMetaverse.UUID})">
+            <summary>
+            Request a list of avatar names
+            </summary>
+            <param name="ids">The avatar keys to retrieve names for</param>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.ServerInitiated">
-            <summary>The server notified us that it is disconnecting</summary>
+        <member name="M:OpenMetaverse.AvatarManager.DisplayNamesAvailable">
+            <summary>
+            Check if Display Names functionality is available
+            </summary>
+            <returns>True if Display name functionality is available</returns>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.NetworkTimeout">
-            <summary>Either a socket was closed or network traffic timed out</summary>
+        <member name="M:OpenMetaverse.AvatarManager.GetDisplayNames(System.Collections.Generic.List{OpenMetaverse.UUID},OpenMetaverse.AvatarManager.DisplayNamesCallback)">
+            <summary>
+            Request retrieval of display names (max 90 names per request)
+            </summary>
+            <param name="ids">List of UUIDs to lookup</param>
+            <param name="callback">Callback to report result of the operation</param>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.SimShutdown">
-            <summary>The last active simulator shut down</summary>
+        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarProperties(OpenMetaverse.UUID)">
+            <summary>
+            Start a request for Avatar Properties
+            </summary>
+            <param name="avatarid">
+            </param>
         </member>
-        <member name="T:OpenMetaverse.NetworkManager.IncomingPacket">
+        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarNameSearch(System.String,OpenMetaverse.UUID)">
             <summary>
-            Holds a simulator reference and a decoded packet, these structs are put in
-            the packet inbox for event handling
+            Search for an avatar (first name, last name)
             </summary>
+            <param name="name">The name to search for</param>
+            <param name="queryID">An ID to associate with this query</param>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.IncomingPacket.Simulator">
-            <summary>Reference to the simulator that this packet came from</summary>
+        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarPicks(OpenMetaverse.UUID)">
+            <summary>
+            Start a request for Avatar Picks
+            </summary>
+            <param name="avatarid">UUID of the avatar</param>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.IncomingPacket.Packet">
-            <summary>Packet that needs to be processed</summary>
+        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarClassified(OpenMetaverse.UUID)">
+            <summary>
+            Start a request for Avatar Classifieds
+            </summary>
+            <param name="avatarid">UUID of the avatar</param>
         </member>
-        <member name="T:OpenMetaverse.NetworkManager.OutgoingPacket">
+        <member name="M:OpenMetaverse.AvatarManager.RequestPickInfo(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Holds a simulator reference and a serialized packet, these structs are put in
-            the packet outbox for sending
+            Start a request for details of a specific profile pick
             </summary>
+            <param name="avatarid">UUID of the avatar</param>
+            <param name="pickid">UUID of the profile pick</param>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.Simulator">
-            <summary>Reference to the simulator this packet is destined for</summary>
+        <member name="M:OpenMetaverse.AvatarManager.RequestClassifiedInfo(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+            <summary>
+            Start a request for details of a specific profile classified
+            </summary>
+            <param name="avatarid">UUID of the avatar</param>
+            <param name="classifiedid">UUID of the profile classified</param>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.Buffer">
-            <summary>Packet that needs to be sent</summary>
+        <member name="M:OpenMetaverse.AvatarManager.UUIDNameReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.SequenceNumber">
-            <summary>Sequence number of the wrapped packet</summary>
+        <member name="M:OpenMetaverse.AvatarManager.AvatarAnimationHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.ResendCount">
-            <summary>Number of times this packet has been resent</summary>
+        <member name="M:OpenMetaverse.AvatarManager.AvatarAppearanceHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.TickCount">
-            <summary>Environment.TickCount when this packet was last sent over the wire</summary>
+        <member name="M:OpenMetaverse.AvatarManager.AvatarPropertiesHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="T:OpenMetaverse.NetworkManager.LoginResponseCallback">
+        <member name="M:OpenMetaverse.AvatarManager.AvatarInterestsHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="M:OpenMetaverse.AvatarManager.DisplayNameUpdateMessageHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            
+            EQ Message fired when someone nearby changes their display name
             </summary>
-            <param name="loginSuccess"></param>
-            <param name="redirect"></param>
-            <param name="replyData"></param>
-            <param name="message"></param>
-            <param name="reason"></param>
+            <param name="capsKey">The message key</param>
+            <param name="message">the IMessage object containing the deserialized data sent from the simulator</param>
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator" /> which originated the packet</param>
         </member>
-        <member name="T:OpenMetaverse.ObjectReturnType">
+        <member name="M:OpenMetaverse.AvatarManager.AvatarGroupsReplyMessageHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            Type of return to use when returning objects from a parcel
+            Crossed region handler for message that comes across the EventQueue. Sent to an agent
+            when the agent crosses a sim border into a new region.
             </summary>
+            <param name="capsKey">The message key</param>
+            <param name="message">the IMessage object containing the deserialized data sent from the simulator</param>
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator" /> which originated the packet</param>
         </member>
-        <member name="F:OpenMetaverse.ObjectReturnType.None">
-            <summary></summary>
+        <member name="M:OpenMetaverse.AvatarManager.AvatarGroupsReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.ObjectReturnType.Owner">
-            <summary>Return objects owned by parcel owner</summary>
+        <member name="M:OpenMetaverse.AvatarManager.AvatarPickerReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.ObjectReturnType.Group">
-            <summary>Return objects set to group</summary>
+        <member name="M:OpenMetaverse.AvatarManager.ViewerEffectHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.ObjectReturnType.Other">
-            <summary>Return objects not owned by parcel owner or set to group</summary>
+        <member name="M:OpenMetaverse.AvatarManager.AvatarPicksReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.ObjectReturnType.List">
-            <summary>Return a specific list of objects on parcel</summary>
+        <member name="M:OpenMetaverse.AvatarManager.PickInfoReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.ObjectReturnType.Sell">
-            <summary>Return objects that are marked for-sale</summary>
+        <member name="M:OpenMetaverse.AvatarManager.AvatarClassifiedReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="T:OpenMetaverse.ParcelAccessFlags">
+        <member name="M:OpenMetaverse.AvatarManager.ClassifiedInfoReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="T:OpenMetaverse.AvatarAnimationEventArgs">
+            <summary>Provides data for the <see cref="E:OpenMetaverse.AvatarManager.AvatarAnimation" /> event</summary>
+            <remarks>The <see cref="E:OpenMetaverse.AvatarManager.AvatarAnimation" /> event occurs when the simulator sends
+            the animation playlist for an agent</remarks>
+            <example>
+            The following code example uses the <see cref="P:OpenMetaverse.AvatarAnimationEventArgs.AvatarID" /> and <see cref="P:OpenMetaverse.AvatarAnimationEventArgs.Animations" />
+            properties to display the animation playlist of an avatar on the <see cref="T:System.Console" /> window.
+            <code>
+            // subscribe to the event
+            Client.Avatars.AvatarAnimation += Avatars_AvatarAnimation;
+            private void Avatars_AvatarAnimation(object sender, AvatarAnimationEventArgs e)
+            {
+            // create a dictionary of "known" animations from the Animations class using System.Reflection
+            Dictionary&lt;UUID, string&gt; systemAnimations = new Dictionary&lt;UUID, string&gt;();
+            Type type = typeof(Animations);
+            System.Reflection.FieldInfo[] fields = type.GetFields(System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static);
+            foreach (System.Reflection.FieldInfo field in fields)
+            {
+            systemAnimations.Add((UUID)field.GetValue(type), field.Name);
+            }
+            // find out which animations being played are known animations and which are assets
+            foreach (Animation animation in e.Animations)
+            {
+            if (systemAnimations.ContainsKey(animation.AnimationID))
+            {
+            Console.WriteLine("{0} is playing {1} ({2}) sequence {3}", e.AvatarID,
+            systemAnimations[animation.AnimationID], animation.AnimationSequence);
+            }
+            else
+            {
+            Console.WriteLine("{0} is playing {1} (Asset) sequence {2}", e.AvatarID,
+            animation.AnimationID, animation.AnimationSequence);
+            }
+            }
+            }
+            </code></example>
+        </member>
+        <member name="M:OpenMetaverse.AvatarAnimationEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.Animation})">
             <summary>
-            Blacklist/Whitelist flags used in parcels Access List
+            Construct a new instance of the AvatarAnimationEventArgs class
             </summary>
+            <param name="avatarID">The ID of the agent</param>
+            <param name="anims">The list of animations to start</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelAccessFlags.NoAccess">
-            <summary>Agent is denied access</summary>
+        <member name="P:OpenMetaverse.AvatarAnimationEventArgs.AvatarID">
+            <summary>Get the ID of the agent</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelAccessFlags.Access">
-            <summary>Agent is granted access</summary>
+        <member name="P:OpenMetaverse.AvatarAnimationEventArgs.Animations">
+            <summary>Get the list of animations to start</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelResult">
+        <member name="T:OpenMetaverse.AvatarAppearanceEventArgs">
+            <summary>Provides data for the <see cref="E:OpenMetaverse.AvatarManager.AvatarAppearance" /> event</summary>
+            <remarks>The <see cref="E:OpenMetaverse.AvatarManager.AvatarAppearance" /> event occurs when the simulator sends
+            the appearance data for an avatar</remarks>
+            <example>
+            The following code example uses the <see cref="P:OpenMetaverse.AvatarAppearanceEventArgs.AvatarID" /> and <see cref="P:OpenMetaverse.AvatarAppearanceEventArgs.VisualParams" />
+            properties to display the selected shape of an avatar on the <see cref="T:System.Console" /> window.
+            <code>
+            // subscribe to the event
+            Client.Avatars.AvatarAppearance += Avatars_AvatarAppearance;
+            // handle the data when the event is raised
+            void Avatars_AvatarAppearance(object sender, AvatarAppearanceEventArgs e)
+            {
+            Console.WriteLine("The Agent {0} is using a {1} shape.", e.AvatarID, (e.VisualParams[31] &gt; 0) : "male" ? "female")
+            }
+            </code></example>
+        </member>
+        <member name="M:OpenMetaverse.AvatarAppearanceEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,System.Boolean,OpenMetaverse.Primitive.TextureEntryFace,OpenMetaverse.Primitive.TextureEntryFace[],System.Collections.Generic.List{System.Byte})">
             <summary>
-            The result of a request for parcel properties
+            Construct a new instance of the AvatarAppearanceEventArgs class
             </summary>
+            <param name="sim">The simulator request was from</param>
+            <param name="avatarID">The ID of the agent</param>
+            <param name="isTrial">true of the agent is a trial account</param>
+            <param name="defaultTexture">The default agent texture</param>
+            <param name="faceTextures">The agents appearance layer textures</param>
+            <param name="visualParams">The <see cref="T:OpenMetaverse.VisualParams" /> for the agent</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelResult.NoData">
-            <summary>No matches were found for the request</summary>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.Simulator">
+            <summary>Get the Simulator this request is from of the agent</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelResult.Single">
-            <summary>Request matched a single parcel</summary>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.AvatarID">
+            <summary>Get the ID of the agent</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelResult.Multiple">
-            <summary>Request matched multiple parcels</summary>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.IsTrial">
+            <summary>true if the agent is a trial account</summary>
         </member>
-        <member name="T:OpenMetaverse.AccessList">
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.DefaultTexture">
+            <summary>Get the default agent texture</summary>
+        </member>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.FaceTextures">
+            <summary>Get the agents appearance layer textures</summary>
+        </member>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.VisualParams">
+            <summary>Get the <see cref="T:OpenMetaverse.VisualParams" /> for the agent</summary>
+        </member>
+        <member name="T:OpenMetaverse.AvatarInterestsReplyEventArgs">
+            <summary>Represents the interests from the profile of an agent</summary>
+        </member>
+        <member name="P:OpenMetaverse.AvatarInterestsReplyEventArgs.AvatarID">
+            <summary>Get the ID of the agent</summary>
+        </member>
+        <member name="T:OpenMetaverse.AvatarPropertiesReplyEventArgs">
+            <summary>The properties of an agent</summary>
+        </member>
+        <member name="P:OpenMetaverse.AvatarPropertiesReplyEventArgs.AvatarID">
+            <summary>Get the ID of the agent</summary>
+        </member>
+        <member name="P:OpenMetaverse.AvatarGroupsReplyEventArgs.AvatarID">
+            <summary>Get the ID of the agent</summary>
+        </member>
+        <member name="P:OpenMetaverse.AvatarPicksReplyEventArgs.AvatarID">
+            <summary>Get the ID of the agent</summary>
+        </member>
+        <member name="P:OpenMetaverse.AvatarClassifiedReplyEventArgs.AvatarID">
+            <summary>Get the ID of the avatar</summary>
+        </member>
+        <member name="T:OpenMetaverse.DisplayNameUpdateEventArgs">
             <summary>
-            Flags used in the ParcelAccessListRequest packet to specify whether
-            we want the access list (whitelist), ban list (blacklist), or both
+            Event args class for display name notification messages
             </summary>
         </member>
-        <member name="F:OpenMetaverse.AccessList.Access">
-            <summary>Request the access list</summary>
+        <member name="T:OpenMetaverse.BinBVHAnimationReader">
+            <summary>
+            Reads in a byte array of an Animation Asset created by the SecondLife(tm) client.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AccessList.Ban">
-            <summary>Request the ban list</summary>
+        <member name="M:OpenMetaverse.BinBVHAnimationReader.#ctor(System.Byte[])">
+            <summary>
+            Searialize an animation asset into it's joints/keyframes/meta data
+            </summary>
+            <param name="animationdata">
+            </param>
         </member>
-        <member name="F:OpenMetaverse.AccessList.Both">
-            <summary>Request both White and Black lists</summary>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.rotationkeys">
+            <summary>
+            Rotation Keyframe count (used internally)
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelPropertiesStatus">
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.positionkeys">
             <summary>
-            Sequence ID in ParcelPropertiesReply packets (sent when avatar
-            tries to cross a parcel border)
+            Position Keyframe count (used internally)
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelPropertiesStatus.ParcelSelected">
-            <summary>Parcel is currently selected</summary>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.Priority">
+            <summary>
+            Animation Priority
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelPropertiesStatus.CollisionNotInGroup">
-            <summary>Parcel restricted to a group the avatar is not a
-            member of</summary>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.Length">
+            <summary>
+            The animation length in seconds.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelPropertiesStatus.CollisionBanned">
-            <summary>Avatar is banned from the parcel</summary>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.ExpressionName">
+            <summary>
+            Expression set in the client.  Null if [None] is selected
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelPropertiesStatus.CollisionNotOnAccessList">
-            <summary>Parcel is restricted to an access list that the
-            avatar is not on</summary>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.InPoint">
+            <summary>
+            The time in seconds to start the animation
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelPropertiesStatus.HoveredOverParcel">
-            <summary>Response to hovering over a parcel</summary>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.OutPoint">
+            <summary>
+            The time in seconds to end the animation
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.TerraformAction">
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.Loop">
             <summary>
-            The tool to use when modifying terrain levels
+            Loop the animation
             </summary>
         </member>
-        <member name="F:OpenMetaverse.TerraformAction.Level">
-            <summary>Level the terrain</summary>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.EaseInTime">
+            <summary>
+            Meta data. Ease in Seconds.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.TerraformAction.Raise">
-            <summary>Raise the terrain</summary>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.EaseOutTime">
+            <summary>
+            Meta data. Ease out seconds.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.TerraformAction.Lower">
-            <summary>Lower the terrain</summary>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.HandPose">
+            <summary>
+            Meta Data for the Hand Pose
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.TerraformAction.Smooth">
-            <summary>Smooth the terrain</summary>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.JointCount">
+            <summary>
+            Number of joints defined in the animation
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.TerraformAction.Noise">
-            <summary>Add random noise to the terrain</summary>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.joints">
+            <summary>
+            Contains an array of joints
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.TerraformAction.Revert">
-            <summary>Revert terrain to simulator default</summary>
+        <member name="M:OpenMetaverse.BinBVHAnimationReader.ReadBytesUntilNull(System.Byte[],System.Int32@)">
+            <summary>
+            Variable length strings seem to be null terminated in the animation asset..    but..
+            use with caution, home grown.
+            advances the index.
+            </summary>
+            <param name="data">The animation asset byte array</param>
+            <param name="i">The offset to start reading</param>
+            <returns>a string</returns>
         </member>
-        <member name="T:OpenMetaverse.TerraformBrushSize">
+        <member name="M:OpenMetaverse.BinBVHAnimationReader.readJoint(System.Byte[],System.Int32@)">
             <summary>
-            The tool size to use when changing terrain levels
+            Read in a Joint from an animation asset byte array
+            Variable length Joint fields, yay!
+            Advances the index
             </summary>
+            <param name="data">animation asset byte array</param>
+            <param name="i">Byte Offset of the start of the joint</param>
+            <returns>The Joint data serialized into the binBVHJoint structure</returns>
         </member>
-        <member name="F:OpenMetaverse.TerraformBrushSize.Small">
-            <summary>Small</summary>
+        <member name="M:OpenMetaverse.BinBVHAnimationReader.readKeys(System.Byte[],System.Int32@,System.Int32,System.Single,System.Single)">
+            <summary>
+            Read Keyframes of a certain type
+            advance i
+            </summary>
+            <param name="data">Animation Byte array</param>
+            <param name="i">Offset in the Byte Array.  Will be advanced</param>
+            <param name="keycount">Number of Keyframes</param>
+            <param name="min">Scaling Min to pass to the Uint16ToFloat method</param>
+            <param name="max">Scaling Max to pass to the Uint16ToFloat method</param>
+            <returns>
+            </returns>
         </member>
-        <member name="F:OpenMetaverse.TerraformBrushSize.Medium">
-            <summary>Medium</summary>
+        <member name="T:OpenMetaverse.binBVHJoint">
+            <summary>
+            A Joint and it's associated meta data and keyframes
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.TerraformBrushSize.Large">
-            <summary>Large</summary>
+        <member name="F:OpenMetaverse.binBVHJoint.Name">
+            <summary>
+            Name of the Joint.  Matches the avatar_skeleton.xml in client distros
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.AccessDeniedReason">
+        <member name="F:OpenMetaverse.binBVHJoint.Priority">
             <summary>
-            Reasons agent is denied access to a parcel on the simulator
+            Joint Animation Override?   Was the same as the Priority in testing..
             </summary>
         </member>
-        <member name="F:OpenMetaverse.AccessDeniedReason.NotDenied">
-            <summary>Agent is not denied, access is granted</summary>
+        <member name="F:OpenMetaverse.binBVHJoint.rotationkeys">
+            <summary>
+            Array of Rotation Keyframes in order from earliest to latest
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AccessDeniedReason.NotInGroup">
-            <summary>Agent is not a member of the group set for the parcel, or which owns the parcel</summary>
+        <member name="F:OpenMetaverse.binBVHJoint.positionkeys">
+            <summary>
+            Array of Position Keyframes in order from earliest to latest
+            This seems to only be for the Pelvis?
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AccessDeniedReason.NotOnAllowList">
-            <summary>Agent is not on the parcels specific allow list</summary>
+        <member name="F:OpenMetaverse.binBVHJoint.Tag">
+            <summary>
+            Custom application data that can be attached to a joint
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AccessDeniedReason.BannedFromParcel">
-            <summary>Agent is on the parcels ban list</summary>
+        <member name="T:OpenMetaverse.binBVHJointKey">
+            <summary>
+            A Joint Keyframe.  This is either a position or a rotation.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AccessDeniedReason.NoAccess">
-            <summary>Unknown</summary>
+        <member name="F:OpenMetaverse.binBVHJointKey.key_element">
+            <summary>
+            Either a Vector3 position or a Vector3 Euler rotation
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AccessDeniedReason.NotAgeVerified">
-            <summary>Agent is not age verified and parcel settings deny access to non age verified avatars</summary>
+        <member name="T:OpenMetaverse.HandPose">
+            <summary>
+            Poses set in the animation metadata for the hands.
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelOverlayType">
+        <member name="T:OpenMetaverse.BitPack">
             <summary>
-            Parcel overlay type. This is used primarily for highlighting and
-            coloring which is why it is a single integer instead of a set of
-            flags
+            Wrapper around a byte array that allows bit to be packed and unpacked
+            one at a time or by a variable amount. Useful for very tightly packed
+            data like LayerData packets
             </summary>
-            <remarks>These values seem to be poorly thought out. The first three
-            bits represent a single value, not flags. For example Auction (0x05) is
-            not a combination of OwnedByOther (0x01) and ForSale(0x04). However,
-            the BorderWest and BorderSouth values are bit flags that get attached
-            to the value stored in the first three bits. Bits four, five, and six
-            are unused</remarks>
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.Public">
-            <summary>Public land</summary>
+        <member name="M:OpenMetaverse.BitPack.#ctor(System.Byte[],System.Int32)">
+            <summary>
+            Default constructor, initialize the bit packer / bit unpacker
+            with a byte array and starting position
+            </summary>
+            <param name="data">Byte array to pack bits in to or unpack from</param>
+            <param name="pos">Starting position in the byte array</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.OwnedByOther">
-            <summary>Land is owned by another avatar</summary>
+        <member name="F:OpenMetaverse.BitPack.Data">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.OwnedByGroup">
-            <summary>Land is owned by a group</summary>
+        <member name="P:OpenMetaverse.BitPack.BytePos">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.OwnedBySelf">
-            <summary>Land is owned by the current avatar</summary>
+        <member name="P:OpenMetaverse.BitPack.BitPos">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.ForSale">
-            <summary>Land is for sale</summary>
+        <member name="M:OpenMetaverse.BitPack.PackFloat(System.Single)">
+            <summary>
+            Pack a floating point value in to the data
+            </summary>
+            <param name="data">Floating point value to pack</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.Auction">
-            <summary>Land is being auctioned</summary>
+        <member name="M:OpenMetaverse.BitPack.PackBits(System.Int32,System.Int32)">
+            <summary>
+            Pack part or all of an integer in to the data
+            </summary>
+            <param name="data">Integer containing the data to pack</param>
+            <param name="totalCount">Number of bits of the integer to pack</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.BorderWest">
-            <summary>To the west of this area is a parcel border</summary>
+        <member name="M:OpenMetaverse.BitPack.PackBits(System.UInt32,System.Int32)">
+            <summary>
+            Pack part or all of an unsigned integer in to the data
+            </summary>
+            <param name="data">Unsigned integer containing the data to pack</param>
+            <param name="totalCount">Number of bits of the integer to pack</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelOverlayType.BorderSouth">
-            <summary>To the south of this area is a parcel border</summary>
+        <member name="M:OpenMetaverse.BitPack.PackBit(System.Boolean)">
+            <summary>
+            Pack a single bit in to the data
+            </summary>
+            <param name="bit">Bit to pack</param>
         </member>
-        <member name="T:OpenMetaverse.ParcelFlags">
+        <member name="M:OpenMetaverse.BitPack.PackFixed(System.Single,System.Boolean,System.Int32,System.Int32)">
             <summary>
-            Various parcel properties
             </summary>
+            <param name="data">
+            </param>
+            <param name="isSigned">
+            </param>
+            <param name="intBits">
+            </param>
+            <param name="fracBits">
+            </param>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.None">
-            <summary>No flags set</summary>
+        <member name="M:OpenMetaverse.BitPack.PackUUID(OpenMetaverse.UUID)">
+            <summary>
+            </summary>
+            <param name="data">
+            </param>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowFly">
-            <summary>Allow avatars to fly (a client-side only restriction)</summary>
+        <member name="M:OpenMetaverse.BitPack.PackColor(OpenMetaverse.Color4)">
+            <summary>
+            </summary>
+            <param name="data">
+            </param>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowOtherScripts">
-            <summary>Allow foreign scripts to run</summary>
+        <member name="M:OpenMetaverse.BitPack.UnpackFloat">
+            <summary>
+            Unpacking a floating point value from the data
+            </summary>
+            <returns>Unpacked floating point value</returns>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.ForSale">
-            <summary>This parcel is for sale</summary>
+        <member name="M:OpenMetaverse.BitPack.UnpackBits(System.Int32)">
+            <summary>
+            Unpack a variable number of bits from the data in to integer format
+            </summary>
+            <param name="totalCount">Number of bits to unpack</param>
+            <returns>An integer containing the unpacked bits</returns>
+            <remarks>This function is only useful up to 32 bits</remarks>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowLandmark">
-            <summary>Allow avatars to create a landmark on this parcel</summary>
+        <member name="M:OpenMetaverse.BitPack.UnpackUBits(System.Int32)">
+            <summary>
+            Unpack a variable number of bits from the data in to unsigned
+            integer format
+            </summary>
+            <param name="totalCount">Number of bits to unpack</param>
+            <returns>An unsigned integer containing the unpacked bits</returns>
+            <remarks>This function is only useful up to 32 bits</remarks>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowTerraform">
-            <summary>Allows all avatars to edit the terrain on this parcel</summary>
+        <member name="M:OpenMetaverse.BitPack.UnpackShort">
+            <summary>
+            Unpack a 16-bit signed integer
+            </summary>
+            <returns>16-bit signed integer</returns>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowDamage">
-            <summary>Avatars have health and can take damage on this parcel.
-            If set, avatars can be killed and sent home here</summary>
+        <member name="M:OpenMetaverse.BitPack.UnpackUShort">
+            <summary>
+            Unpack a 16-bit unsigned integer
+            </summary>
+            <returns>16-bit unsigned integer</returns>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.CreateObjects">
-            <summary>Foreign avatars can create objects here</summary>
+        <member name="M:OpenMetaverse.BitPack.UnpackInt">
+            <summary>
+            Unpack a 32-bit signed integer
+            </summary>
+            <returns>32-bit signed integer</returns>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.ForSaleObjects">
-            <summary>All objects on this parcel can be purchased</summary>
+        <member name="M:OpenMetaverse.BitPack.UnpackUInt">
+            <summary>
+            Unpack a 32-bit unsigned integer
+            </summary>
+            <returns>32-bit unsigned integer</returns>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.UseAccessGroup">
-            <summary>Access is restricted to a group</summary>
+        <member name="T:OpenMetaverse.Caps">
+            <summary>
+            Capabilities is the name of the bi-directional HTTP REST protocol
+            used to communicate non real-time transactions such as teleporting or
+            group messaging
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.UseAccessList">
-            <summary>Access is restricted to a whitelist</summary>
+        <member name="M:OpenMetaverse.Caps.#ctor(OpenMetaverse.Simulator,System.String)">
+            <summary>
+            Default constructor
+            </summary>
+            <param name="simulator">
+            </param>
+            <param name="seedcaps">
+            </param>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.UseBanList">
-            <summary>Ban blacklist is enabled</summary>
+        <member name="T:OpenMetaverse.Caps.EventQueueCallback">
+            <summary>
+            Triggered when an event is received via the EventQueueGet
+            capability
+            </summary>
+            <param name="capsKey">Event name</param>
+            <param name="message">Decoded event data</param>
+            <param name="simulator">The simulator that generated the event</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.UsePassList">
-            <summary>Unknown</summary>
+        <member name="F:OpenMetaverse.Caps.Simulator">
+            <summary>Reference to the simulator this system is connected to</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.ShowDirectory">
-            <summary>List this parcel in the search directory</summary>
+        <member name="P:OpenMetaverse.Caps.SeedCapsURI">
+            <summary>Capabilities URI this system was initialized with</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowDeedToGroup">
-            <summary>Allow personally owned parcels to be deeded to group</summary>
+        <member name="P:OpenMetaverse.Caps.IsEventQueueRunning">
+            <summary>Whether the capabilities event queue is connected and
+            listening for incoming events</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.ContributeWithDeed">
-            <summary>If Deeded, owner contributes required tier to group parcel is deeded to</summary>
+        <member name="M:OpenMetaverse.Caps.CapabilityURI(System.String)">
+            <summary>
+            Request the URI of a named capability
+            </summary>
+            <param name="capability">Name of the capability to request</param>
+            <returns>The URI of the requested capability, or String.Empty if
+            the capability does not exist</returns>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.SoundLocal">
-            <summary>Restrict sounds originating on this parcel to the 
-            parcel boundaries</summary>
+        <member name="M:OpenMetaverse.Caps.EventQueueEventHandler(System.String,OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Process any incoming events, check to see if we have a message created for the event,
+            </summary>
+            <param name="eventName">
+            </param>
+            <param name="body">
+            </param>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.SellParcelObjects">
-            <summary>Objects on this parcel are sold when the land is 
-            purchsaed</summary>
+        <member name="M:OpenMetaverse.Packets.Packet.BuildPacket(System.String,OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Attempts to convert an LLSD structure to a known Packet type
+            </summary>
+            <param name="capsEventName">Event name, this must match an actual
+            packet name for a Packet to be successfully built</param>
+            <param name="body">LLSD to convert to a Packet</param>
+            <returns>A Packet on success, otherwise null</returns>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowPublish">
-            <summary>Allow this parcel to be published on the web</summary>
+        <member name="P:OpenMetaverse.CoordinateFrame.Origin">
+            <summary>Origin position of this coordinate frame</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.MaturePublish">
-            <summary>The information for this parcel is mature content</summary>
+        <member name="P:OpenMetaverse.CoordinateFrame.XAxis">
+            <summary>X axis of this coordinate frame, or Forward/At in grid terms</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.UrlWebPage">
-            <summary>The media URL is an HTML page</summary>
+        <member name="P:OpenMetaverse.CoordinateFrame.YAxis">
+            <summary>Y axis of this coordinate frame, or Left in grid terms</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.UrlRawHtml">
-            <summary>The media URL is a raw HTML string</summary>
+        <member name="P:OpenMetaverse.CoordinateFrame.ZAxis">
+            <summary>Z axis of this coordinate frame, or Up in grid terms</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.RestrictPushObject">
-            <summary>Restrict foreign object pushes</summary>
+        <member name="M:OpenMetaverse.CoordinateFrame.LookDirection(OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
+            <summary>
+            </summary>
+            <param name="at">Looking direction, must be a normalized vector</param>
+            <param name="upDirection">Up direction, must be a normalized vector</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.DenyAnonymous">
-            <summary>Ban all non identified/transacted avatars</summary>
+        <member name="M:OpenMetaverse.CoordinateFrame.LookDirection(System.Double)">
+            <summary>
+            Align the coordinate frame X and Y axis with a given rotation
+            around the Z axis in radians
+            </summary>
+            <param name="heading">Absolute rotation around the Z axis in
+            radians</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowGroupScripts">
-            <summary>Allow group-owned scripts to run</summary>
+        <member name="T:OpenMetaverse.DirectoryManager">
+            <summary>
+            Access to the data server which allows searching for land, events, people, etc
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.CreateGroupObjects">
-            <summary>Allow object creation by group members or group 
-            objects</summary>
+        <member name="M:OpenMetaverse.DirectoryManager.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Constructs a new instance of the DirectoryManager class
+            </summary>
+            <param name="client">An instance of GridClient</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowAPrimitiveEntry">
-            <summary>Allow all objects to enter this parcel</summary>
+        <member name="T:OpenMetaverse.DirectoryManager.ClassifiedCategories">
+            <summary>Classified Ad categories</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowGroupObjectEntry">
-            <summary>Only allow group and owner objects to enter this parcel</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Any">
+            <summary>Classified is listed in the Any category</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.AllowVoiceChat">
-            <summary>Voice Enabled on this parcel</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Shopping">
+            <summary>Classified is shopping related</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.UseEstateVoiceChan">
-            <summary>Use Estate Voice channel for Voice on this parcel</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.LandRental">
+            <summary>Classified is </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelFlags.DenyAgeUnverified">
-            <summary>Deny Age Unverified Users</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.PropertyRental">
+            <summary>
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelStatus">
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.SpecialAttraction">
             <summary>
-            Parcel ownership status
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelStatus.None">
-            <summary>Placeholder</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.NewProducts">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelStatus.Leased">
-            <summary>Parcel is leased (owned) by an avatar or group</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Employment">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelStatus.LeasePending">
-            <summary>Parcel is in process of being leased (purchased) by an avatar or group</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Wanted">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelStatus.Abandoned">
-            <summary>Parcel has been abandoned back to Governor Linden</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Service">
+            <summary>
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelCategory">
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Personal">
             <summary>
-            Category parcel is listed in under search
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.None">
-            <summary>No assigned category</summary>
+        <member name="T:OpenMetaverse.DirectoryManager.EventCategories">
+            <summary>Event Categories</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Linden">
-            <summary>Linden Infohub or public area</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.All">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Adult">
-            <summary>Adult themed area</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Discussion">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Arts">
-            <summary>Arts and Culture</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Sports">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Business">
-            <summary>Business</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.LiveMusic">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Educational">
-            <summary>Educational</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Commercial">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Gaming">
-            <summary>Gaming</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Nightlife">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Hangout">
-            <summary>Hangout or Club</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Games">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Newcomer">
-            <summary>Newcomer friendly</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Pageants">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Park">
-            <summary>Parks and Nature</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Education">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Residential">
-            <summary>Residential</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Arts">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Shopping">
-            <summary>Shopping</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Charity">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Stage">
-            <summary>Not Used?</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Miscellaneous">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Other">
-            <summary>Other</summary>
+        <member name="T:OpenMetaverse.DirectoryManager.DirFindFlags">
+            <summary>
+            Query Flags used in many of the DirectoryManager methods to specify which query to execute and how to return the results.
+            Flags can be combined using the | (pipe) character, not all flags are available in all queries
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelCategory.Any">
-            <summary>Not an actual category, only used for queries</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.People">
+            <summary>Query the People database</summary>
         </member>
-        <member name="T:OpenMetaverse.LandingType">
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.Online">
             <summary>
-            Type of teleport landing for a parcel
             </summary>
         </member>
-        <member name="F:OpenMetaverse.LandingType.None">
-            <summary>Unset, simulator default</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.Events">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.LandingType.LandingPoint">
-            <summary>Specific landing point set for this parcel</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.Groups">
+            <summary>Query the Groups database</summary>
         </member>
-        <member name="F:OpenMetaverse.LandingType.Direct">
-            <summary>No landing point set, direct teleports enabled for
-            this parcel</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.DateEvents">
+            <summary>Query the Events database</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelMediaCommand">
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.AgentOwned">
+            <summary>Query the land holdings database for land owned by the currently connected agent</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.ForSale">
             <summary>
-            Parcel Media Command used in ParcelMediaCommandMessage
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.Stop">
-            <summary>Stop the media stream and go back to the first frame</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.GroupOwned">
+            <summary>Query the land holdings database for land which is owned by a Group</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.Pause">
-            <summary>Pause the media stream (stop playing but stay on current frame)</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.DwellSort">
+            <summary>Specifies the query should pre sort the results based upon traffic
+            when searching the Places database</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.Play">
-            <summary>Start the current media stream playing and stop when the end is reached</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PgSimsOnly">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.Loop">
-            <summary>Start the current media stream playing, 
-            loop to the beginning when the end is reached and continue to play</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PicturesOnly">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.Texture">
-            <summary>Specifies the texture to replace with video</summary>
-            <remarks>If passing the key of a texture, it must be explicitly typecast as a key, 
-            not just passed within double quotes.</remarks>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PgEventsOnly">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.URL">
-            <summary>Specifies the movie URL (254 characters max)</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.MatureSimsOnly">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.Time">
-            <summary>Specifies the time index at which to begin playing</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.SortAsc">
+            <summary>Specifies the query should pre sort the results in an ascending order when searching the land sales database.
+            This flag is only used when searching the land sales database</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.Agent">
-            <summary>Specifies a single agent to apply the media command to</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PricesSort">
+            <summary>Specifies the query should pre sort the results using the SalePrice field when searching the land sales database.
+            This flag is only used when searching the land sales database</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.Unload">
-            <summary>Unloads the stream. While the stop command sets the texture to the first frame of the movie, 
-            unload resets it to the real texture that the movie was replacing.</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PerMeterSort">
+            <summary>Specifies the query should pre sort the results by calculating the average price/sq.m (SalePrice / Area) when searching the land sales database.
+            This flag is only used when searching the land sales database</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.AutoAlign">
-            <summary>Turn on/off the auto align feature, similar to the auto align checkbox in the parcel media properties 
-            (NOT to be confused with the "align" function in the textures view of the editor!) Takes TRUE or FALSE as parameter.</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.AreaSort">
+            <summary>Specifies the query should pre sort the results using the ParcelSize field when searching the land sales database.
+            This flag is only used when searching the land sales database</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.Type">
-            <summary>Allows a Web page or image to be placed on a prim (1.19.1 RC0 and later only). 
-            Use "text/html" for HTML.</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.NameSort">
+            <summary>Specifies the query should pre sort the results using the Name field when searching the land sales database.
+            This flag is only used when searching the land sales database</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.Size">
-            <summary>Resizes a Web page to fit on x, y pixels (1.19.1 RC0 and later only).</summary>
-            <remarks>This might still not be working</remarks>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.LimitByPrice">
+            <summary>When set, only parcels less than the specified Price will be included when searching the land sales database.
+            This flag is only used when searching the land sales database</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMediaCommand.Desc">
-            <summary>Sets a description for the media being displayed (1.19.1 RC0 and later only).</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.LimitByArea">
+            <summary>When set, only parcels greater than the specified Size will be included when searching the land sales database.
+            This flag is only used when searching the land sales database</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelInfo">
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.FilterMature">
             <summary>
-            Some information about a parcel of land returned from a DirectoryManager search
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.ID">
-            <summary>Global Key of record</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PGOnly">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.OwnerID">
-            <summary>Parcel Owners <seealso cref="T:OpenMetaverse.UUID"/></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.IncludePG">
+            <summary>Include PG land in results. This flag is used when searching both the Groups, Events and Land sales databases</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.Name">
-            <summary>Name field of parcel, limited to 128 characters</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.IncludeMature">
+            <summary>Include Mature land in results. This flag is used when searching both the Groups, Events and Land sales databases</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.Description">
-            <summary>Description field of parcel, limited to 256 characters</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.IncludeAdult">
+            <summary>Include Adult land in results. This flag is used when searching both the Groups, Events and Land sales databases</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.ActualArea">
-            <summary>Total Square meters of parcel</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.AdultOnly">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.BillableArea">
-            <summary>Total area billable as Tier, for group owned land this will be 10% less than ActualArea</summary>
+        <member name="T:OpenMetaverse.DirectoryManager.SearchTypeFlags">
+            <summary>
+            Land types to search dataserver for
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.Mature">
-            <summary>True of parcel is in Mature simulator</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.SearchTypeFlags.Any">
+            <summary>Search Auction, Mainland and Estate</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.GlobalX">
-            <summary>Grid global X position of parcel</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.SearchTypeFlags.Auction">
+            <summary>Land which is currently up for auction</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.GlobalY">
-            <summary>Grid global Y position of parcel</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.SearchTypeFlags.Mainland">
+            <summary>Parcels which are on the mainland (Linden owned) continents</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.GlobalZ">
-            <summary>Grid global Z position of parcel (not used)</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.SearchTypeFlags.Estate">
+            <summary>Parcels which are on privately owned simulators</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.SimName">
-            <summary>Name of simulator parcel is located in</summary>
+        <member name="T:OpenMetaverse.DirectoryManager.EventFlags">
+            <summary>
+            The content rating of the event
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.SnapshotID">
-            <summary>Texture <seealso cref="T:OpenMetaverse.UUID"/> of parcels display picture</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventFlags.PG">
+            <summary>Event is PG</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.Dwell">
-            <summary>Float representing calculated traffic based on time spent on parcel by avatars</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventFlags.Mature">
+            <summary>Event is Mature</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.SalePrice">
-            <summary>Sale price of parcel (not used)</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventFlags.Adult">
+            <summary>Event is Adult</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelInfo.AuctionID">
-            <summary>Auction ID of parcel</summary>
+        <member name="T:OpenMetaverse.DirectoryManager.ClassifiedFlags">
+            <summary>
+            Classified Ad Options
+            </summary>
+            <remarks>There appear to be two formats the flags are packed in.
+            This set of flags is for the newer style</remarks>
         </member>
-        <member name="T:OpenMetaverse.ParcelMedia">
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.None">
             <summary>
-            Parcel Media Information
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMedia.MediaAutoScale">
-            <summary>A byte, if 0x1 viewer should auto scale media to fit object</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.Mature">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMedia.MediaLoop">
-            <summary>A boolean, if true the viewer should loop the media</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.Enabled">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMedia.MediaID">
-            <summary>The Asset UUID of the Texture which when applied to a 
-            primitive will display the media</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.UpdateTime">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMedia.MediaURL">
-            <summary>A URL which points to any Quicktime supported media type</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.AutoRenew">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMedia.MediaDesc">
-            <summary>A description of the media</summary>
+        <member name="T:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags">
+            <summary>
+            Classified ad query options
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMedia.MediaHeight">
-            <summary>An Integer which represents the height of the media</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags.All">
+            <summary>Include all ads in results</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMedia.MediaWidth">
-            <summary>An integer which represents the width of the media</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags.PG">
+            <summary>Include PG ads in results</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelMedia.MediaType">
-            <summary>A string which contains the mime type of the media</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags.Mature">
+            <summary>Include Mature ads in results</summary>
         </member>
-        <member name="T:OpenMetaverse.Parcel">
+        <member name="F:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags.Adult">
+            <summary>Include Adult ads in results</summary>
+        </member>
+        <member name="T:OpenMetaverse.DirectoryManager.PlacesFlags">
             <summary>
-            Parcel of land, a portion of virtual real estate in a simulator
+            The For Sale flag in PlacesReplyData
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.SelfCount">
-            <summary>The total number of contiguous 4x4 meter blocks your agent owns within this parcel</summary>        
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesFlags.NotForSale">
+            <summary>Parcel is not listed for sale</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.OtherCount">
-            <summary>The total number of contiguous 4x4 meter blocks contained in this parcel owned by a group or agent other than your own</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesFlags.ForSale">
+            <summary>Parcel is For Sale</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.PublicCount">
-            <summary>Deprecated, Value appears to always be 0</summary>
+        <member name="T:OpenMetaverse.DirectoryManager.Classified">
+            <summary>
+            A classified ad on the grid
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.LocalID">
-            <summary>Simulator-local ID of this parcel</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.Classified.ID">
+            <summary>UUID for this ad, useful for looking up detailed
+            information about it</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.OwnerID">
-            <summary>UUID of the owner of this parcel</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.Classified.Name">
+            <summary>The title of this classified ad</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.IsGroupOwned">
-            <summary>Whether the land is deeded to a group or not</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.Classified.Flags">
+            <summary>Flags that show certain options applied to the classified</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.AuctionID">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.Classified.CreationDate">
+            <summary>Creation date of the ad</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.ClaimDate">
-            <summary>Date land was claimed</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.Classified.ExpirationDate">
+            <summary>Expiration date of the ad</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.ClaimPrice">
-            <summary>Appears to always be zero</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.Classified.Price">
+            <summary>Price that was paid for this ad</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.RentPrice">
-            <summary>This field is no longer used</summary>
+        <member name="M:OpenMetaverse.DirectoryManager.Classified.ToString">
+            <summary>Print the struct data as a string</summary>
+            <returns>A string containing the field name, and field value</returns>
         </member>
-        <member name="F:OpenMetaverse.Parcel.AABBMin">
-            <summary>Minimum corner of the axis-aligned bounding box for this
-            parcel</summary>
+        <member name="T:OpenMetaverse.DirectoryManager.DirectoryParcel">
+            <summary>
+            A parcel retrieved from the dataserver such as results from the
+            "For-Sale" listings or "Places" Search
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.AABBMax">
-            <summary>Maximum corner of the axis-aligned bounding box for this
-            parcel</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.ID">
+            <summary>The unique dataserver parcel ID</summary>
+            <remarks>This id is used to obtain additional information from the entry
+            by using the <see cref="!:ParcelManager.InfoRequest" /> method</remarks>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Bitmap">
-            <summary>Bitmap describing land layout in 4x4m squares across the 
-            entire region</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.Name">
+            <summary>A string containing the name of the parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Area">
-            <summary>Total parcel land area</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.ActualArea">
+            <summary>The size of the parcel</summary>
+            <remarks>This field is not returned for Places searches</remarks>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Status">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.SalePrice">
+            <summary>The price of the parcel</summary>
+            <remarks>This field is not returned for Places searches</remarks>
         </member>
-        <member name="F:OpenMetaverse.Parcel.SimWideMaxPrims">
-            <summary>Maximum primitives across the entire simulator owned by the same agent or group that owns this parcel that can be used</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.Auction">
+            <summary>If True, this parcel is flagged to be auctioned</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.SimWideTotalPrims">
-            <summary>Total primitives across the entire simulator calculated by combining the allowed prim counts for each parcel
-            owned by the agent or group that owns this parcel</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.ForSale">
+            <summary>If true, this parcel is currently set for sale</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.MaxPrims">
-            <summary>Maximum number of primitives this parcel supports</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.DirectoryParcel.Dwell">
+            <summary>Parcel traffic</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.TotalPrims">
-            <summary>Total number of primitives on this parcel</summary>
+        <member name="M:OpenMetaverse.DirectoryManager.DirectoryParcel.ToString">
+            <summary>Print the struct data as a string</summary>
+            <returns>A string containing the field name, and field value</returns>
         </member>
-        <member name="F:OpenMetaverse.Parcel.OwnerPrims">
-            <summary>For group-owned parcels this indicates the total number of prims deeded to the group,
-            for parcels owned by an individual this inicates the number of prims owned by the individual</summary>
+        <member name="T:OpenMetaverse.DirectoryManager.AgentSearchData">
+            <summary>
+            An Avatar returned from the dataserver
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.GroupPrims">
-            <summary>Total number of primitives owned by the parcel group on 
-            this parcel, or for parcels owned by an individual with a group set the
-            total number of prims set to that group.</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.AgentSearchData.Online">
+            <summary>Online status of agent</summary>
+            <remarks>This field appears to be obsolete and always returns false</remarks>
         </member>
-        <member name="F:OpenMetaverse.Parcel.OtherPrims">
-            <summary>Total number of prims owned by other avatars that are not set to group, or not the parcel owner</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.AgentSearchData.FirstName">
+            <summary>The agents first name</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.ParcelPrimBonus">
-            <summary>A bonus multiplier which allows parcel prim counts to go over times this amount, this does not affect
-            the max prims per simulator. e.g: 117 prim parcel limit x 1.5 bonus = 175 allowed</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.AgentSearchData.LastName">
+            <summary>The agents last name</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.OtherCleanTime">
-            <summary>Autoreturn value in minutes for others' objects</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.AgentSearchData.AgentID">
+            <summary>The agents <see cref="T:OpenMetaverse.UUID" /></summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Flags">
-            <summary></summary>
+        <member name="M:OpenMetaverse.DirectoryManager.AgentSearchData.ToString">
+            <summary>Print the struct data as a string</summary>
+            <returns>A string containing the field name, and field value</returns>
         </member>
-        <member name="F:OpenMetaverse.Parcel.SalePrice">
-            <summary>Sale price of the parcel, only useful if ForSale is set</summary>
-            <remarks>The SalePrice will remain the same after an ownership
-            transfer (sale), so it can be used to see the purchase price after
-            a sale if the new owner has not changed it</remarks>
+        <member name="T:OpenMetaverse.DirectoryManager.GroupSearchData">
+            <summary>
+            Response to a "Groups" Search
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Name">
-            <summary>Parcel Name</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.GroupSearchData.GroupID">
+            <summary>The Group ID</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Desc">
-            <summary>Parcel Description</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.GroupSearchData.GroupName">
+            <summary>The name of the group</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.MusicURL">
-            <summary>URL For Music Stream</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.GroupSearchData.Members">
+            <summary>The current number of members</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.GroupID">
-            <summary></summary>
+        <member name="M:OpenMetaverse.DirectoryManager.GroupSearchData.ToString">
+            <summary>Print the struct data as a string</summary>
+            <returns>A string containing the field name, and field value</returns>
         </member>
-        <member name="F:OpenMetaverse.Parcel.PassPrice">
-            <summary>Price for a temporary pass</summary>
+        <member name="T:OpenMetaverse.DirectoryManager.PlacesSearchData">
+            <summary>
+            Parcel information returned from a <see cref="M:OpenMetaverse.DirectoryManager.StartPlacesSearch(OpenMetaverse.DirectoryManager.DirFindFlags,OpenMetaverse.ParcelCategory,System.String,System.String,OpenMetaverse.UUID,OpenMetaverse.UUID)" /> request
+            <para>
+            Represents one of the following:
+            A parcel of land on the grid that has its Show In Search flag set
+            A parcel of land owned by the agent making the request
+            A parcel of land owned by a group the agent making the request is a member of
+            </para><para>
+            In a request for Group Land, the First record will contain an empty record
+            </para>
+            Note: This is not the same as searching the land for sale data source
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.PassHours">
-            <summary>How long is pass valid for</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.OwnerID">
+            <summary>The ID of the Agent of Group that owns the parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Category">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.Name">
+            <summary>The name</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.AuthBuyerID">
-            <summary>Key of authorized buyer</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.Desc">
+            <summary>The description</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.SnapshotID">
-            <summary>Key of parcel snapshot</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.ActualArea">
+            <summary>The Size of the parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.UserLocation">
-            <summary>The landing point location</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.BillableArea">
+            <summary>The billable Size of the parcel, for mainland
+            parcels this will match the ActualArea field. For Group owned land this will be 10 percent smaller
+            than the ActualArea. For Estate land this will always be 0</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.UserLookAt">
-            <summary>The landing point LookAt</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.Flags">
+            <summary>Indicates the ForSale status of the parcel</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Landing">
-            <summary>The type of landing enforced from the <see cref="T:OpenMetaverse.LandingType"/> enum</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.GlobalX">
+            <summary>The Gridwide X position</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Dwell">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.GlobalY">
+            <summary>The Gridwide Y position</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.RegionDenyAnonymous">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.GlobalZ">
+            <summary>The Z position of the parcel, or 0 if no landing point set</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.RegionPushOverride">
-            <summary></summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.SimName">
+            <summary>The name of the Region the parcel is located in</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.AccessWhiteList">
-            <summary>Access list of who is whitelisted on this
-            parcel</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.SnapshotID">
+            <summary>The Asset ID of the parcels Snapshot texture</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.AccessBlackList">
-            <summary>Access list of who is blacklisted on this
-            parcel</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.Dwell">
+            <summary>The calculated visitor traffic</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.RegionDenyAgeUnverified">
-            <summary>TRUE of region denies access to age unverified users</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.SKU">
+            <summary>The billing product SKU</summary>
+            <remarks>Known values are:
+            <list type="table"><item><term>023</term><description>Mainland / Full Region</description></item><item><term>024</term><description>Estate / Full Region</description></item><item><term>027</term><description>Estate / Openspace</description></item><item><term>029</term><description>Estate / Homestead</description></item><item><term>129</term><description>Mainland / Homestead (Linden Owned)</description></item></list></remarks>
         </member>
-        <member name="F:OpenMetaverse.Parcel.ObscureMedia">
-            <summary>true to obscure (hide) media url</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.PlacesSearchData.Price">
+            <summary>No longer used, will always be 0</summary>
         </member>
-        <member name="F:OpenMetaverse.Parcel.ObscureMusic">
-            <summary>true to obscure (hide) music url</summary>
+        <member name="M:OpenMetaverse.DirectoryManager.PlacesSearchData.ToSLurl">
+            <summary>Get a SL URL for the parcel</summary>
+            <returns>A string, containing a standard SLURL</returns>
         </member>
-        <member name="F:OpenMetaverse.Parcel.Media">
-            <summary>A struct containing media details</summary>
+        <member name="M:OpenMetaverse.DirectoryManager.PlacesSearchData.ToString">
+            <summary>Print the struct data as a string</summary>
+            <returns>A string containing the field name, and field value</returns>
         </member>
-        <member name="M:OpenMetaverse.Parcel.ToString">
+        <member name="T:OpenMetaverse.DirectoryManager.EventsSearchData">
             <summary>
-            Displays a parcel object in string format
+            An "Event" Listing summary
             </summary>
-            <returns>string containing key=value pairs of a parcel object</returns>
         </member>
-        <member name="M:OpenMetaverse.Parcel.#ctor(System.Int32)">
-            <summary>
-            Defalt constructor
-            </summary>
-            <param name="localID">Local ID of this parcel</param>
+        <member name="F:OpenMetaverse.DirectoryManager.EventsSearchData.Owner">
+            <summary>The ID of the event creator</summary>
         </member>
-        <member name="M:OpenMetaverse.Parcel.Update(OpenMetaverse.Simulator,System.Boolean)">
-            <summary>
-            Update the simulator with any local changes to this Parcel object
-            </summary>
-            <param name="simulator">Simulator to send updates to</param>
-            <param name="wantReply">Whether we want the simulator to confirm
-            the update with a reply packet or not</param>
+        <member name="F:OpenMetaverse.DirectoryManager.EventsSearchData.Name">
+            <summary>The name of the event</summary>
         </member>
-        <member name="M:OpenMetaverse.Parcel.UpdateOtherCleanTime(OpenMetaverse.Simulator)">
-            <summary>
-            Set Autoreturn time
-            </summary>
-            <param name="simulator">Simulator to send the update to</param>
+        <member name="F:OpenMetaverse.DirectoryManager.EventsSearchData.ID">
+            <summary>The events ID</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelManager">
+        <member name="F:OpenMetaverse.DirectoryManager.EventsSearchData.Date">
+            <summary>A string containing the short date/time the event will begin</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.EventsSearchData.Time">
+            <summary>The event start time in Unixtime (seconds since epoch)</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.EventsSearchData.Flags">
+            <summary>The events maturity rating</summary>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.EventsSearchData.ToString">
+            <summary>Print the struct data as a string</summary>
+            <returns>A string containing the field name, and field value</returns>
+        </member>
+        <member name="T:OpenMetaverse.DirectoryManager.EventInfo">
             <summary>
-            Parcel (subdivided simulator lots) subsystem
+            The details of an "Event"
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_DwellReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.ID">
+            <summary>The events ID</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnParcelDwellReply(OpenMetaverse.ParcelDwellReplyEventArgs)">
-            <summary>Raises the ParcelDwellReply event</summary>
-            <param name="e">A ParcelDwellReplyEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Creator">
+            <summary>The ID of the event creator</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_DwellReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Name">
+            <summary>The name of the event</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelInfo">
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Category">
+            <summary>The category</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Desc">
+            <summary>The events description</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Date">
+            <summary>The short date/time the event will begin</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.DateUTC">
+            <summary>The event start time in Unixtime (seconds since epoch) UTC adjusted</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Duration">
+            <summary>The length of the event in minutes</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Cover">
+            <summary>0 if no cover charge applies</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Amount">
+            <summary>The cover charge amount in L$ if applicable</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.SimName">
+            <summary>The name of the region where the event is being held</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.GlobalPos">
+            <summary>The gridwide location of the event</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.EventInfo.Flags">
+            <summary>The maturity rating</summary>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.EventInfo.ToSLurl">
+            <summary>Get a SL URL for the parcel where the event is hosted</summary>
+            <returns>A string, containing a standard SLURL</returns>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.EventInfo.ToString">
+            <summary>Print the struct data as a string</summary>
+            <returns>A string containing the field name, and field value</returns>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.m_EventInfoReply">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnParcelInfoReply(OpenMetaverse.ParcelInfoReplyEventArgs)">
-            <summary>Raises the ParcelInfoReply event</summary>
-            <param name="e">A ParcelInfoReplyEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="F:OpenMetaverse.DirectoryManager.m_EventDetailLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelInfoLock">
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirEvents">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirEventsLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelProperties">
+        <member name="F:OpenMetaverse.DirectoryManager.m_Places">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnParcelProperties(OpenMetaverse.ParcelPropertiesEventArgs)">
-            <summary>Raises the ParcelProperties event</summary>
-            <param name="e">A ParcelPropertiesEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="F:OpenMetaverse.DirectoryManager.m_PlacesLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelPropertiesLock">
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirPlaces">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirPlacesLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelACL">
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirClassifieds">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnParcelAccessListReply(OpenMetaverse.ParcelAccessListReplyEventArgs)">
-            <summary>Raises the ParcelAccessListReply event</summary>
-            <param name="e">A ParcelAccessListReplyEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirClassifiedsLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelACLLock">
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirGroups">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirGroupsLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelObjectOwnersReply">
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirPeople">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnParcelObjectOwnersReply(OpenMetaverse.ParcelObjectOwnersReplyEventArgs)">
-            <summary>Raises the ParcelObjectOwnersReply event</summary>
-            <param name="e">A ParcelObjectOwnersReplyEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirPeopleLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelObjectOwnersLock">
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirLandReply">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.DirectoryManager.m_DirLandLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_SimParcelsDownloaded">
+        <member name="E:OpenMetaverse.DirectoryManager.EventInfoReply">
+            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.EventInfoRequest(System.UInt32)" /> request.</summary>
+        </member>
+        <member name="E:OpenMetaverse.DirectoryManager.DirEventsReply">
+            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartEventsSearch(System.String,OpenMetaverse.DirectoryManager.DirFindFlags,System.String,System.UInt32,OpenMetaverse.DirectoryManager.EventCategories)" /> request.</summary>
+        </member>
+        <member name="E:OpenMetaverse.DirectoryManager.PlacesReply">
+            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartPlacesSearch(OpenMetaverse.DirectoryManager.DirFindFlags,OpenMetaverse.ParcelCategory,System.String,System.String,OpenMetaverse.UUID,OpenMetaverse.UUID)" /> request.</summary>
+        </member>
+        <member name="E:OpenMetaverse.DirectoryManager.DirPlacesReply">
+            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartDirPlacesSearch(System.String,OpenMetaverse.DirectoryManager.DirFindFlags,OpenMetaverse.ParcelCategory,System.Int32)" /> request.</summary>
+        </member>
+        <member name="E:OpenMetaverse.DirectoryManager.DirClassifiedsReply">
+            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartClassifiedSearch(System.String,OpenMetaverse.DirectoryManager.ClassifiedCategories,OpenMetaverse.DirectoryManager.ClassifiedQueryFlags)" /> request.</summary>
+        </member>
+        <member name="E:OpenMetaverse.DirectoryManager.DirGroupsReply">
+            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartGroupSearch(System.String,System.Int32,OpenMetaverse.DirectoryManager.DirFindFlags)" /> request.</summary>
+        </member>
+        <member name="E:OpenMetaverse.DirectoryManager.DirPeopleReply">
+            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartPeopleSearch(System.String,System.Int32)" /> request.</summary>
+        </member>
+        <member name="E:OpenMetaverse.DirectoryManager.DirLandReply">
+            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartLandSearch(OpenMetaverse.DirectoryManager.DirFindFlags,OpenMetaverse.DirectoryManager.SearchTypeFlags,System.Int32,System.Int32,System.Int32)" /> request.</summary>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.OnEventInfo(OpenMetaverse.EventInfoReplyEventArgs)">
+            <summary>Raises the EventInfoReply event</summary>
+            <param name="e">An EventInfoReplyEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.OnDirEvents(OpenMetaverse.DirEventsReplyEventArgs)">
+            <summary>Raises the DirEventsReply event</summary>
+            <param name="e">An DirEventsReplyEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.OnPlaces(OpenMetaverse.PlacesReplyEventArgs)">
+            <summary>Raises the PlacesReply event</summary>
+            <param name="e">A PlacesReplyEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.OnDirPlaces(OpenMetaverse.DirPlacesReplyEventArgs)">
+            <summary>Raises the DirPlacesReply event</summary>
+            <param name="e">A DirPlacesReplyEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.OnDirClassifieds(OpenMetaverse.DirClassifiedsReplyEventArgs)">
+            <summary>Raises the DirClassifiedsReply event</summary>
+            <param name="e">A DirClassifiedsReplyEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.OnDirGroups(OpenMetaverse.DirGroupsReplyEventArgs)">
+            <summary>Raises the DirGroupsReply event</summary>
+            <param name="e">A DirGroupsReplyEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.OnDirPeople(OpenMetaverse.DirPeopleReplyEventArgs)">
+            <summary>Raises the DirPeopleReply event</summary>
+            <param name="e">A DirPeopleReplyEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.OnDirLand(OpenMetaverse.DirLandReplyEventArgs)">
+            <summary>Raises the DirLandReply event</summary>
+            <param name="e">A DirLandReplyEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.StartClassifiedSearch(System.String)">
+            <summary>
+            Query the data server for a list of classified ads containing the specified string.
+            Defaults to searching for classified placed in any category, and includes PG, Adult and Mature
+            results.
+            Responses are sent 16 per response packet, there is no way to know how many results a query reply will contain however assuming
+            the reply packets arrived ordered, a response with less than 16 entries would indicate all results have been received
+            The <see cref="!:OnClassifiedReply" /> event is raised when a response is received from the simulator
+            </summary>
+            <param name="searchText">A string containing a list of keywords to search for</param>
+            <returns>A UUID to correlate the results when the <see cref="!:OnClassifiedReply" /> event is raised</returns>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.StartClassifiedSearch(System.String,OpenMetaverse.DirectoryManager.ClassifiedCategories,OpenMetaverse.DirectoryManager.ClassifiedQueryFlags)">
+            <summary>
+            Query the data server for a list of classified ads which contain specified keywords (Overload)
+            The <see cref="!:OnClassifiedReply" /> event is raised when a response is received from the simulator
+            </summary>
+            <param name="searchText">A string containing a list of keywords to search for</param>
+            <param name="category">The category to search</param>
+            <param name="queryFlags">A set of flags which can be ORed to modify query options
+            such as classified maturity rating.</param>
+            <returns>A UUID to correlate the results when the <see cref="!:OnClassifiedReply" /> event is raised</returns>
+            <example>
+            Search classified ads containing the key words "foo" and "bar" in the "Any" category that are either PG or Mature
+            <code>
+            UUID searchID = StartClassifiedSearch("foo bar", ClassifiedCategories.Any, ClassifiedQueryFlags.PG | ClassifiedQueryFlags.Mature);
+            </code></example>
+            <remarks>
+            Responses are sent 16 at a time, there is no way to know how many results a query reply will contain however assuming
+            the reply packets arrived ordered, a response with less than 16 entries would indicate all results have been received
+            </remarks>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.StartDirPlacesSearch(System.String,System.Int32)">
+            <summary>
+            Starts search for places (Overloaded)
+            The <see cref="!:OnDirPlacesReply" /> event is raised when a response is received from the simulator
+            </summary>
+            <param name="searchText">Search text</param>
+            <param name="queryStart">Each request is limited to 100 places
+            being returned. To get the first 100 result entries of a request use 0,
+            from 100-199 use 1, 200-299 use 2, etc.</param>
+            <returns>A UUID to correlate the results when the <see cref="!:OnDirPlacesReply" /> event is raised</returns>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.StartDirPlacesSearch(System.String,OpenMetaverse.DirectoryManager.DirFindFlags,OpenMetaverse.ParcelCategory,System.Int32)">
+            <summary>
+            Queries the dataserver for parcels of land which are flagged to be shown in search
+            The <see cref="!:OnDirPlacesReply" /> event is raised when a response is received from the simulator
+            </summary>
+            <param name="searchText">A string containing a list of keywords to search for separated by a space character</param>
+            <param name="queryFlags">A set of flags which can be ORed to modify query options
+            such as classified maturity rating.</param>
+            <param name="category">The category to search</param>
+            <param name="queryStart">Each request is limited to 100 places
+            being returned. To get the first 100 result entries of a request use 0,
+            from 100-199 use 1, 200-299 use 2, etc.</param>
+            <returns>A UUID to correlate the results when the <see cref="!:OnDirPlacesReply" /> event is raised</returns>
+            <example>
+            Search places containing the key words "foo" and "bar" in the "Any" category that are either PG or Adult
+            <code>
+            UUID searchID = StartDirPlacesSearch("foo bar", DirFindFlags.DwellSort | DirFindFlags.IncludePG | DirFindFlags.IncludeAdult, ParcelCategory.Any, 0);
+            </code></example>
+            <remarks>
+            Additional information on the results can be obtained by using the ParcelManager.InfoRequest method
+            </remarks>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.StartLandSearch(OpenMetaverse.DirectoryManager.SearchTypeFlags)">
+            <summary>
+            Starts a search for land sales using the directory
+            The <see cref="!:OnDirLandReply" /> event is raised when a response is received from the simulator
+            </summary>
+            <param name="typeFlags">What type of land to search for. Auction,
+            estate, mainland, "first land", etc</param>
+            <remarks>The OnDirLandReply event handler must be registered before
+            calling this function. There is no way to determine how many
+            results will be returned, or how many times the callback will be
+            fired other than you won't get more than 100 total parcels from
+            each query.</remarks>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.StartLandSearch(OpenMetaverse.DirectoryManager.SearchTypeFlags,System.Int32,System.Int32,System.Int32)">
+            <summary>
+            Starts a search for land sales using the directory
+            The <seealso cref="!:OnDirLandReply" /> event is raised when a response is received from the simulator
+            </summary>
+            <param name="typeFlags">What type of land to search for. Auction,
+            estate, mainland, "first land", etc</param>
+            <param name="priceLimit">Maximum price to search for</param>
+            <param name="areaLimit">Maximum area to search for</param>
+            <param name="queryStart">Each request is limited to 100 parcels
+            being returned. To get the first 100 parcels of a request use 0,
+            from 100-199 use 1, 200-299 use 2, etc.</param>
+            <remarks>The OnDirLandReply event handler must be registered before
+            calling this function. There is no way to determine how many
+            results will be returned, or how many times the callback will be
+            fired other than you won't get more than 100 total parcels from
+            each query.</remarks>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.StartLandSearch(OpenMetaverse.DirectoryManager.DirFindFlags,OpenMetaverse.DirectoryManager.SearchTypeFlags,System.Int32,System.Int32,System.Int32)">
+            <summary>
+            Send a request to the data server for land sales listings
+            </summary>
+            <param name="findFlags">Flags sent to specify query options
+            Available flags:
+            Specify the parcel rating with one or more of the following:
+            IncludePG IncludeMature IncludeAdult
+            Specify the field to pre sort the results with ONLY ONE of the following:
+            PerMeterSort NameSort AreaSort PricesSort
+            Specify the order the results are returned in, if not specified the results are pre sorted in a Descending Order
+            SortAsc
+            Specify additional filters to limit the results with one or both of the following:
+            LimitByPrice LimitByArea
+            Flags can be combined by separating them with the | (pipe) character
+            Additional details can be found in <see cref="T:OpenMetaverse.DirectoryManager.DirFindFlags" /></param>
+            <param name="typeFlags">What type of land to search for. Auction,
+            Estate or Mainland</param>
+            <param name="priceLimit">Maximum price to search for when the
+            DirFindFlags.LimitByPrice flag is specified in findFlags</param>
+            <param name="areaLimit">Maximum area to search for when the
+            DirFindFlags.LimitByArea flag is specified in findFlags</param>
+            <param name="queryStart">Each request is limited to 100 parcels
+            being returned. To get the first 100 parcels of a request use 0,
+            from 100-199 use 100, 200-299 use 200, etc.</param>
+            <remarks>
+                <para>The <seealso cref="!:OnDirLandReply" /> event will be raised with the response from the simulator
+            There is no way to determine how many results will be returned, or how many times the callback will be
+            fired other than you won't get more than 100 total parcels from
+            each reply.</para>
+                <para>Any land set for sale to either anybody or specific to the connected agent will be included in the
+            results if the land is included in the query</para>
+            </remarks>
+            <example>
+                <code>
+            // request all mainland, any maturity rating that is larger than 512 sq.m
+            StartLandSearch(DirFindFlags.SortAsc | DirFindFlags.PerMeterSort | DirFindFlags.LimitByArea | DirFindFlags.IncludePG | DirFindFlags.IncludeMature | DirFindFlags.IncludeAdult, SearchTypeFlags.Mainland, 0, 512, 0);
+            </code>
+            </example>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.StartGroupSearch(System.String,System.Int32)">
+            <summary>
+            Search for Groups
+            </summary>
+            <param name="searchText">The name or portion of the name of the group you wish to search for</param>
+            <param name="queryStart">Start from the match number</param>
+            <returns>
+            </returns>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.StartGroupSearch(System.String,System.Int32,OpenMetaverse.DirectoryManager.DirFindFlags)">
+            <summary>
+            Search for Groups
+            </summary>
+            <param name="searchText">The name or portion of the name of the group you wish to search for</param>
+            <param name="queryStart">Start from the match number</param>
+            <param name="flags">Search flags</param>
+            <returns>
+            </returns>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.StartPeopleSearch(System.String,System.Int32)">
+            <summary>
+            Search the People directory for other avatars
+            </summary>
+            <param name="searchText">The name or portion of the name of the avatar you wish to search for</param>
+            <param name="queryStart">
+            </param>
+            <returns>
+            </returns>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.StartPlacesSearch">
+            <summary>
+            Search Places for parcels of land you personally own
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.StartPlacesSearch(OpenMetaverse.UUID)">
+            <summary>
+            Searches Places for land owned by the specified group
+            </summary>
+            <param name="groupID">ID of the group you want to recieve land list for (You must be a member of the group)</param>
+            <returns>Transaction (Query) ID which can be associated with results from your request.</returns>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.StartPlacesSearch(System.String)">
+            <summary>
+            Search the Places directory for parcels that are listed in search and contain the specified keywords
+            </summary>
+            <param name="searchText">A string containing the keywords to search for</param>
+            <returns>Transaction (Query) ID which can be associated with results from your request.</returns>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.StartPlacesSearch(OpenMetaverse.DirectoryManager.DirFindFlags,OpenMetaverse.ParcelCategory,System.String,System.String,OpenMetaverse.UUID,OpenMetaverse.UUID)">
+            <summary>
+            Search Places - All Options
+            </summary>
+            <param name="findFlags">One of the Values from the DirFindFlags struct, ie: AgentOwned, GroupOwned, etc.</param>
+            <param name="searchCategory">One of the values from the SearchCategory Struct, ie: Any, Linden, Newcomer</param>
+            <param name="searchText">A string containing a list of keywords to search for separated by a space character</param>
+            <param name="simulatorName">String Simulator Name to search in</param>
+            <param name="groupID">LLUID of group you want to recieve results for</param>
+            <param name="transactionID">Transaction (Query) ID which can be associated with results from your request.</param>
+            <returns>Transaction (Query) ID which can be associated with results from your request.</returns>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.StartEventsSearch(System.String,System.UInt32)">
+            <summary>
+            Search All Events with specifid searchText in all categories, includes PG, Mature and Adult
+            </summary>
+            <param name="searchText">A string containing a list of keywords to search for separated by a space character</param>
+            <param name="queryStart">Each request is limited to 100 entries
+            being returned. To get the first group of entries of a request use 0,
+            from 100-199 use 100, 200-299 use 200, etc.</param>
+            <returns>UUID of query to correlate results in callback.</returns>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.StartEventsSearch(System.String,OpenMetaverse.DirectoryManager.DirFindFlags,System.String,System.UInt32,OpenMetaverse.DirectoryManager.EventCategories)">
+            <summary>
+            Search Events
+            </summary>
+            <param name="searchText">A string containing a list of keywords to search for separated by a space character</param>
+            <param name="queryFlags">One or more of the following flags: DateEvents, IncludePG, IncludeMature, IncludeAdult
+            from the <see cref="T:OpenMetaverse.DirectoryManager.DirFindFlags" /> Enum
+            Multiple flags can be combined by separating the flags with the | (pipe) character</param>
+            <param name="eventDay">"u" for in-progress and upcoming events, -or- number of days since/until event is scheduled
+            For example "0" = Today, "1" = tomorrow, "2" = following day, "-1" = yesterday, etc.</param>
+            <param name="queryStart">Each request is limited to 100 entries
+            being returned. To get the first group of entries of a request use 0,
+            from 100-199 use 100, 200-299 use 200, etc.</param>
+            <param name="category">EventCategory event is listed under.</param>
+            <returns>UUID of query to correlate results in callback.</returns>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.EventInfoRequest(System.UInt32)">
+            <summary>Requests Event Details</summary>
+            <param name="eventID">ID of Event returned from the <see cref="M:OpenMetaverse.DirectoryManager.StartEventsSearch(System.String,OpenMetaverse.DirectoryManager.DirFindFlags,System.String,System.UInt32,OpenMetaverse.DirectoryManager.EventCategories)" /> method</param>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.DirClassifiedReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.DirLandReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.DirLandReplyEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
+            <summary>Process an incoming <see cref="T:OpenMetaverse.Messages.Linden.DirLandReplyMessage" /> event message</summary>
+            <param name="capsKey">The Unique Capabilities Key</param>
+            <param name="message">The <see cref="T:OpenMetaverse.Messages.Linden.DirLandReplyMessage" /> event message containing the data</param>
+            <param name="simulator">The simulator the message originated from</param>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.DirPeopleReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.DirGroupsReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.PlacesReplyEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
+            <summary>Process an incoming <see cref="T:OpenMetaverse.Messages.Linden.PlacesReplyMessage" /> event message</summary>
+            <param name="capsKey">The Unique Capabilities Key</param>
+            <param name="message">The <see cref="T:OpenMetaverse.Messages.Linden.PlacesReplyMessage" /> event message containing the data</param>
+            <param name="simulator">The simulator the message originated from</param>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.PlacesReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.EventsReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.EventInfoReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="M:OpenMetaverse.DirectoryManager.DirPlacesReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="T:OpenMetaverse.EventInfoReplyEventArgs">
+            <summary>Contains the Event data returned from the data server from an EventInfoRequest</summary>
+        </member>
+        <member name="M:OpenMetaverse.EventInfoReplyEventArgs.#ctor(OpenMetaverse.DirectoryManager.EventInfo)">
+            <summary>Construct a new instance of the EventInfoReplyEventArgs class</summary>
+            <param name="matchedEvent">A single EventInfo object containing the details of an event</param>
+        </member>
+        <member name="P:OpenMetaverse.EventInfoReplyEventArgs.MatchedEvent">
+            <summary>
+            A single EventInfo object containing the details of an event
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.DirEventsReplyEventArgs">
+            <summary>Contains the "Event" detail data returned from the data server</summary>
+        </member>
+        <member name="M:OpenMetaverse.DirEventsReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.EventsSearchData})">
+            <summary>Construct a new instance of the DirEventsReplyEventArgs class</summary>
+            <param name="queryID">The ID of the query returned by the data server.
+            This will correlate to the ID returned by the <see cref="!:StartEventsSearch" /> method</param>
+            <param name="matchedEvents">A list containing the "Events" returned by the search query</param>
+        </member>
+        <member name="P:OpenMetaverse.DirEventsReplyEventArgs.QueryID">
+            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartEventsSearch(System.String,OpenMetaverse.DirectoryManager.DirFindFlags,System.String,System.UInt32,OpenMetaverse.DirectoryManager.EventCategories)" /></summary>
+        </member>
+        <member name="P:OpenMetaverse.DirEventsReplyEventArgs.MatchedEvents">
+            <summary>A list of "Events" returned by the data server</summary>
+        </member>
+        <member name="T:OpenMetaverse.PlacesReplyEventArgs">
+            <summary>Contains the "Event" list data returned from the data server</summary>
+        </member>
+        <member name="M:OpenMetaverse.PlacesReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.PlacesSearchData})">
+            <summary>Construct a new instance of PlacesReplyEventArgs class</summary>
+            <param name="queryID">The ID of the query returned by the data server.
+            This will correlate to the ID returned by the <see cref="!:StartPlacesSearch" /> method</param>
+            <param name="matchedPlaces">A list containing the "Places" returned by the data server query</param>
+        </member>
+        <member name="P:OpenMetaverse.PlacesReplyEventArgs.QueryID">
+            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartPlacesSearch(OpenMetaverse.DirectoryManager.DirFindFlags,OpenMetaverse.ParcelCategory,System.String,System.String,OpenMetaverse.UUID,OpenMetaverse.UUID)" /></summary>
+        </member>
+        <member name="P:OpenMetaverse.PlacesReplyEventArgs.MatchedPlaces">
+            <summary>A list of "Places" returned by the data server</summary>
+        </member>
+        <member name="T:OpenMetaverse.DirPlacesReplyEventArgs">
+            <summary>Contains the places data returned from the data server</summary>
+        </member>
+        <member name="M:OpenMetaverse.DirPlacesReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.DirectoryParcel})">
+            <summary>Construct a new instance of the DirPlacesReplyEventArgs class</summary>
+            <param name="queryID">The ID of the query returned by the data server.
+            This will correlate to the ID returned by the <see cref="!:StartDirPlacesSearch" /> method</param>
+            <param name="matchedParcels">A list containing land data returned by the data server</param>
+        </member>
+        <member name="P:OpenMetaverse.DirPlacesReplyEventArgs.QueryID">
+            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartDirPlacesSearch(System.String,OpenMetaverse.DirectoryManager.DirFindFlags,OpenMetaverse.ParcelCategory,System.Int32)" /></summary>
+        </member>
+        <member name="P:OpenMetaverse.DirPlacesReplyEventArgs.MatchedParcels">
+            <summary>A list containing Places data returned by the data server</summary>
+        </member>
+        <member name="T:OpenMetaverse.DirClassifiedsReplyEventArgs">
+            <summary>Contains the classified data returned from the data server</summary>
+        </member>
+        <member name="M:OpenMetaverse.DirClassifiedsReplyEventArgs.#ctor(System.Collections.Generic.List{OpenMetaverse.DirectoryManager.Classified})">
+            <summary>Construct a new instance of the DirClassifiedsReplyEventArgs class</summary>
+            <param name="classifieds">A list of classified ad data returned from the data server</param>
+        </member>
+        <member name="P:OpenMetaverse.DirClassifiedsReplyEventArgs.Classifieds">
+            <summary>A list containing Classified Ads returned by the data server</summary>
+        </member>
+        <member name="T:OpenMetaverse.DirGroupsReplyEventArgs">
+            <summary>Contains the group data returned from the data server</summary>
+        </member>
+        <member name="M:OpenMetaverse.DirGroupsReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.GroupSearchData})">
+            <summary>Construct a new instance of the DirGroupsReplyEventArgs class</summary>
+            <param name="queryID">The ID of the query returned by the data server.
+            This will correlate to the ID returned by the <see cref="!:StartGroupSearch" /> method</param>
+            <param name="matchedGroups">A list of groups data returned by the data server</param>
+        </member>
+        <member name="P:OpenMetaverse.DirGroupsReplyEventArgs.QueryID">
+            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartGroupSearch(System.String,System.Int32,OpenMetaverse.DirectoryManager.DirFindFlags)" /></summary>
+        </member>
+        <member name="P:OpenMetaverse.DirGroupsReplyEventArgs.MatchedGroups">
+            <summary>A list containing Groups data returned by the data server</summary>
+        </member>
+        <member name="T:OpenMetaverse.DirPeopleReplyEventArgs">
+            <summary>Contains the people data returned from the data server</summary>
+        </member>
+        <member name="M:OpenMetaverse.DirPeopleReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.DirectoryManager.AgentSearchData})">
+            <summary>Construct a new instance of the DirPeopleReplyEventArgs class</summary>
+            <param name="queryID">The ID of the query returned by the data server.
+            This will correlate to the ID returned by the <see cref="!:StartPeopleSearch" /> method</param>
+            <param name="matchedPeople">A list of people data returned by the data server</param>
+        </member>
+        <member name="P:OpenMetaverse.DirPeopleReplyEventArgs.QueryID">
+            <summary>The ID returned by <see cref="M:OpenMetaverse.DirectoryManager.StartPeopleSearch(System.String,System.Int32)" /></summary>
+        </member>
+        <member name="P:OpenMetaverse.DirPeopleReplyEventArgs.MatchedPeople">
+            <summary>A list containing People data returned by the data server</summary>
+        </member>
+        <member name="T:OpenMetaverse.DirLandReplyEventArgs">
+            <summary>Contains the land sales data returned from the data server</summary>
+        </member>
+        <member name="M:OpenMetaverse.DirLandReplyEventArgs.#ctor(System.Collections.Generic.List{OpenMetaverse.DirectoryManager.DirectoryParcel})">
+            <summary>Construct a new instance of the DirLandReplyEventArgs class</summary>
+            <param name="dirParcels">A list of parcels for sale returned by the data server</param>
+        </member>
+        <member name="P:OpenMetaverse.DirLandReplyEventArgs.DirParcels">
+            <summary>A list containing land forsale data returned by the data server</summary>
+        </member>
+        <member name="T:OpenMetaverse.DownloadRequest">
+            <summary>
+            Represends individual HTTP Download request
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.DownloadRequest.#ctor">
+            <summary>Default constructor</summary>
+        </member>
+        <member name="M:OpenMetaverse.DownloadRequest.#ctor(System.Uri,System.Int32,System.String,OpenMetaverse.Http.CapsBase.DownloadProgressEventHandler,OpenMetaverse.Http.CapsBase.RequestCompletedEventHandler)">
+            <summary>Constructor</summary>
+        </member>
+        <member name="F:OpenMetaverse.DownloadRequest.Address">
+            <summary>URI of the item to fetch</summary>
+        </member>
+        <member name="F:OpenMetaverse.DownloadRequest.MillisecondsTimeout">
+            <summary>Timout specified in milliseconds</summary>
+        </member>
+        <member name="F:OpenMetaverse.DownloadRequest.DownloadProgressCallback">
+            <summary>Download progress callback</summary>
+        </member>
+        <member name="F:OpenMetaverse.DownloadRequest.CompletedCallback">
+            <summary>Download completed callback</summary>
+        </member>
+        <member name="F:OpenMetaverse.DownloadRequest.ContentType">
+            <summary>Accept the following content type</summary>
+        </member>
+        <member name="T:OpenMetaverse.DownloadManager">
+            <summary>
+            Manages async HTTP downloads with a limit on maximum
+            concurrent downloads
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.DownloadManager.#ctor">
+            <summary>Default constructor</summary>
+        </member>
+        <member name="P:OpenMetaverse.DownloadManager.ParallelDownloads">
+            <summary>Maximum number of parallel downloads from a single endpoint</summary>
+        </member>
+        <member name="P:OpenMetaverse.DownloadManager.ClientCert">
+            <summary>Client certificate</summary>
+        </member>
+        <member name="M:OpenMetaverse.DownloadManager.Dispose">
+            <summary>Cleanup method</summary>
+        </member>
+        <member name="M:OpenMetaverse.DownloadManager.SetupRequest(System.Uri,System.String)">
+            <summary>Setup http download request</summary>
+        </member>
+        <member name="M:OpenMetaverse.DownloadManager.EnqueuePending">
+            <summary>Check the queue for pending work</summary>
+        </member>
+        <member name="M:OpenMetaverse.DownloadManager.QueueDownlad(OpenMetaverse.DownloadRequest)">
+            <summary>Enqueue a new HTPP download</summary>
+        </member>
+        <member name="T:OpenMetaverse.EstateTask">
+            <summary>Describes tasks returned in LandStatReply</summary>
+        </member>
+        <member name="T:OpenMetaverse.EstateTools">
+            <summary>
+            Estate level administration and utilities
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Constructor for EstateTools class
+            </summary>
+            <param name="client">
+            </param>
+        </member>
+        <member name="T:OpenMetaverse.EstateTools.LandStatReportType">
+            <summary>Used in the ReportType field of a LandStatRequest</summary>
+        </member>
+        <member name="T:OpenMetaverse.EstateTools.EstateAccessDelta">
+            <summary>Used by EstateOwnerMessage packets</summary>
+        </member>
+        <member name="T:OpenMetaverse.EstateTools.EstateAccessReplyDelta">
+            <summary>Used by EstateOwnerMessage packets</summary>
+        </member>
+        <member name="T:OpenMetaverse.EstateTools.EstateReturnFlags">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.EstateTools.EstateReturnFlags.None">
+            <summary>No flags set</summary>
+        </member>
+        <member name="F:OpenMetaverse.EstateTools.EstateReturnFlags.ReturnScripted">
+            <summary>Only return targets scripted objects</summary>
+        </member>
+        <member name="F:OpenMetaverse.EstateTools.EstateReturnFlags.ReturnOnOthersLand">
+            <summary>Only return targets objects if on others land</summary>
+        </member>
+        <member name="F:OpenMetaverse.EstateTools.EstateReturnFlags.ReturnScriptedAndOnOthers">
+            <summary>Returns target's scripted objects and objects on other parcels</summary>
+        </member>
+        <member name="T:OpenMetaverse.EstateTools.GroundTextureSettings">
+            <summary>Ground texture settings for each corner of the region</summary>
+        </member>
+        <member name="T:OpenMetaverse.EstateTools.GroundTextureHeight">
+            <summary>Used by GroundTextureHeightSettings</summary>
+        </member>
+        <member name="T:OpenMetaverse.EstateTools.GroundTextureHeightSettings">
+            <summary>The high and low texture thresholds for each corner of the sim</summary>
+        </member>
+        <member name="F:OpenMetaverse.EstateTools.GroundTextures">
+            <summary>Textures for each of the four terrain height levels</summary>
+        </member>
+        <member name="F:OpenMetaverse.EstateTools.GroundTextureLimits">
+            <summary>Upper/lower texture boundaries for each corner of the sim</summary>
+        </member>
+        <member name="F:OpenMetaverse.EstateTools.m_TopCollidersReply">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnSimParcelsDownloaded(OpenMetaverse.SimParcelsDownloadedEventArgs)">
-            <summary>Raises the SimParcelsDownloaded event</summary>
-            <param name="e">A SimParcelsDownloadedEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="F:OpenMetaverse.EstateTools.m_TopCollidersReply_Lock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_SimParcelsDownloadedLock">
+        <member name="F:OpenMetaverse.EstateTools.m_TopScriptsReply">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.EstateTools.m_TopScriptsReply_Lock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ForceSelectObjects">
+        <member name="F:OpenMetaverse.EstateTools.m_EstateUsersReply">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnForceSelectObjectsReply(OpenMetaverse.ForceSelectObjectsReplyEventArgs)">
-            <summary>Raises the ForceSelectObjectsReply event</summary>
-            <param name="e">A ForceSelectObjectsReplyEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="F:OpenMetaverse.EstateTools.m_EstateUsersReply_Lock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ForceSelectObjectsLock">
+        <member name="F:OpenMetaverse.EstateTools.m_EstateGroupsReply">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.EstateTools.m_EstateGroupsReply_Lock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelMediaUpdateReply">
+        <member name="F:OpenMetaverse.EstateTools.m_EstateManagersReply">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnParcelMediaUpdateReply(OpenMetaverse.ParcelMediaUpdateReplyEventArgs)">
-            <summary>Raises the ParcelMediaUpdateReply event</summary>
-            <param name="e">A ParcelMediaUpdateReplyEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="F:OpenMetaverse.EstateTools.m_EstateManagersReply_Lock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelMediaUpdateReplyLock">
+        <member name="F:OpenMetaverse.EstateTools.m_EstateBansReply">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.EstateTools.m_EstateBansReply_Lock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelMediaCommand">
+        <member name="F:OpenMetaverse.EstateTools.m_EstateCovenantReply">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.OnParcelMediaCommand(OpenMetaverse.ParcelMediaCommandEventArgs)">
-            <summary>Raises the ParcelMediaCommand event</summary>
-            <param name="e">A ParcelMediaCommandEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="F:OpenMetaverse.EstateTools.m_EstateCovenantReply_Lock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.m_ParcelMediaCommandLock">
+        <member name="F:OpenMetaverse.EstateTools.m_EstateUpdateInfoReply">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.EstateTools.m_EstateUpdateInfoReply_Lock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="E:OpenMetaverse.EstateTools.TopCollidersReply">
+            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)" /> request.</summary>
+        </member>
+        <member name="E:OpenMetaverse.EstateTools.TopScriptsReply">
+            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)" /> request.</summary>
+        </member>
+        <member name="E:OpenMetaverse.EstateTools.EstateUsersReply">
+            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)" /> request.</summary>
+        </member>
+        <member name="E:OpenMetaverse.EstateTools.EstateGroupsReply">
+            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)" /> request.</summary>
+        </member>
+        <member name="E:OpenMetaverse.EstateTools.EstateManagersReply">
+            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)" /> request.</summary>
+        </member>
+        <member name="E:OpenMetaverse.EstateTools.EstateBansReply">
+            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)" /> request.</summary>
+        </member>
+        <member name="E:OpenMetaverse.EstateTools.EstateCovenantReply">
+            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)" /> request.</summary>
+        </member>
+        <member name="E:OpenMetaverse.EstateTools.EstateUpdateInfoReply">
+            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)" /> request.</summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.OnTopCollidersReply(OpenMetaverse.TopCollidersReplyEventArgs)">
+            <summary>Raises the TopCollidersReply event</summary>
+            <param name="e">A TopCollidersReplyEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.OnTopScriptsReply(OpenMetaverse.TopScriptsReplyEventArgs)">
+            <summary>Raises the TopScriptsReply event</summary>
+            <param name="e">A TopScriptsReplyEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.OnEstateUsersReply(OpenMetaverse.EstateUsersReplyEventArgs)">
+            <summary>Raises the EstateUsersReply event</summary>
+            <param name="e">A EstateUsersReplyEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.OnEstateGroupsReply(OpenMetaverse.EstateGroupsReplyEventArgs)">
+            <summary>Raises the EstateGroupsReply event</summary>
+            <param name="e">A EstateGroupsReplyEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.OnEstateManagersReply(OpenMetaverse.EstateManagersReplyEventArgs)">
+            <summary>Raises the EstateManagersReply event</summary>
+            <param name="e">A EstateManagersReplyEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.OnEstateBansReply(OpenMetaverse.EstateBansReplyEventArgs)">
+            <summary>Raises the EstateBansReply event</summary>
+            <param name="e">A EstateBansReplyEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.OnEstateCovenantReply(OpenMetaverse.EstateCovenantReplyEventArgs)">
+            <summary>Raises the EstateCovenantReply event</summary>
+            <param name="e">A EstateCovenantReplyEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.OnEstateUpdateInfoReply(OpenMetaverse.EstateUpdateInfoReplyEventArgs)">
+            <summary>Raises the EstateUpdateInfoReply event</summary>
+            <param name="e">A EstateUpdateInfoReplyEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)">
+            <summary>
+            Requests estate information such as top scripts and colliders
+            </summary>
+            <param name="parcelLocalID">
+            </param>
+            <param name="reportType">
+            </param>
+            <param name="requestFlags">
+            </param>
+            <param name="filter">
+            </param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.RequestInfo">
+            <summary>Requests estate settings, including estate manager and access/ban lists</summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.RequestTopScripts">
+            <summary>Requests the "Top Scripts" list for the current region</summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.RequestTopColliders">
+            <summary>Requests the "Top Colliders" list for the current region</summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.SetTerrainVariables(System.Single,System.Single,System.Single,System.Boolean,System.Boolean,System.Single)">
+            <summary>
+            Set several estate specific configuration variables
+            </summary>
+            <param name="WaterHeight">The Height of the waterlevel over the entire estate. Defaults to 20</param>
+            <param name="TerrainRaiseLimit">The maximum height change allowed above the baked terrain. Defaults to 4</param>
+            <param name="TerrainLowerLimit">The minimum height change allowed below the baked terrain. Defaults to -4</param>
+            <param name="UseEstateSun">true to use</param>
+            <param name="FixedSun">if True forces the sun position to the position in SunPosition</param>
+            <param name="SunPosition">The current position of the sun on the estate, or when FixedSun is true the static position
+            the sun will remain. <remarks>6.0 = Sunrise, 30.0 = Sunset</remarks></param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.SimWideReturn(OpenMetaverse.UUID,OpenMetaverse.EstateTools.EstateReturnFlags,System.Boolean)">
+            <summary>
+            Request return of objects owned by specified avatar
+            </summary>
+            <param name="Target">The Agents <see cref="T:OpenMetaverse.UUID" /> owning the primitives to return</param>
+            <param name="flag">specify the coverage and type of objects to be included in the return</param>
+            <param name="EstateWide">true to perform return on entire estate</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.EstateOwnerMessage(System.String,System.String)">
+            <summary>
+            </summary>
+            <param name="method">
+            </param>
+            <param name="param">
+            </param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.EstateOwnerMessage(System.String,System.Collections.Generic.List{System.String})">
+            <summary>
+            Used for setting and retrieving various estate panel settings
+            </summary>
+            <param name="method">EstateOwnerMessage Method field</param>
+            <param name="listParams">List of parameters to include</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.KickUser(OpenMetaverse.UUID)">
+            <summary>
+            Kick an avatar from an estate
+            </summary>
+            <param name="userID">Key of Agent to remove</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.BanUser(OpenMetaverse.UUID,System.Boolean)">
+            <summary>
+            Ban an avatar from an estate</summary>
+            <param name="userID">Key of Agent to remove</param>
+            <param name="allEstates">Ban user from this estate and all others owned by the estate owner</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.UnbanUser(OpenMetaverse.UUID,System.Boolean)">
+            <summary>Unban an avatar from an estate</summary>
+            <param name="userID">Key of Agent to remove</param>
+            /// <param name="allEstates">Unban user from this estate and all others owned by the estate owner</param></member>
+        <member name="M:OpenMetaverse.EstateTools.EstateMessage(System.String)">
+            <summary>
+            Send a message dialog to everyone in an entire estate
+            </summary>
+            <param name="message">Message to send all users in the estate</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.SimulatorMessage(System.String)">
+            <summary>
+            Send a message dialog to everyone in a simulator
+            </summary>
+            <param name="message">Message to send all users in the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.TeleportHomeUser(OpenMetaverse.UUID)">
+            <summary>
+            Send an avatar back to their home location
+            </summary>
+            <param name="pest">Key of avatar to send home</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.RestartRegion">
+            <summary>
+            Begin the region restart process
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.CancelRestart">
+            <summary>
+            Cancels a region restart
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.SetRegionInfo(System.Boolean,System.Boolean,System.Boolean,System.Boolean,System.Boolean,System.Boolean,System.Single,System.Single,System.Boolean)">
+            <summary>Estate panel "Region" tab settings</summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.SetRegionDebug(System.Boolean,System.Boolean,System.Boolean)">
+            <summary>Estate panel "Debug" tab settings</summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.SetRegionTerrain(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID)">
+            <summary>Used for setting the region's terrain textures for its four height levels</summary>
+            <param name="low">
+            </param>
+            <param name="midLow">
+            </param>
+            <param name="midHigh">
+            </param>
+            <param name="high">
+            </param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.SetRegionTerrainHeights(System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single)">
+            <summary>Used for setting sim terrain texture heights</summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.RequestCovenant">
+            <summary>Requests the estate covenant</summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.UploadTerrain(System.Byte[],System.String)">
+            <summary>
+            Upload a terrain RAW file
+            </summary>
+            <param name="fileData">A byte array containing the encoded terrain data</param>
+            <param name="fileName">The name of the file being uploaded</param>
+            <returns>The Id of the transfer request</returns>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.TeleportHomeAllUsers">
+            <summary>
+            Teleports all users home in current Estate
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.RemoveEstateManager(OpenMetaverse.UUID,System.Boolean)">
+            <summary>
+            Remove estate manager</summary>
+            <param name="userID">Key of Agent to Remove</param>
+            <param name="allEstates">removes manager to this estate and all others owned by the estate owner</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.AddEstateManager(OpenMetaverse.UUID,System.Boolean)">
+            <summary>
+            Add estate manager</summary>
+            <param name="userID">Key of Agent to Add</param>
+            <param name="allEstates">Add agent as manager to this estate and all others owned by the estate owner</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.AddAllowedUser(OpenMetaverse.UUID,System.Boolean)">
+            <summary>
+            Add's an agent to the estate Allowed list</summary>
+            <param name="userID">Key of Agent to Add</param>
+            <param name="allEstates">Add agent as an allowed reisdent to All estates if true</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.RemoveAllowedUser(OpenMetaverse.UUID,System.Boolean)">
+            <summary>
+            Removes an agent from the estate Allowed list</summary>
+            <param name="userID">Key of Agent to Remove</param>
+            <param name="allEstates">Removes agent as an allowed reisdent from All estates if true</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.AddAllowedGroup(OpenMetaverse.UUID,System.Boolean)">
+            <summary>
+            Add's a group to the estate Allowed list</summary>
+            <param name="groupID">Key of Group to Add</param>
+            <param name="allEstates">Add Group as an allowed group to All estates if true</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.RemoveAllowedGroup(OpenMetaverse.UUID,System.Boolean)">
+            <summary>
+            Removes a group from the estate Allowed list</summary>
+            <param name="groupID">Key of Group to Remove</param>
+            <param name="allEstates">Removes Group as an allowed Group from All estates if true</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.EstateCovenantReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.EstateOwnerMessageHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="M:OpenMetaverse.EstateTools.LandStatReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="T:OpenMetaverse.TopCollidersReplyEventArgs">
+            <summary>Raised on LandStatReply when the report type is for "top colliders"</summary>
+        </member>
+        <member name="M:OpenMetaverse.TopCollidersReplyEventArgs.#ctor(System.Int32,System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.EstateTask})">
+            <summary>Construct a new instance of the TopCollidersReplyEventArgs class</summary>
+            <param name="objectCount">The number of returned items in LandStatReply</param>
+            <param name="tasks">Dictionary of Object UUIDs to tasks returned in LandStatReply</param>
+        </member>
+        <member name="P:OpenMetaverse.TopCollidersReplyEventArgs.ObjectCount">
+            <summary>
+            The number of returned items in LandStatReply
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.TopCollidersReplyEventArgs.Tasks">
+            <summary>
+            A Dictionary of Object UUIDs to tasks returned in LandStatReply
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.TopScriptsReplyEventArgs">
+            <summary>Raised on LandStatReply when the report type is for "top Scripts"</summary>
+        </member>
+        <member name="M:OpenMetaverse.TopScriptsReplyEventArgs.#ctor(System.Int32,System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.EstateTask})">
+            <summary>Construct a new instance of the TopScriptsReplyEventArgs class</summary>
+            <param name="objectCount">The number of returned items in LandStatReply</param>
+            <param name="tasks">Dictionary of Object UUIDs to tasks returned in LandStatReply</param>
+        </member>
+        <member name="P:OpenMetaverse.TopScriptsReplyEventArgs.ObjectCount">
+            <summary>
+            The number of scripts returned in LandStatReply
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.TopScriptsReplyEventArgs.Tasks">
+            <summary>
+            A Dictionary of Object UUIDs to tasks returned in LandStatReply
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.EstateBansReplyEventArgs">
+            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateBansReplyEventArgs.#ctor(System.UInt32,System.Int32,System.Collections.Generic.List{OpenMetaverse.UUID})">
+            <summary>Construct a new instance of the EstateBansReplyEventArgs class</summary>
+            <param name="estateID">The estate's identifier on the grid</param>
+            <param name="count">The number of returned items in LandStatReply</param>
+            <param name="banned">User UUIDs banned</param>
+        </member>
+        <member name="P:OpenMetaverse.EstateBansReplyEventArgs.EstateID">
+            <summary>
+            The identifier of the estate
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.EstateBansReplyEventArgs.Count">
+            <summary>
+            The number of returned itmes
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.EstateBansReplyEventArgs.Banned">
+            <summary>
+            List of UUIDs of Banned Users
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.EstateUsersReplyEventArgs">
+            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateUsersReplyEventArgs.#ctor(System.UInt32,System.Int32,System.Collections.Generic.List{OpenMetaverse.UUID})">
+            <summary>Construct a new instance of the EstateUsersReplyEventArgs class</summary>
+            <param name="estateID">The estate's identifier on the grid</param>
+            <param name="count">The number of users</param>
+            <param name="allowedUsers">Allowed users UUIDs</param>
+        </member>
+        <member name="P:OpenMetaverse.EstateUsersReplyEventArgs.EstateID">
+            <summary>
+            The identifier of the estate
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.EstateUsersReplyEventArgs.Count">
+            <summary>
+            The number of returned items
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.EstateUsersReplyEventArgs.AllowedUsers">
+            <summary>
+            List of UUIDs of Allowed Users
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.EstateGroupsReplyEventArgs">
+            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateGroupsReplyEventArgs.#ctor(System.UInt32,System.Int32,System.Collections.Generic.List{OpenMetaverse.UUID})">
+            <summary>Construct a new instance of the EstateGroupsReplyEventArgs class</summary>
+            <param name="estateID">The estate's identifier on the grid</param>
+            <param name="count">The number of Groups</param>
+            <param name="allowedGroups">Allowed Groups UUIDs</param>
+        </member>
+        <member name="P:OpenMetaverse.EstateGroupsReplyEventArgs.EstateID">
+            <summary>
+            The identifier of the estate
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.EstateGroupsReplyEventArgs.Count">
+            <summary>
+            The number of returned items
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.EstateGroupsReplyEventArgs.AllowedGroups">
+            <summary>
+            List of UUIDs of Allowed Groups
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.EstateManagersReplyEventArgs">
+            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateManagersReplyEventArgs.#ctor(System.UInt32,System.Int32,System.Collections.Generic.List{OpenMetaverse.UUID})">
+            <summary>Construct a new instance of the EstateManagersReplyEventArgs class</summary>
+            <param name="estateID">The estate's identifier on the grid</param>
+            <param name="count">The number of Managers</param>
+            <param name="managers"> Managers UUIDs</param>
+        </member>
+        <member name="P:OpenMetaverse.EstateManagersReplyEventArgs.EstateID">
+            <summary>
+            The identifier of the estate
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.EstateManagersReplyEventArgs.Count">
+            <summary>
+            The number of returned items
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.EstateManagersReplyEventArgs.Managers">
+            <summary>
+            List of UUIDs of the Estate's Managers
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.EstateCovenantReplyEventArgs">
+            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateCovenantReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Int64,System.String,OpenMetaverse.UUID)">
+            <summary>Construct a new instance of the EstateCovenantReplyEventArgs class</summary>
+            <param name="covenantID">The Covenant ID</param>
+            <param name="timestamp">The timestamp</param>
+            <param name="estateName">The estate's name</param>
+            <param name="estateOwnerID">The Estate Owner's ID (can be a GroupID)</param>
+        </member>
+        <member name="P:OpenMetaverse.EstateCovenantReplyEventArgs.CovenantID">
+            <summary>
+            The Covenant
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.EstateCovenantReplyEventArgs.Timestamp">
+            <summary>
+            The timestamp
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.EstateCovenantReplyEventArgs.EstateName">
+            <summary>
+            The Estate name
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.EstateCovenantReplyEventArgs.EstateOwnerID">
+            <summary>
+            The Estate Owner's ID (can be a GroupID)
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.EstateUpdateInfoReplyEventArgs">
+            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
+        </member>
+        <member name="M:OpenMetaverse.EstateUpdateInfoReplyEventArgs.#ctor(System.String,OpenMetaverse.UUID,System.UInt32,System.Boolean)">
+            <summary>Construct a new instance of the EstateUpdateInfoReplyEventArgs class</summary>
+            <param name="estateName">The estate's name</param>
+            <param name="estateOwner">The Estate Owners ID (can be a GroupID)</param>
+            <param name="estateID">The estate's identifier on the grid</param>
+            <param name="denyNoPaymentInfo">
+            </param>
+        </member>
+        <member name="P:OpenMetaverse.EstateUpdateInfoReplyEventArgs.EstateName">
+            <summary>
+            The estate's name
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.EstateUpdateInfoReplyEventArgs.EstateOwner">
+            <summary>
+            The Estate Owner's ID (can be a GroupID)
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.EstateUpdateInfoReplyEventArgs.EstateID">
+            <summary>
+            The identifier of the estate on the grid
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.EstateUpdateInfoReplyEventArgs.DenyNoPaymentInfo">
+            <summary>
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.PacketEventDictionary">
+            <summary>
+            Registers, unregisters, and fires events generated by incoming packets
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.PacketEventDictionary.#ctor(OpenMetaverse.GridClient)">
             <summary>
             Default constructor
             </summary>
-            <param name="client">A reference to the GridClient object</param>
+            <param name="client">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.RequestParcelInfo(OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.PacketEventDictionary.PacketCallbackWrapper">
             <summary>
-            Request basic information for a single parcel
+            Object that is passed to worker threads in the ThreadPool for
+            firing packet callbacks
             </summary>
-            <param name="parcelID">Simulator-local ID of the parcel</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.RequestParcelProperties(OpenMetaverse.Simulator,System.Int32,System.Int32)">
+        <member name="F:OpenMetaverse.PacketEventDictionary.PacketCallbackWrapper.Callback">
+            <summary>Callback to fire for this packet</summary>
+        </member>
+        <member name="F:OpenMetaverse.PacketEventDictionary.PacketCallbackWrapper.Simulator">
+            <summary>Reference to the simulator that this packet came from</summary>
+        </member>
+        <member name="F:OpenMetaverse.PacketEventDictionary.PacketCallbackWrapper.Packet">
+            <summary>The packet that needs to be processed</summary>
+        </member>
+        <member name="F:OpenMetaverse.PacketEventDictionary.Client">
+            <summary>Reference to the GridClient object</summary>
+        </member>
+        <member name="M:OpenMetaverse.PacketEventDictionary.RegisterEvent(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs},System.Boolean)">
             <summary>
-            Request properties of a single parcel
+            Register an event handler
             </summary>
-            <param name="simulator">Simulator containing the parcel</param>
-            <param name="localID">Simulator-local ID of the parcel</param>
-            <param name="sequenceID">An arbitrary integer that will be returned
-            with the ParcelProperties reply, useful for distinguishing between
-            multiple simultaneous requests</param>
+            <remarks>Use PacketType.Default to fire this event on every
+            incoming packet</remarks>
+            <param name="packetType">Packet type to register the handler for</param>
+            <param name="eventHandler">Callback to be fired</param>
+            <param name="isAsync">True if this callback should be ran
+            asynchronously, false to run it synchronous</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.RequestParcelAccessList(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.AccessList,System.Int32)">
+        <member name="M:OpenMetaverse.PacketEventDictionary.UnregisterEvent(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs})">
             <summary>
-            Request the access list for a single parcel
+            Unregister an event handler
             </summary>
-            <param name="simulator">Simulator containing the parcel</param>
-            <param name="localID">Simulator-local ID of the parcel</param>
-            <param name="sequenceID">An arbitrary integer that will be returned
-            with the ParcelAccessList reply, useful for distinguishing between
-            multiple simultaneous requests</param>
-            <param name="flags"></param>
+            <param name="packetType">Packet type to unregister the handler for</param>
+            <param name="eventHandler">Callback to be unregistered</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.RequestParcelProperties(OpenMetaverse.Simulator,System.Single,System.Single,System.Single,System.Single,System.Int32,System.Boolean)">
+        <member name="M:OpenMetaverse.PacketEventDictionary.RaiseEvent(OpenMetaverse.Packets.PacketType,OpenMetaverse.Packets.Packet,OpenMetaverse.Simulator)">
             <summary>
-            Request properties of parcels using a bounding box selection
+            Fire the events registered for this packet type
             </summary>
-            <param name="simulator">Simulator containing the parcel</param>
-            <param name="north">Northern boundary of the parcel selection</param>
-            <param name="east">Eastern boundary of the parcel selection</param>
-            <param name="south">Southern boundary of the parcel selection</param>
-            <param name="west">Western boundary of the parcel selection</param>
-            <param name="sequenceID">An arbitrary integer that will be returned
-            with the ParcelProperties reply, useful for distinguishing between
-            different types of parcel property requests</param>
-            <param name="snapSelection">A boolean that is returned with the
-            ParcelProperties reply, useful for snapping focus to a single
-            parcel</param>
+            <param name="packetType">Incoming packet type</param>
+            <param name="packet">Incoming packet</param>
+            <param name="simulator">Simulator this packet was received from</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.RequestAllSimParcels(OpenMetaverse.Simulator)">
+        <member name="T:OpenMetaverse.CapsEventDictionary">
             <summary>
-            Request all simulator parcel properties (used for populating the <code>Simulator.Parcels</code> 
-            dictionary)
+            Registers, unregisters, and fires events generated by the Capabilities
+            event queue
             </summary>
-            <param name="simulator">Simulator to request parcels from (must be connected)</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.RequestAllSimParcels(OpenMetaverse.Simulator,System.Boolean,System.Int32)">
+        <member name="M:OpenMetaverse.CapsEventDictionary.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            Request all simulator parcel properties (used for populating the <code>Simulator.Parcels</code> 
-            dictionary)
+            Default constructor
             </summary>
-            <param name="simulator">Simulator to request parcels from (must be connected)</param>
-            <param name="refresh">If TRUE, will force a full refresh</param>
-            <param name="msDelay">Number of milliseconds to pause in between each request</param>
+            <param name="client">Reference to the GridClient object</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.RequestDwell(OpenMetaverse.Simulator,System.Int32)">
+        <member name="T:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper">
             <summary>
-            Request the dwell value for a parcel
+            Object that is passed to worker threads in the ThreadPool for
+            firing CAPS callbacks
             </summary>
-            <param name="simulator">Simulator containing the parcel</param>
-            <param name="localID">Simulator-local ID of the parcel</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.Buy(OpenMetaverse.Simulator,System.Int32,System.Boolean,OpenMetaverse.UUID,System.Boolean,System.Int32,System.Int32)">
+        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.Callback">
+            <summary>Callback to fire for this packet</summary>
+        </member>
+        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.CapsEvent">
+            <summary>Name of the CAPS event</summary>
+        </member>
+        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.Message">
+            <summary>Strongly typed decoded data</summary>
+        </member>
+        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.Simulator">
+            <summary>Reference to the simulator that generated this event</summary>
+        </member>
+        <member name="F:OpenMetaverse.CapsEventDictionary.Client">
+            <summary>Reference to the GridClient object</summary>
+        </member>
+        <member name="M:OpenMetaverse.CapsEventDictionary.RegisterEvent(System.String,OpenMetaverse.Caps.EventQueueCallback)">
             <summary>
-            Send a request to Purchase a parcel of land
+            Register an new event handler for a capabilities event sent via the EventQueue
             </summary>
-            <param name="simulator">The Simulator the parcel is located in</param>
-            <param name="localID">The parcels region specific local ID</param>
-            <param name="forGroup">true if this parcel is being purchased by a group</param>
-            <param name="groupID">The groups <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <param name="removeContribution">true to remove tier contribution if purchase is successful</param>
-            <param name="parcelArea">The parcels size</param>
-            <param name="parcelPrice">The purchase price of the parcel</param>
-            <returns></returns>
+            <remarks>Use String.Empty to fire this event on every CAPS event</remarks>
+            <param name="capsEvent">Capability event name to register the
+            handler for</param>
+            <param name="eventHandler">Callback to fire</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.Reclaim(OpenMetaverse.Simulator,System.Int32)">
+        <member name="M:OpenMetaverse.CapsEventDictionary.UnregisterEvent(System.String,OpenMetaverse.Caps.EventQueueCallback)">
             <summary>
-            Reclaim a parcel of land
+            Unregister a previously registered capabilities handler
             </summary>
-            <param name="simulator">The simulator the parcel is in</param>
-            <param name="localID">The parcels region specific local ID</param>
+            <param name="capsEvent">Capability event name unregister the
+            handler for</param>
+            <param name="eventHandler">Callback to unregister</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.DeedToGroup(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.CapsEventDictionary.RaiseEvent(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            Deed a parcel to a group
+            Fire the events registered for this event type synchronously
             </summary>
-            <param name="simulator">The simulator the parcel is in</param>
-            <param name="localID">The parcels region specific local ID</param>
-            <param name="groupID">The groups <seealso cref="T:OpenMetaverse.UUID"/></param>
+            <param name="capsEvent">Capability name</param>
+            <param name="message">Decoded event body</param>
+            <param name="simulator">Reference to the simulator that
+            generated this event</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.RequestObjectOwners(OpenMetaverse.Simulator,System.Int32)">
+        <member name="M:OpenMetaverse.CapsEventDictionary.BeginRaiseEvent(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            Request prim owners of a parcel of land.
+            Fire the events registered for this event type asynchronously
             </summary>
-            <param name="simulator">Simulator parcel is in</param>
-            <param name="localID">The parcels region specific local ID</param>
+            <param name="capsEvent">Capability name</param>
+            <param name="message">Decoded event body</param>
+            <param name="simulator">Reference to the simulator that
+            generated this event</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.ReturnObjects(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.ObjectReturnType,System.Collections.Generic.List{OpenMetaverse.UUID})">
+        <member name="T:OpenMetaverse.FriendRights">
             <summary>
-            Return objects from a parcel
             </summary>
-            <param name="simulator">Simulator parcel is in</param>
-            <param name="localID">The parcels region specific local ID</param>
-            <param name="type">the type of objects to return, <seealso cref="T:OpenMetaverse.ObjectReturnType"/></param>
-            <param name="ownerIDs">A list containing object owners <seealso cref="T:OpenMetaverse.UUID"/>s to return</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.ParcelSubdivide(OpenMetaverse.Simulator,System.Single,System.Single,System.Single,System.Single)">
+        <member name="F:OpenMetaverse.FriendRights.None">
+            <summary>The avatar has no rights</summary>
+        </member>
+        <member name="F:OpenMetaverse.FriendRights.CanSeeOnline">
+            <summary>The avatar can see the online status of the target avatar</summary>
+        </member>
+        <member name="F:OpenMetaverse.FriendRights.CanSeeOnMap">
+            <summary>The avatar can see the location of the target avatar on the map</summary>
+        </member>
+        <member name="F:OpenMetaverse.FriendRights.CanModifyObjects">
+            <summary>The avatar can modify the ojects of the target avatar </summary>
+        </member>
+        <member name="T:OpenMetaverse.FriendInfo">
             <summary>
-            Subdivide (split) a parcel
+            This class holds information about an avatar in the friends list.  There are two ways
+            to interface to this class.  The first is through the set of boolean properties.  This is the typical
+            way clients of this class will use it.  The second interface is through two bitflag properties,
+            TheirFriendsRights and MyFriendsRights
             </summary>
-            <param name="simulator"></param>
-            <param name="west"></param>
-            <param name="south"></param>
-            <param name="east"></param>
-            <param name="north"></param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.ParcelJoin(OpenMetaverse.Simulator,System.Single,System.Single,System.Single,System.Single)">
+        <member name="M:OpenMetaverse.FriendInfo.#ctor(OpenMetaverse.UUID,OpenMetaverse.FriendRights,OpenMetaverse.FriendRights)">
             <summary>
-            Join two parcels of land creating a single parcel
+            Used internally when building the initial list of friends at login time
             </summary>
-            <param name="simulator"></param>
-            <param name="west"></param>
-            <param name="south"></param>
-            <param name="east"></param>
-            <param name="north"></param>
+            <param name="id">System ID of the avatar being prepesented</param>
+            <param name="theirRights">Rights the friend has to see you online and to modify your objects</param>
+            <param name="myRights">Rights you have to see your friend online and to modify their objects</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.GetParcelLocalID(OpenMetaverse.Simulator,OpenMetaverse.Vector3)">
+        <member name="P:OpenMetaverse.FriendInfo.UUID">
             <summary>
-            Get a parcels LocalID
+            System ID of the avatar
             </summary>
-            <param name="simulator">Simulator parcel is in</param>
-            <param name="position">Vector3 position in simulator (Z not used)</param>
-            <returns>0 on failure, or parcel LocalID on success.</returns>
-            <remarks>A call to <code>Parcels.RequestAllSimParcels</code> is required to populate map and
-            dictionary.</remarks>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.Terraform(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.TerraformAction,OpenMetaverse.TerraformBrushSize)">
+        <member name="P:OpenMetaverse.FriendInfo.Name">
             <summary>
-            Terraform (raise, lower, etc) an area or whole parcel of land
+            full name of the avatar
             </summary>
-            <param name="simulator">Simulator land area is in.</param>
-            <param name="localID">LocalID of parcel, or -1 if using bounding box</param>
-            <param name="action">From Enum, Raise, Lower, Level, Smooth, Etc.</param>
-            <param name="brushSize">Size of area to modify</param>
-            <returns>true on successful request sent.</returns>
-            <remarks>Settings.STORE_LAND_PATCHES must be true, 
-            Parcel information must be downloaded using <code>RequestAllSimParcels()</code></remarks>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.Terraform(OpenMetaverse.Simulator,System.Single,System.Single,System.Single,System.Single,OpenMetaverse.TerraformAction,OpenMetaverse.TerraformBrushSize)">
+        <member name="P:OpenMetaverse.FriendInfo.IsOnline">
             <summary>
-            Terraform (raise, lower, etc) an area or whole parcel of land
+            True if the avatar is online
             </summary>
-            <param name="simulator">Simulator land area is in.</param>
-            <param name="west">west border of area to modify</param>
-            <param name="south">south border of area to modify</param>
-            <param name="east">east border of area to modify</param>
-            <param name="north">north border of area to modify</param>
-            <param name="action">From Enum, Raise, Lower, Level, Smooth, Etc.</param>
-            <param name="brushSize">Size of area to modify</param>
-            <returns>true on successful request sent.</returns>
-            <remarks>Settings.STORE_LAND_PATCHES must be true, 
-            Parcel information must be downloaded using <code>RequestAllSimParcels()</code></remarks>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.Terraform(OpenMetaverse.Simulator,System.Int32,System.Single,System.Single,System.Single,System.Single,OpenMetaverse.TerraformAction,OpenMetaverse.TerraformBrushSize,System.Int32)">
+        <member name="P:OpenMetaverse.FriendInfo.CanSeeMeOnline">
             <summary>
-            Terraform (raise, lower, etc) an area or whole parcel of land
+            True if the friend can see if I am online
             </summary>
-            <param name="simulator">Simulator land area is in.</param>
-            <param name="localID">LocalID of parcel, or -1 if using bounding box</param>
-            <param name="west">west border of area to modify</param>
-            <param name="south">south border of area to modify</param>
-            <param name="east">east border of area to modify</param>
-            <param name="north">north border of area to modify</param>
-            <param name="action">From Enum, Raise, Lower, Level, Smooth, Etc.</param>
-            <param name="brushSize">Size of area to modify</param>
-            <param name="seconds">How many meters + or - to lower, 1 = 1 meter</param>
-            <returns>true on successful request sent.</returns>
-            <remarks>Settings.STORE_LAND_PATCHES must be true, 
-            Parcel information must be downloaded using <code>RequestAllSimParcels()</code></remarks>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.Terraform(OpenMetaverse.Simulator,System.Int32,System.Single,System.Single,System.Single,System.Single,OpenMetaverse.TerraformAction,OpenMetaverse.TerraformBrushSize,System.Int32,System.Single)">
+        <member name="P:OpenMetaverse.FriendInfo.CanSeeMeOnMap">
             <summary>
-            Terraform (raise, lower, etc) an area or whole parcel of land
+            True if the friend can see me on the map
             </summary>
-            <param name="simulator">Simulator land area is in.</param>
-            <param name="localID">LocalID of parcel, or -1 if using bounding box</param>
-            <param name="west">west border of area to modify</param>
-            <param name="south">south border of area to modify</param>
-            <param name="east">east border of area to modify</param>
-            <param name="north">north border of area to modify</param>
-            <param name="action">From Enum, Raise, Lower, Level, Smooth, Etc.</param>
-            <param name="brushSize">Size of area to modify</param>
-            <param name="seconds">How many meters + or - to lower, 1 = 1 meter</param>
-            <param name="height">Height at which the terraform operation is acting at</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.RequestSelectObjects(System.Int32,OpenMetaverse.ObjectReturnType,OpenMetaverse.UUID)">
+        <member name="P:OpenMetaverse.FriendInfo.CanModifyMyObjects">
             <summary>
-            Sends a request to the simulator to return a list of objects owned by specific owners
+            True if the freind can modify my objects
             </summary>
-            <param name="localID">Simulator local ID of parcel</param>
-            <param name="selectType">Owners, Others, Etc</param>
-            <param name="ownerID">List containing keys of avatars objects to select; 
-            if List is null will return Objects of type <c>selectType</c></param>
-            <remarks>Response data is returned in the event <seealso cref="E:OnParcelSelectedObjects"/></remarks>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.EjectUser(OpenMetaverse.UUID,System.Boolean)">
+        <member name="P:OpenMetaverse.FriendInfo.CanSeeThemOnline">
             <summary>
-            Eject and optionally ban a user from a parcel
+            True if I can see if my friend is online
             </summary>
-            <param name="targetID">target key of avatar to eject</param>
-            <param name="ban">true to also ban target</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.FreezeUser(OpenMetaverse.UUID,System.Boolean)">
+        <member name="P:OpenMetaverse.FriendInfo.CanSeeThemOnMap">
             <summary>
-            Freeze or unfreeze an avatar over your land
+            True if I can see if my friend is on the map
             </summary>
-            <param name="targetID">target key to freeze</param>
-            <param name="freeze">true to freeze, false to unfreeze</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.ReleaseParcel(OpenMetaverse.Simulator,System.Int32)">
+        <member name="P:OpenMetaverse.FriendInfo.CanModifyTheirObjects">
             <summary>
-            Abandon a parcel of land
+            True if I can modify my friend's objects
             </summary>
-            <param name="simulator">Simulator parcel is in</param>
-            <param name="localID">Simulator local ID of parcel</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.RequestRemoteParcelID(OpenMetaverse.Vector3,System.UInt64,OpenMetaverse.UUID)">
+        <member name="P:OpenMetaverse.FriendInfo.TheirFriendRights">
             <summary>
-            Requests the UUID of the parcel in a remote region at a specified location
+            My friend's rights represented as bitmapped flags
             </summary>
-            <param name="location">Location of the parcel in the remote region</param>
-            <param name="regionHandle">Remote region handle</param>
-            <param name="regionID">Remote region UUID</param>
-            <returns>If successful UUID of the remote parcel, UUID.Zero otherwise</returns>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.GetParcelResouces(OpenMetaverse.UUID,System.Boolean,OpenMetaverse.ParcelManager.LandResourcesCallback)">
+        <member name="P:OpenMetaverse.FriendInfo.MyFriendRights">
             <summary>
-            Retrieves information on resources used by the parcel
+            My rights represented as bitmapped flags
             </summary>
-            <param name="parcelID">UUID of the parcel</param>
-            <param name="getDetails">Should per object resource usage be requested</param>
-            <param name="callback">Callback invoked when the request is complete</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.ParcelDwellReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelDwellReply"/> event</remarks>
+        <member name="M:OpenMetaverse.FriendInfo.ToString">
+            <summary>
+            FriendInfo represented as a string
+            </summary>
+            <returns>A string reprentation of both my rights and my friends rights</returns>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.ParcelInfoReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelInfoReply"/> event</remarks>
+        <member name="T:OpenMetaverse.FriendsManager">
+            <summary>
+            This class is used to add and remove avatars from your friends list and to manage their permission.
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.ParcelAccessListReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.FriendsManager.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Internal constructor
+            </summary>
+            <param name="client">A reference to the GridClient Object</param>
+        </member>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendOnline">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendOnlineLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendOffline">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendOfflineLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendRights">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendRightsLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendNames">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendNamesLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendshipOffered">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendshipOfferedLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendshipResponse">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendshipResponseLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendshipTerminated">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendshipTerminatedLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendFound">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.FriendsManager.m_FriendFoundLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.FriendsManager.FriendList">
+            <summary>
+            A dictionary of key/value pairs containing known friends of this avatar.
+            The Key is the <seealso cref="T:OpenMetaverse.UUID" /> of the friend, the value is a <seealso cref="T:OpenMetaverse.FriendInfo" />
+            object that contains detailed information including permissions you have and have given to the friend
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.FriendsManager.FriendRequests">
+            <summary>
+            A Dictionary of key/value pairs containing current pending frienship offers.
+            The key is the <seealso cref="T:OpenMetaverse.UUID" /> of the avatar making the request,
+            the value is the <seealso cref="T:OpenMetaverse.UUID" /> of the request which is used to accept
+            or decline the friendship offer
+            </summary>
+        </member>
+        <member name="E:OpenMetaverse.FriendsManager.FriendOnline">
+            <summary>Raised when the simulator sends notification one of the members in our friends list comes online</summary>
+        </member>
+        <member name="E:OpenMetaverse.FriendsManager.FriendOffline">
+            <summary>Raised when the simulator sends notification one of the members in our friends list goes offline</summary>
+        </member>
+        <member name="E:OpenMetaverse.FriendsManager.FriendRightsUpdate">
+            <summary>Raised when the simulator sends notification one of the members in our friends list grants or revokes permissions</summary>
+        </member>
+        <member name="E:OpenMetaverse.FriendsManager.FriendNames">
+            <summary>Raised when the simulator sends us the names on our friends list</summary>
+        </member>
+        <member name="E:OpenMetaverse.FriendsManager.FriendshipOffered">
+            <summary>Raised when the simulator sends notification another agent is offering us friendship</summary>
+        </member>
+        <member name="E:OpenMetaverse.FriendsManager.FriendshipResponse">
+            <summary>Raised when a request we sent to friend another agent is accepted or declined</summary>
+        </member>
+        <member name="E:OpenMetaverse.FriendsManager.FriendshipTerminated">
+            <summary>Raised when the simulator sends notification one of the members in our friends list has terminated
+            our friendship</summary>
+        </member>
+        <member name="E:OpenMetaverse.FriendsManager.FriendFoundReply">
+            <summary>Raised when the simulator sends the location of a friend we have
+            requested map location info for</summary>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.OnFriendOnline(OpenMetaverse.FriendInfoEventArgs)">
+            <summary>Raises the FriendOnline event</summary>
+            <param name="e">A FriendInfoEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.OnFriendOffline(OpenMetaverse.FriendInfoEventArgs)">
+            <summary>Raises the FriendOffline event</summary>
+            <param name="e">A FriendInfoEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.OnFriendRights(OpenMetaverse.FriendInfoEventArgs)">
+            <summary>Raises the FriendRightsUpdate event</summary>
+            <param name="e">A FriendInfoEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.OnFriendNames(OpenMetaverse.FriendNamesEventArgs)">
+            <summary>Raises the FriendNames event</summary>
+            <param name="e">A FriendNamesEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.OnFriendshipOffered(OpenMetaverse.FriendshipOfferedEventArgs)">
+            <summary>Raises the FriendshipOffered event</summary>
+            <param name="e">A FriendshipOfferedEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.OnFriendshipResponse(OpenMetaverse.FriendshipResponseEventArgs)">
+            <summary>Raises the FriendshipResponse event</summary>
+            <param name="e">A FriendshipResponseEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.OnFriendshipTerminated(OpenMetaverse.FriendshipTerminatedEventArgs)">
+            <summary>Raises the FriendshipTerminated event</summary>
+            <param name="e">A FriendshipTerminatedEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.OnFriendFoundReply(OpenMetaverse.FriendFoundReplyEventArgs)">
+            <summary>Raises the FriendFoundReply event</summary>
+            <param name="e">A FriendFoundReplyEventArgs object containing the
+            data returned from the data server</param>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.AcceptFriendship(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+            <summary>
+            Accept a friendship request
+            </summary>
+            <param name="fromAgentID">agentID of avatatar to form friendship with</param>
+            <param name="imSessionID">imSessionID of the friendship request message</param>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.DeclineFriendship(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+            <summary>
+            Decline a friendship request
+            </summary>
+            <param name="fromAgentID">
+                <seealso cref="T:OpenMetaverse.UUID" /> of friend</param>
+            <param name="imSessionID">imSessionID of the friendship request message</param>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.OfferFriendship(OpenMetaverse.UUID)">
+            <summary>
+            Overload: Offer friendship to an avatar.
+            </summary>
+            <param name="agentID">System ID of the avatar you are offering friendship to</param>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.OfferFriendship(OpenMetaverse.UUID,System.String)">
+            <summary>
+            Offer friendship to an avatar.
+            </summary>
+            <param name="agentID">System ID of the avatar you are offering friendship to</param>
+            <param name="message">A message to send with the request</param>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.TerminateFriendship(OpenMetaverse.UUID)">
+            <summary>
+            Terminate a friendship with an avatar
+            </summary>
+            <param name="agentID">System ID of the avatar you are terminating the friendship with</param>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.TerminateFriendshipHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>Process an incoming packet and raise the appropriate events</summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
-            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelAccessListReply"/> event</remarks>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.SelectParcelObjectsReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.FriendsManager.GrantRights(OpenMetaverse.UUID,OpenMetaverse.FriendRights)">
+            <summary>
+            Change the rights of a friend avatar.
+            </summary>
+            <param name="friendID">the <seealso cref="T:OpenMetaverse.UUID" /> of the friend</param>
+            <param name="rights">the new rights to give the friend</param>
+            <remarks>This method will implicitly set the rights to those passed in the rights parameter.</remarks>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.MapFriend(OpenMetaverse.UUID)">
+            <summary>
+            Use to map a friends location on the grid.
+            </summary>
+            <param name="friendID">Friends UUID to find</param>
+            <remarks>
+                <seealso cref="E:OnFriendFound" />
+            </remarks>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.TrackFriend(OpenMetaverse.UUID)">
+            <summary>
+            Use to track a friends movement on the grid
+            </summary>
+            <param name="friendID">Friends Key</param>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.RequestOnlineNotification(OpenMetaverse.UUID)">
+            <summary>
+            Ask for a notification of friend's online status
+            </summary>
+            <param name="friendID">Friend's UUID</param>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.Avatars_OnAvatarNames(System.Object,OpenMetaverse.UUIDNameReplyEventArgs)">
+            <summary>
+            This handles the asynchronous response of a RequestAvatarNames call.
+            </summary>
+            <param name="sender">
+            </param>
+            <param name="e">names cooresponding to the the list of IDs sent the the RequestAvatarNames call.</param>
+        </member>
+        <member name="M:OpenMetaverse.FriendsManager.OnlineNotificationHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>Process an incoming packet and raise the appropriate events</summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
-            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ForceSelectObjectsReply"/> event</remarks>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.ParcelMediaUpdateHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.FriendsManager.OfflineNotificationHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>Process an incoming packet and raise the appropriate events</summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
-            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelMediaUpdateReply"/> event</remarks>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.ParcelOverlayHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.FriendsManager.ChangeUserRightsHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>Process an incoming packet and raise the appropriate events</summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.ParcelManager.ParcelMediaCommandMessagePacketHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.FriendsManager.OnFindAgentReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>Process an incoming packet and raise the appropriate events</summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
-            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelMediaCommand"/> event</remarks>
-        </member>
-        <member name="E:OpenMetaverse.ParcelManager.ParcelDwellReply">
-            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.ParcelManager.RequestDwell(OpenMetaverse.Simulator,System.Int32)"/> request</summary>
         </member>
-        <member name="E:OpenMetaverse.ParcelManager.ParcelInfoReply">
-            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.ParcelManager.RequestParcelInfo(OpenMetaverse.UUID)"/> request</summary>
+        <member name="M:OpenMetaverse.FriendsManager.Network_OnLoginResponse(System.Boolean,System.Boolean,System.String,System.String,OpenMetaverse.LoginResponseData)">
+            <summary>
+            Populate FriendList <seealso cref="!:InternalDictionary" /> with data from the login reply
+            </summary>
+            <param name="loginSuccess">true if login was successful</param>
+            <param name="redirect">true if login request is requiring a redirect</param>
+            <param name="message">A string containing the response to the login request</param>
+            <param name="reason">A string containing the reason for the request</param>
+            <param name="replyData">A <seealso cref="T:OpenMetaverse.LoginResponseData" /> object containing the decoded
+            reply from the login server</param>
         </member>
-        <member name="E:OpenMetaverse.ParcelManager.ParcelProperties">
-            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.ParcelManager.RequestParcelProperties(OpenMetaverse.Simulator,System.Int32,System.Int32)"/> request</summary>
+        <member name="T:OpenMetaverse.FriendInfoEventArgs">
+            <summary>Contains information on a member of our friends list</summary>
         </member>
-        <member name="E:OpenMetaverse.ParcelManager.ParcelAccessListReply">
-            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.ParcelManager.RequestParcelAccessList(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.AccessList,System.Int32)"/> request</summary>
+        <member name="M:OpenMetaverse.FriendInfoEventArgs.#ctor(OpenMetaverse.FriendInfo)">
+            <summary>
+            Construct a new instance of the FriendInfoEventArgs class
+            </summary>
+            <param name="friend">The FriendInfo</param>
         </member>
-        <member name="E:OpenMetaverse.ParcelManager.ParcelObjectOwnersReply">
-            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.ParcelManager.RequestObjectOwners(OpenMetaverse.Simulator,System.Int32)"/> request</summary>
+        <member name="P:OpenMetaverse.FriendInfoEventArgs.Friend">
+            <summary>Get the FriendInfo</summary>
         </member>
-        <member name="E:OpenMetaverse.ParcelManager.SimParcelsDownloaded">
-            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.ParcelManager.RequestAllSimParcels(OpenMetaverse.Simulator)"/> request</summary>
+        <member name="T:OpenMetaverse.FriendNamesEventArgs">
+            <summary>Contains Friend Names</summary>
         </member>
-        <member name="E:OpenMetaverse.ParcelManager.ForceSelectObjectsReply">
-            <summary>Raised when the simulator responds to a <see cref="!:RequestForceSelectObjects"/> request</summary>
+        <member name="M:OpenMetaverse.FriendNamesEventArgs.#ctor(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,System.String})">
+            <summary>
+            Construct a new instance of the FriendNamesEventArgs class
+            </summary>
+            <param name="names">A dictionary where the Key is the ID of the Agent,
+            and the Value is a string containing their name</param>
         </member>
-        <member name="E:OpenMetaverse.ParcelManager.ParcelMediaUpdateReply">
-            <summary>Raised when the simulator responds to a Parcel Update request</summary>
+        <member name="P:OpenMetaverse.FriendNamesEventArgs.Names">
+            <summary>A dictionary where the Key is the ID of the Agent,
+            and the Value is a string containing their name</summary>
         </member>
-        <member name="E:OpenMetaverse.ParcelManager.ParcelMediaCommand">
-            <summary>Raised when the parcel your agent is located sends a ParcelMediaCommand</summary>
+        <member name="T:OpenMetaverse.FriendshipOfferedEventArgs">
+            <summary>Sent when another agent requests a friendship with our agent</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelManager.ParcelAccessEntry">
+        <member name="M:OpenMetaverse.FriendshipOfferedEventArgs.#ctor(OpenMetaverse.UUID,System.String,OpenMetaverse.UUID)">
             <summary>
-            Parcel Accesslist
+            Construct a new instance of the FriendshipOfferedEventArgs class
             </summary>
+            <param name="agentID">The ID of the agent requesting friendship</param>
+            <param name="agentName">The name of the agent requesting friendship</param>
+            <param name="imSessionID">The ID of the session, used in accepting or declining the
+            friendship offer</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.ParcelAccessEntry.AgentID">
-            <summary>Agents <seealso cref="T:OpenMetaverse.UUID"/></summary>
+        <member name="P:OpenMetaverse.FriendshipOfferedEventArgs.AgentID">
+            <summary>Get the ID of the agent requesting friendship</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.ParcelAccessEntry.Time">
-            <summary></summary>
+        <member name="P:OpenMetaverse.FriendshipOfferedEventArgs.AgentName">
+            <summary>Get the name of the agent requesting friendship</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.ParcelAccessEntry.Flags">
-            <summary>Flags for specific entry in white/black lists</summary>
+        <member name="P:OpenMetaverse.FriendshipOfferedEventArgs.SessionID">
+            <summary>Get the ID of the session, used in accepting or declining the
+            friendship offer</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelManager.ParcelPrimOwners">
+        <member name="T:OpenMetaverse.FriendshipResponseEventArgs">
+            <summary>A response containing the results of our request to form a friendship with another agent</summary>
+        </member>
+        <member name="M:OpenMetaverse.FriendshipResponseEventArgs.#ctor(OpenMetaverse.UUID,System.String,System.Boolean)">
             <summary>
-            Owners of primitives on parcel
+            Construct a new instance of the FriendShipResponseEventArgs class
             </summary>
+            <param name="agentID">The ID of the agent we requested a friendship with</param>
+            <param name="agentName">The name of the agent we requested a friendship with</param>
+            <param name="accepted">true if the agent accepted our friendship offer</param>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.OwnerID">
-            <summary>Prim Owners <seealso cref="T:OpenMetaverse.UUID"/></summary>
-        </member>
-        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.IsGroupOwned">
-            <summary>True of owner is group</summary>
+        <member name="P:OpenMetaverse.FriendshipResponseEventArgs.AgentID">
+            <summary>Get the ID of the agent we requested a friendship with</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.Count">
-            <summary>Total count of prims owned by OwnerID</summary>
+        <member name="P:OpenMetaverse.FriendshipResponseEventArgs.AgentName">
+            <summary>Get the name of the agent we requested a friendship with</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.OnlineStatus">
-            <summary>true of OwnerID is currently online and is not a group</summary>
+        <member name="P:OpenMetaverse.FriendshipResponseEventArgs.Accepted">
+            <summary>true if the agent accepted our friendship offer</summary>
         </member>
-        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.NewestPrim">
-            <summary>The date of the most recent prim left by OwnerID</summary>
+        <member name="T:OpenMetaverse.FriendshipTerminatedEventArgs">
+            <summary>Contains data sent when a friend terminates a friendship with us</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelManager.LandResourcesCallback">
+        <member name="M:OpenMetaverse.FriendshipTerminatedEventArgs.#ctor(OpenMetaverse.UUID,System.String)">
             <summary>
-            Called once parcel resource usage information has been collected
+            Construct a new instance of the FrindshipTerminatedEventArgs class
             </summary>
-            <param name="success">Indicates if operation was successfull</param>
-            <param name="info">Parcel resource usage information</param>
+            <param name="agentID">The ID of the friend who terminated the friendship with us</param>
+            <param name="agentName">The name of the friend who terminated the friendship with us</param>
         </member>
-        <member name="T:OpenMetaverse.ParcelDwellReplyEventArgs">
-            <summary>Contains a parcels dwell data returned from the simulator in response to an <see cref="!:RequestParcelDwell"/></summary>
+        <member name="P:OpenMetaverse.FriendshipTerminatedEventArgs.AgentID">
+            <summary>Get the ID of the agent that terminated the friendship with us</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelDwellReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Int32,System.Single)">
+        <member name="P:OpenMetaverse.FriendshipTerminatedEventArgs.AgentName">
+            <summary>Get the name of the agent that terminated the friendship with us</summary>
+        </member>
+        <member name="T:OpenMetaverse.FriendFoundReplyEventArgs">
             <summary>
-            Construct a new instance of the ParcelDwellReplyEventArgs class
+            Data sent in response to a <see cref="!:FindFriend" /> request which contains the information to allow us to map the friends location
             </summary>
-            <param name="parcelID">The global ID of the parcel</param>
-            <param name="localID">The simulator specific ID of the parcel</param>
-            <param name="dwell">The calculated dwell for the parcel</param>
         </member>
-        <member name="P:OpenMetaverse.ParcelDwellReplyEventArgs.ParcelID">
-            <summary>Get the global ID of the parcel</summary>
+        <member name="M:OpenMetaverse.FriendFoundReplyEventArgs.#ctor(OpenMetaverse.UUID,System.UInt64,OpenMetaverse.Vector3)">
+            <summary>
+            Construct a new instance of the FriendFoundReplyEventArgs class
+            </summary>
+            <param name="agentID">The ID of the agent we have requested location information for</param>
+            <param name="regionHandle">The region handle where our friend is located</param>
+            <param name="location">The simulator local position our friend is located</param>
         </member>
-        <member name="P:OpenMetaverse.ParcelDwellReplyEventArgs.LocalID">
-            <summary>Get the simulator specific ID of the parcel</summary>
+        <member name="P:OpenMetaverse.FriendFoundReplyEventArgs.AgentID">
+            <summary>Get the ID of the agent we have received location information for</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelDwellReplyEventArgs.Dwell">
-            <summary>Get the calculated dwell</summary>
+        <member name="P:OpenMetaverse.FriendFoundReplyEventArgs.RegionHandle">
+            <summary>Get the region handle where our mapped friend is located</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelInfoReplyEventArgs">
-            <summary>Contains basic parcel information data returned from the 
-            simulator in response to an <see cref="!:RequestParcelInfo"/> request</summary>
+        <member name="P:OpenMetaverse.FriendFoundReplyEventArgs.Location">
+            <summary>Get the simulator local position where our friend is located</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelInfoReplyEventArgs.#ctor(OpenMetaverse.ParcelInfo)">
+        <member name="T:OpenMetaverse.GridClient">
             <summary>
-            Construct a new instance of the ParcelInfoReplyEventArgs class
+            Main class to expose grid functionality to clients. All of the
+            classes needed for sending and receiving data are accessible through
+            this class.
             </summary>
-            <param name="parcel">The <see cref="T:OpenMetaverse.ParcelInfo"/> object containing basic parcel info</param>
-        </member>
-        <member name="P:OpenMetaverse.ParcelInfoReplyEventArgs.Parcel">
-            <summary>Get the <see cref="T:OpenMetaverse.ParcelInfo"/> object containing basic parcel info</summary>
-        </member>
-        <member name="T:OpenMetaverse.ParcelPropertiesEventArgs">
-            <summary>Contains basic parcel information data returned from the simulator in response to an <see cref="!:RequestParcelInfo"/> request</summary>
+            <example>
+                <code>
+            // Example minimum code required to instantiate class and
+            // connect to a simulator.
+            using System;
+            using System.Collections.Generic;
+            using System.Text;
+            using OpenMetaverse;
+            namespace FirstBot
+            {
+            class Bot
+            {
+            public static GridClient Client;
+            static void Main(string[] args)
+            {
+            Client = new GridClient(); // instantiates the GridClient class
+            // to the global Client object
+            // Login to Simulator
+            Client.Network.Login("FirstName", "LastName", "Password", "FirstBot", "1.0");
+            // Wait for a Keypress
+            Console.ReadLine();
+            // Logout of simulator
+            Client.Network.Logout();
+            }
+            }
+            }
+            </code>
+            </example>
         </member>
-        <member name="M:OpenMetaverse.ParcelPropertiesEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Parcel,OpenMetaverse.ParcelResult,System.Int32,System.Int32,System.Boolean)">
+        <member name="M:OpenMetaverse.GridClient.#ctor">
             <summary>
-            Construct a new instance of the ParcelPropertiesEventArgs class
+            Default constructor
             </summary>
-            <param name="simulator">The <see cref="P:OpenMetaverse.ParcelPropertiesEventArgs.Parcel"/> object containing the details</param>
-            <param name="parcel">The <see cref="P:OpenMetaverse.ParcelPropertiesEventArgs.Parcel"/> object containing the details</param>
-            <param name="result">The result of the request</param>
-            <param name="selectedPrims">The number of primitieves your agent is 
-            currently selecting and or sitting on in this parcel</param>
-            <param name="sequenceID">The user assigned ID used to correlate a request with
-            these results</param>
-            <param name="snapSelection">TODO:</param>
         </member>
-        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.Simulator">
-            <summary>Get the simulator the parcel is located in</summary>
+        <member name="F:OpenMetaverse.GridClient.Network">
+            <summary>Networking subsystem</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.Parcel">
-            <summary>Get the <see cref="P:OpenMetaverse.ParcelPropertiesEventArgs.Parcel"/> object containing the details</summary>
-            <remarks>If Result is NoData, this object will not contain valid data</remarks>
+        <member name="F:OpenMetaverse.GridClient.Settings">
+            <summary>Settings class including constant values and changeable
+            parameters for everything</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.Result">
-            <summary>Get the result of the request</summary>
+        <member name="F:OpenMetaverse.GridClient.Parcels">
+            <summary>Parcel (subdivided simulator lots) subsystem</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.SelectedPrims">
-            <summary>Get the number of primitieves your agent is 
-            currently selecting and or sitting on in this parcel</summary>
+        <member name="F:OpenMetaverse.GridClient.Self">
+            <summary>Our own avatars subsystem</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.SequenceID">
-            <summary>Get the user assigned ID used to correlate a request with
-            these results</summary>
+        <member name="F:OpenMetaverse.GridClient.Avatars">
+            <summary>Other avatars subsystem</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.SnapSelection">
-            <summary>TODO:</summary>
+        <member name="F:OpenMetaverse.GridClient.Estate">
+            <summary>Estate subsystem</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelAccessListReplyEventArgs">
-            <summary>Contains blacklist and whitelist data returned from the simulator in response to an <see cref="!:RequestParcelAccesslist"/> request</summary>
+        <member name="F:OpenMetaverse.GridClient.Friends">
+            <summary>Friends list subsystem</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelAccessListReplyEventArgs.#ctor(OpenMetaverse.Simulator,System.Int32,System.Int32,System.UInt32,System.Collections.Generic.List{OpenMetaverse.ParcelManager.ParcelAccessEntry})">
-            <summary>
-            Construct a new instance of the ParcelAccessListReplyEventArgs class
-            </summary>
-            <param name="simulator">The simulator the parcel is located in</param>
-            <param name="sequenceID">The user assigned ID used to correlate a request with
-            these results</param>
-            <param name="localID">The simulator specific ID of the parcel</param>
-            <param name="flags">TODO:</param>
-            <param name="accessEntries">The list containing the white/blacklisted agents for the parcel</param>
+        <member name="F:OpenMetaverse.GridClient.Grid">
+            <summary>Grid (aka simulator group) subsystem</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.Simulator">
-            <summary>Get the simulator the parcel is located in</summary>
+        <member name="F:OpenMetaverse.GridClient.Objects">
+            <summary>Object subsystem</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.SequenceID">
-            <summary>Get the user assigned ID used to correlate a request with
-            these results</summary>
+        <member name="F:OpenMetaverse.GridClient.Groups">
+            <summary>Group subsystem</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.LocalID">
-            <summary>Get the simulator specific ID of the parcel</summary>
+        <member name="F:OpenMetaverse.GridClient.Assets">
+            <summary>Asset subsystem</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.Flags">
-            <summary>TODO:</summary>
+        <member name="F:OpenMetaverse.GridClient.Appearance">
+            <summary>Appearance subsystem</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.AccessList">
-            <summary>Get the list containing the white/blacklisted agents for the parcel</summary>
+        <member name="F:OpenMetaverse.GridClient.Inventory">
+            <summary>Inventory subsystem</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelObjectOwnersReplyEventArgs">
-            <summary>Contains blacklist and whitelist data returned from the 
-            simulator in response to an <see cref="!:RequestParcelAccesslist"/> request</summary>
+        <member name="F:OpenMetaverse.GridClient.Directory">
+            <summary>Directory searches including classifieds, people, land
+            sales, etc</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelObjectOwnersReplyEventArgs.#ctor(OpenMetaverse.Simulator,System.Collections.Generic.List{OpenMetaverse.ParcelManager.ParcelPrimOwners})">
+        <member name="F:OpenMetaverse.GridClient.Terrain">
+            <summary>Handles land, wind, and cloud heightmaps</summary>
+        </member>
+        <member name="F:OpenMetaverse.GridClient.Sound">
+            <summary>Handles sound-related networking</summary>
+        </member>
+        <member name="F:OpenMetaverse.GridClient.Throttle">
+            <summary>Throttling total bandwidth usage, or allocating bandwidth
+            for specific data stream types</summary>
+        </member>
+        <member name="M:OpenMetaverse.GridClient.ToString">
             <summary>
-            Construct a new instance of the ParcelObjectOwnersReplyEventArgs class
+            Return the full name of this instance
             </summary>
-            <param name="simulator">The simulator the parcel is located in</param>
-            <param name="primOwners">The list containing prim ownership counts</param>
+            <returns>Client avatars full name</returns>
         </member>
-        <member name="P:OpenMetaverse.ParcelObjectOwnersReplyEventArgs.Simulator">
-            <summary>Get the simulator the parcel is located in</summary>
+        <member name="T:OpenMetaverse.GridLayerType">
+            <summary>
+            Map layer request type
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelObjectOwnersReplyEventArgs.PrimOwners">
-            <summary>Get the list containing prim ownership counts</summary>
+        <member name="F:OpenMetaverse.GridLayerType.Objects">
+            <summary>Objects and terrain are shown</summary>
         </member>
-        <member name="T:OpenMetaverse.SimParcelsDownloadedEventArgs">
-            <summary>Contains the data returned when all parcel data has been retrieved from a simulator</summary>
+        <member name="F:OpenMetaverse.GridLayerType.Terrain">
+            <summary>Only the terrain is shown, no objects</summary>
         </member>
-        <member name="M:OpenMetaverse.SimParcelsDownloadedEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.InternalDictionary{System.Int32,OpenMetaverse.Parcel},System.Int32[0:,0:])">
+        <member name="F:OpenMetaverse.GridLayerType.LandForSale">
+            <summary>Overlay showing land for sale and for auction</summary>
+        </member>
+        <member name="T:OpenMetaverse.GridItemType">
             <summary>
-            Construct a new instance of the SimParcelsDownloadedEventArgs class
+            Type of grid item, such as telehub, event, populator location, etc.
             </summary>
-            <param name="simulator">The simulator the parcel data was retrieved from</param>
-            <param name="simParcels">The dictionary containing the parcel data</param>
-            <param name="parcelMap">The multidimensional array containing a x,y grid mapped
-            to each 64x64 parcel's LocalID.</param>
         </member>
-        <member name="P:OpenMetaverse.SimParcelsDownloadedEventArgs.Simulator">
-            <summary>Get the simulator the parcel data was retrieved from</summary>
+        <member name="F:OpenMetaverse.GridItemType.Telehub">
+            <summary>Telehub</summary>
         </member>
-        <member name="P:OpenMetaverse.SimParcelsDownloadedEventArgs.Parcels">
-            <summary>A dictionary containing the parcel data where the key correlates to the ParcelMap entry</summary>
+        <member name="F:OpenMetaverse.GridItemType.PgEvent">
+            <summary>PG rated event</summary>
         </member>
-        <member name="P:OpenMetaverse.SimParcelsDownloadedEventArgs.ParcelMap">
-            <summary>Get the multidimensional array containing a x,y grid mapped
-            to each 64x64 parcel's LocalID.</summary>
+        <member name="F:OpenMetaverse.GridItemType.MatureEvent">
+            <summary>Mature rated event</summary>
         </member>
-        <member name="T:OpenMetaverse.ForceSelectObjectsReplyEventArgs">
-            <summary>Contains the data returned when a <see cref="!:RequestForceSelectObjects"/> request</summary>
+        <member name="F:OpenMetaverse.GridItemType.Popular">
+            <summary>Popular location</summary>
         </member>
-        <member name="M:OpenMetaverse.ForceSelectObjectsReplyEventArgs.#ctor(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32},System.Boolean)">
-            <summary>
-            Construct a new instance of the ForceSelectObjectsReplyEventArgs class
-            </summary>
-            <param name="simulator">The simulator the parcel data was retrieved from</param>
-            <param name="objectIDs">The list of primitive IDs</param>
-            <param name="resetList">true if the list is clean and contains the information
-            only for a given request</param>
+        <member name="F:OpenMetaverse.GridItemType.AgentLocations">
+            <summary>Locations of avatar groups in a region</summary>
         </member>
-        <member name="P:OpenMetaverse.ForceSelectObjectsReplyEventArgs.Simulator">
-            <summary>Get the simulator the parcel data was retrieved from</summary>
+        <member name="F:OpenMetaverse.GridItemType.LandForSale">
+            <summary>Land for sale</summary>
         </member>
-        <member name="P:OpenMetaverse.ForceSelectObjectsReplyEventArgs.ObjectIDs">
-            <summary>Get the list of primitive IDs</summary>
+        <member name="F:OpenMetaverse.GridItemType.Classified">
+            <summary>Classified ad</summary>
         </member>
-        <member name="P:OpenMetaverse.ForceSelectObjectsReplyEventArgs.ResetList">
-            <summary>true if the list is clean and contains the information
-            only for a given request</summary>
+        <member name="F:OpenMetaverse.GridItemType.AdultEvent">
+            <summary>Adult rated event</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelMediaUpdateReplyEventArgs">
-            <summary>Contains data when the media data for a parcel the avatar is on changes</summary>
+        <member name="F:OpenMetaverse.GridItemType.AdultLandForSale">
+            <summary>Adult land for sale</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelMediaUpdateReplyEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.ParcelMedia)">
+        <member name="T:OpenMetaverse.GridRegion">
             <summary>
-            Construct a new instance of the ParcelMediaUpdateReplyEventArgs class
+            Information about a region on the grid map
             </summary>
-            <param name="simulator">the simulator the parcel media data was updated in</param>
-            <param name="media">The updated media information</param>
         </member>
-        <member name="P:OpenMetaverse.ParcelMediaUpdateReplyEventArgs.Simulator">
-            <summary>Get the simulator the parcel media data was updated in</summary>
+        <member name="F:OpenMetaverse.GridRegion.X">
+            <summary>Sim X position on World Map</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelMediaUpdateReplyEventArgs.Media">
-            <summary>Get the updated media information</summary>
+        <member name="F:OpenMetaverse.GridRegion.Y">
+            <summary>Sim Y position on World Map</summary>
         </member>
-        <member name="T:OpenMetaverse.ParcelMediaCommandEventArgs">
-            <summary>Contains the media command for a parcel the agent is currently on</summary>
+        <member name="F:OpenMetaverse.GridRegion.Name">
+            <summary>Sim Name (NOTE: In lowercase!)</summary>
         </member>
-        <member name="M:OpenMetaverse.ParcelMediaCommandEventArgs.#ctor(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.ParcelFlags,OpenMetaverse.ParcelMediaCommand,System.Single)">
+        <member name="F:OpenMetaverse.GridRegion.Access">
             <summary>
-            Construct a new instance of the ParcelMediaCommandEventArgs class
             </summary>
-            <param name="simulator">The simulator the parcel media command was issued in</param>
-            <param name="sequence"></param>
-            <param name="flags"></param>
-            <param name="command">The media command that was sent</param>
-            <param name="time"></param>
         </member>
-        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.Simulator">
-            <summary>Get the simulator the parcel media command was issued in</summary>
+        <member name="F:OpenMetaverse.GridRegion.RegionFlags">
+            <summary>Appears to always be zero (None)</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.Sequence">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GridRegion.WaterHeight">
+            <summary>Sim's defined Water Height</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.ParcelFlags">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GridRegion.Agents">
+            <summary>
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.MediaCommand">
-            <summary>Get the media command that was sent</summary>
+        <member name="F:OpenMetaverse.GridRegion.MapImageID">
+            <summary>UUID of the World Map image</summary>
         </member>
-        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.Time">
-            <summary></summary>
+        <member name="F:OpenMetaverse.GridRegion.RegionHandle">
+            <summary>Unique identifier for this region, a combination of the X
+            and Y position</summary>
         </member>
-        <member name="T:OpenMetaverse.DictionaryEventAction">
+        <member name="M:OpenMetaverse.GridRegion.ToString">
             <summary>
-            
             </summary>
+            <returns>
+            </returns>
         </member>
-        <member name="F:OpenMetaverse.DictionaryEventAction.Add">
+        <member name="M:OpenMetaverse.GridRegion.GetHashCode">
             <summary>
-            
             </summary>
+            <returns>
+            </returns>
         </member>
-        <member name="F:OpenMetaverse.DictionaryEventAction.Remove">
+        <member name="M:OpenMetaverse.GridRegion.Equals(System.Object)">
             <summary>
-            
             </summary>
+            <param name="obj">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="F:OpenMetaverse.DictionaryEventAction.Change">
+        <member name="T:OpenMetaverse.GridLayer">
             <summary>
-            
+            Visual chunk of the grid map
             </summary>
         </member>
-        <member name="T:OpenMetaverse.DictionaryChangeCallback">
+        <member name="T:OpenMetaverse.MapItem">
             <summary>
-            
+            Base class for Map Items
             </summary>
-            <param name="action"></param>
-            <param name="entry"></param>
         </member>
-        <member name="T:OpenMetaverse.ObservableDictionary`2">
+        <member name="F:OpenMetaverse.MapItem.GlobalX">
+            <summary>The Global X position of the item</summary>
+        </member>
+        <member name="F:OpenMetaverse.MapItem.GlobalY">
+            <summary>The Global Y position of the item</summary>
+        </member>
+        <member name="P:OpenMetaverse.MapItem.LocalX">
+            <summary>Get the Local X position of the item</summary>
+        </member>
+        <member name="P:OpenMetaverse.MapItem.LocalY">
+            <summary>Get the Local Y position of the item</summary>
+        </member>
+        <member name="P:OpenMetaverse.MapItem.RegionHandle">
+            <summary>Get the Handle of the region</summary>
+        </member>
+        <member name="T:OpenMetaverse.MapAgentLocation">
             <summary>
-            The ObservableDictionary class is used for storing key/value pairs. It has methods for firing
-            events to subscribers when items are added, removed, or changed.
+            Represents an agent or group of agents location
             </summary>
-            <typeparam name="TKey">Key <see langword="Tkey"/></typeparam>
-            <typeparam name="TValue">Value <see langword="TValue"/></typeparam>
         </member>
-        <member name="F:OpenMetaverse.ObservableDictionary`2.Delegates">
+        <member name="T:OpenMetaverse.MapTelehub">
             <summary>
-            A dictionary of callbacks to fire when specified action occurs
+            Represents a Telehub location
             </summary>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.AddDelegate(OpenMetaverse.DictionaryEventAction,OpenMetaverse.DictionaryChangeCallback)">
+        <member name="T:OpenMetaverse.MapLandForSale">
             <summary>
-            Register a callback to be fired when an action occurs
+            Represents a non-adult parcel of land for sale
             </summary>
-            <param name="action">The action</param>
-            <param name="callback">The callback to fire</param>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.RemoveDelegate(OpenMetaverse.DictionaryEventAction,OpenMetaverse.DictionaryChangeCallback)">
+        <member name="T:OpenMetaverse.MapAdultLandForSale">
             <summary>
-            Unregister a callback
+            Represents an Adult parcel of land for sale
             </summary>
-            <param name="action">The action</param>
-            <param name="callback">The callback to fire</param>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.FireChangeEvent(OpenMetaverse.DictionaryEventAction,System.Collections.DictionaryEntry)">
+        <member name="T:OpenMetaverse.MapPGEvent">
             <summary>
-            
+            Represents a PG Event
             </summary>
-            <param name="action"></param>
-            <param name="entry"></param>
-        </member>
-        <member name="F:OpenMetaverse.ObservableDictionary`2.Dictionary">
-            <summary>Internal dictionary that this class wraps around. Do not
-            modify or enumerate the contents of this dictionary without locking</summary>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.#ctor">
+        <member name="T:OpenMetaverse.MapMatureEvent">
             <summary>
-            Initializes a new instance of the <seealso cref="T:ObservableDictionary"/> Class 
-            with the specified key/value, has the default initial capacity.
+            Represents a Mature event
             </summary>
-            <example>
-            <code>
-            // initialize a new ObservableDictionary named testDict with a string as the key and an int as the value.
-            public ObservableDictionary&lt;string, int&gt; testDict = new ObservableDictionary&lt;string, int&gt;();
-            </code>
-            </example>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.#ctor(System.Int32)">
+        <member name="T:OpenMetaverse.MapAdultEvent">
             <summary>
-            Initializes a new instance of the <seealso cref="T:OpenMetaverse.ObservableDictionary"/> Class 
-            with the specified key/value, With its initial capacity specified.
+            Represents an Adult event
             </summary>
-            <param name="capacity">Initial size of dictionary</param>
-            <example>
-            <code>
-            // initialize a new ObservableDictionary named testDict with a string as the key and an int as the value, 
-            // initially allocated room for 10 entries.
-            public ObservableDictionary&lt;string, int&gt; testDict = new ObservableDictionary&lt;string, int&gt;(10);
-            </code>
-            </example>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.TryGetValue(`0,`1@)">
+        <member name="T:OpenMetaverse.GridManager">
             <summary>
-            Try to get entry from the <seealso cref="!:ObservableDictionary"/> with specified key 
+            Manages grid-wide tasks such as the world map
             </summary>
-            <param name="key">Key to use for lookup</param>
-            <param name="value">Value returned</param>
-            <returns><see langword="true"/> if specified key exists,  <see langword="false"/> if not found</returns>
-            <example>
-            <code>
-            // find your avatar using the Simulator.ObjectsAvatars ObservableDictionary:
-               Avatar av;
-               if (Client.Network.CurrentSim.ObjectsAvatars.TryGetValue(Client.Self.AgentID, out av))
-                   Console.WriteLine("Found Avatar {0}", av.Name);
-            </code>
-            <seealso cref="F:OpenMetaverse.Simulator.ObjectsAvatars"/>
-            </example>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.Find(System.Predicate{`1})">
+        <member name="M:OpenMetaverse.GridManager.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            Finds the specified match.
+            Constructor
             </summary>
-            <param name="match">The match.</param>
-            <returns>Matched value</returns>
-            <example>
-            <code>
-            // use a delegate to find a prim in the ObjectsPrimitives ObservableDictionary
-            // with the ID 95683496
-            uint findID = 95683496;
-            Primitive findPrim = sim.ObjectsPrimitives.Find(
-                        delegate(Primitive prim) { return prim.ID == findID; });
-            </code>
-            </example>
+            <param name="client">Instance of GridClient object to associate with this GridManager instance</param>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.FindAll(System.Predicate{`1})">
-             <summary>Find All items in an <seealso cref="T:ObservableDictionary"/></summary>
-             <param name="match">return matching items.</param>
-             <returns>a <seealso cref="T:System.Collections.Generic.List"/> containing found items.</returns>
-             <example>
-             Find All prims within 20 meters and store them in a List
-             <code>
-             int radius = 20;
-             List&lt;Primitive&gt; prims = Client.Network.CurrentSim.ObjectsPrimitives.FindAll(
-                     delegate(Primitive prim) {
-                         Vector3 pos = prim.Position;
-                         return ((prim.ParentID == 0) &amp;&amp; (pos != Vector3.Zero) &amp;&amp; (Vector3.Distance(pos, location) &lt; radius));
-                     }
-                ); 
-            </code>
-            </example>
+        <member name="F:OpenMetaverse.GridManager.m_CoarseLocationUpdate">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.FindAll(System.Predicate{`0})">
-             <summary>Find All items in an <seealso cref="T:ObservableDictionary"/></summary>
-             <param name="match">return matching keys.</param>
-             <returns>a <seealso cref="T:System.Collections.Generic.List"/> containing found keys.</returns>
-             <example>
-             Find All keys which also exist in another dictionary
-             <code>
-             List&lt;UUID&gt; matches = myDict.FindAll(
-                     delegate(UUID id) {
-                         return myOtherDict.ContainsKey(id);
-                     }
-                ); 
-            </code>
-            </example>
+        <member name="F:OpenMetaverse.GridManager.m_CoarseLocationUpdateLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.ContainsKey(`0)">
-            <summary>Check if Key exists in Dictionary</summary>
-            <param name="key">Key to check for</param>
-            <returns><see langword="true"/> if found, <see langword="false"/> otherwise</returns>
+        <member name="F:OpenMetaverse.GridManager.m_GridRegion">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.ContainsValue(`1)">
-            <summary>Check if Value exists in Dictionary</summary>
-            <param name="value">Value to check for</param>
-            <returns><see langword="true"/> if found, <see langword="false"/> otherwise</returns>
+        <member name="F:OpenMetaverse.GridManager.m_GridRegionLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.Add(`0,`1)">
+        <member name="F:OpenMetaverse.GridManager.m_GridLayer">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.GridManager.m_GridLayerLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.GridManager.m_GridItems">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.GridManager.m_GridItemsLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.GridManager.m_RegionHandleReply">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.GridManager.m_RegionHandleReplyLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.GridManager.Regions">
+            <summary>A dictionary of all the regions, indexed by region name</summary>
+        </member>
+        <member name="F:OpenMetaverse.GridManager.RegionsByHandle">
+            <summary>A dictionary of all the regions, indexed by region handle</summary>
+        </member>
+        <member name="E:OpenMetaverse.GridManager.CoarseLocationUpdate">
+            <summary>Raised when the simulator sends a <see cref="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket" />
+            containing the location of agents in the simulator</summary>
+        </member>
+        <member name="E:OpenMetaverse.GridManager.GridRegion">
+            <summary>Raised when the simulator sends a Region Data in response to
+            a Map request</summary>
+        </member>
+        <member name="E:OpenMetaverse.GridManager.GridLayer">
+            <summary>Raised when the simulator sends GridLayer object containing
+            a map tile coordinates and texture information</summary>
+        </member>
+        <member name="E:OpenMetaverse.GridManager.GridItems">
+            <summary>Raised when the simulator sends GridItems object containing
+            details on events, land sales at a specific location</summary>
+        </member>
+        <member name="E:OpenMetaverse.GridManager.RegionHandleReply">
+            <summary>Raised in response to a Region lookup</summary>
+        </member>
+        <member name="P:OpenMetaverse.GridManager.SunPhase">
+            <summary>Unknown</summary>
+        </member>
+        <member name="P:OpenMetaverse.GridManager.SunDirection">
+            <summary>Current direction of the sun</summary>
+        </member>
+        <member name="P:OpenMetaverse.GridManager.SunAngVelocity">
+            <summary>Current angular velocity of the sun</summary>
+        </member>
+        <member name="P:OpenMetaverse.GridManager.TimeOfDay">
+            <summary>Microseconds since the start of SL 4-hour day</summary>
+        </member>
+        <member name="M:OpenMetaverse.GridManager.OnCoarseLocationUpdate(OpenMetaverse.CoarseLocationUpdateEventArgs)">
+            <summary>Raises the CoarseLocationUpdate event</summary>
+            <param name="e">A CoarseLocationUpdateEventArgs object containing the
+            data sent by simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.GridManager.OnGridRegion(OpenMetaverse.GridRegionEventArgs)">
+            <summary>Raises the GridRegion event</summary>
+            <param name="e">A GridRegionEventArgs object containing the
+            data sent by simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.GridManager.OnGridLayer(OpenMetaverse.GridLayerEventArgs)">
+            <summary>Raises the GridLayer event</summary>
+            <param name="e">A GridLayerEventArgs object containing the
+            data sent by simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.GridManager.OnGridItems(OpenMetaverse.GridItemsEventArgs)">
+            <summary>Raises the GridItems event</summary>
+            <param name="e">A GridItemEventArgs object containing the
+            data sent by simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.GridManager.OnRegionHandleReply(OpenMetaverse.RegionHandleReplyEventArgs)">
+            <summary>Raises the RegionHandleReply event</summary>
+            <param name="e">A RegionHandleReplyEventArgs object containing the
+            data sent by simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.GridManager.RequestMapLayer(OpenMetaverse.GridLayerType)">
             <summary>
-            Adds the specified key to the dictionary, dictionary locking is not performed, 
-            <see cref="!:SafeAdd"/>
             </summary>
-            <param name="key">The key</param>
-            <param name="value">The value</param>
+            <param name="layer">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.Remove(`0)">
+        <member name="M:OpenMetaverse.GridManager.RequestMapRegion(System.String,OpenMetaverse.GridLayerType)">
             <summary>
-            Removes the specified key, dictionary locking is not performed
+            Request a map layer
             </summary>
-            <param name="key">The key.</param>
-            <returns><see langword="true"/> if successful, <see langword="false"/> otherwise</returns>
+            <param name="regionName">The name of the region</param>
+            <param name="layer">The type of layer</param>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.Clear">
+        <member name="M:OpenMetaverse.GridManager.RequestMapBlocks(OpenMetaverse.GridLayerType,System.UInt16,System.UInt16,System.UInt16,System.UInt16,System.Boolean)">
+            <summary>
+            </summary>
+            <param name="layer">
+            </param>
+            <param name="minX">
+            </param>
+            <param name="minY">
+            </param>
+            <param name="maxX">
+            </param>
+            <param name="maxY">
+            </param>
+            <param name="returnNonExistent">
+            </param>
+        </member>
+        <member name="M:OpenMetaverse.GridManager.MapItems(System.UInt64,OpenMetaverse.GridItemType,OpenMetaverse.GridLayerType,System.Int32)">
             <summary>
-            Clear the contents of the dictionary
             </summary>
+            <param name="regionHandle">
+            </param>
+            <param name="item">
+            </param>
+            <param name="layer">
+            </param>
+            <param name="timeoutMS">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.GetEnumerator">
+        <member name="M:OpenMetaverse.GridManager.RequestMapItems(System.UInt64,OpenMetaverse.GridItemType,OpenMetaverse.GridLayerType)">
             <summary>
-            Enumerator for iterating dictionary entries
             </summary>
-            <returns></returns>
+            <param name="regionHandle">
+            </param>
+            <param name="item">
+            </param>
+            <param name="layer">
+            </param>
         </member>
-        <member name="P:OpenMetaverse.ObservableDictionary`2.Count">
+        <member name="M:OpenMetaverse.GridManager.RequestMainlandSims(OpenMetaverse.GridLayerType)">
             <summary>
-            Gets the number of Key/Value pairs contained in the <seealso cref="T:ObservableDictionary"/>
+            Request data for all mainland (Linden managed) simulators
             </summary>
         </member>
-        <member name="P:OpenMetaverse.ObservableDictionary`2.Item(`0)">
+        <member name="M:OpenMetaverse.GridManager.RequestRegionHandle(OpenMetaverse.UUID)">
             <summary>
-            Indexer for the dictionary
+            Request the region handle for the specified region UUID
             </summary>
-            <param name="key">The key</param>
-            <returns>The value</returns>
+            <param name="regionID">UUID of the region to look up</param>
+        </member>
+        <member name="M:OpenMetaverse.GridManager.GetGridRegion(System.String,OpenMetaverse.GridLayerType,OpenMetaverse.GridRegion@)">
+            <summary>
+            Get grid region information using the region name, this function
+            will block until it can find the region or gives up
+            </summary>
+            <param name="name">Name of sim you're looking for</param>
+            <param name="layer">Layer that you are requesting</param>
+            <param name="region">Will contain a GridRegion for the sim you're
+            looking for if successful, otherwise an empty structure</param>
+            <returns>True if the GridRegion was successfully fetched, otherwise
+            false</returns>
+        </member>
+        <member name="M:OpenMetaverse.GridManager.MapBlockReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="M:OpenMetaverse.GridManager.MapItemReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="M:OpenMetaverse.GridManager.SimulatorViewerTimeMessageHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="M:OpenMetaverse.GridManager.CoarseLocationHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="M:OpenMetaverse.GridManager.RegionHandleReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
         <member name="T:OpenMetaverse.GroupMember">
             <summary>
@@ -9899,13 +8803,16 @@
             <summary>Will group show up in search</summary>
         </member>
         <member name="F:OpenMetaverse.Group.Powers">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.Group.AcceptNotices">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.Group.AllowPublish">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.Group.MaturePublish">
             <summary>Is the group Mature</summary>
@@ -9914,10 +8821,12 @@
             <summary>Cost of group membership</summary>
         </member>
         <member name="F:OpenMetaverse.Group.Money">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.Group.Contribution">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.Group.GroupMembershipCount">
             <summary>The total number of current members this group has</summary>
@@ -9960,72 +8869,89 @@
         <member name="F:OpenMetaverse.GroupProposal.Majority">
             <summary>The required ration of yes/no votes required for vote to pass</summary>
             <remarks>The three options are Simple Majority, 2/3 Majority, and Unanimous</remarks>
-            TODO: this should be an enum
-        </member>
+            TODO: this should be an enum</member>
         <member name="F:OpenMetaverse.GroupProposal.Duration">
             <summary>The duration in days votes are accepted</summary>
         </member>
         <member name="T:OpenMetaverse.GroupAccountSummary">
             <summary>
-            
             </summary>
         </member>
         <member name="F:OpenMetaverse.GroupAccountSummary.IntervalDays">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupAccountSummary.CurrentInterval">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupAccountSummary.StartDate">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupAccountSummary.Balance">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupAccountSummary.TotalCredits">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupAccountSummary.TotalDebits">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupAccountSummary.ObjectTaxCurrent">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupAccountSummary.LightTaxCurrent">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupAccountSummary.LandTaxCurrent">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupAccountSummary.GroupTaxCurrent">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupAccountSummary.ParcelDirFeeCurrent">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupAccountSummary.ObjectTaxEstimate">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupAccountSummary.LightTaxEstimate">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupAccountSummary.LandTaxEstimate">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupAccountSummary.GroupTaxEstimate">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupAccountSummary.ParcelDirFeeEstimate">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupAccountSummary.NonExemptMembers">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupAccountSummary.LastTaxDate">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupAccountSummary.TaxDate">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="T:OpenMetaverse.GroupNotice">
             <summary>
@@ -10033,22 +8959,26 @@
             </summary>
         </member>
         <member name="F:OpenMetaverse.GroupNotice.Subject">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupNotice.Message">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupNotice.AttachmentID">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupNotice.OwnerID">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="M:OpenMetaverse.GroupNotice.SerializeAttachment">
             <summary>
-            
             </summary>
-            <returns></returns>
+            <returns>
+            </returns>
         </member>
         <member name="T:OpenMetaverse.GroupNoticesListEntry">
             <summary>
@@ -10079,7 +9009,7 @@
             </summary>
         </member>
         <member name="F:OpenMetaverse.ChatSessionMember.AvatarKey">
-            <summary>The <see cref="T:OpenMetaverse.UUID"/> of the Avatar</summary>
+            <summary>The <see cref="T:OpenMetaverse.UUID" /> of the Avatar</summary>
         </member>
         <member name="F:OpenMetaverse.ChatSessionMember.CanVoiceChat">
             <summary>True if user has voice chat enabled</summary>
@@ -10099,25 +9029,32 @@
             </summary>
         </member>
         <member name="F:OpenMetaverse.GroupRoleUpdate.NoUpdate">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupRoleUpdate.UpdateData">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupRoleUpdate.UpdatePowers">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupRoleUpdate.UpdateAll">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupRoleUpdate.Create">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupRoleUpdate.Delete">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupPowers.None">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.GroupPowers.Invite">
             <summary>Can send invitations to groups default role</summary>
@@ -10194,7 +9131,7 @@
             <summary>Can toggle 'Edit Terrain' option in Land settings</summary>
         </member>
         <member name="F:OpenMetaverse.GroupPowers.LandOptions">
-            <summary>Can toggle various About Land > Options settings</summary>
+            <summary>Can toggle various About Land &gt; Options settings</summary>
         </member>
         <member name="F:OpenMetaverse.GroupPowers.AllowEditLand">
             <summary>Can always terraform land, even if parcel settings have it turned off</summary>
@@ -10265,173 +9202,104 @@
             information
             </summary>
         </member>
+        <member name="M:OpenMetaverse.GroupManager.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Construct a new instance of the GroupManager class
+            </summary>
+            <param name="client">A reference to the current <seealso cref="T:OpenMetaverse.GridClient" /> instance</param>
+        </member>
         <member name="F:OpenMetaverse.GroupManager.m_CurrentGroups">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.OnCurrentGroups(OpenMetaverse.CurrentGroupsEventArgs)">
-            <summary>Raises the CurrentGroups event</summary>
-            <param name="e">A CurrentGroupsEventArgs object containing the
-            data sent from the simulator</param>
-        </member>
         <member name="F:OpenMetaverse.GroupManager.m_CurrentGroupsLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupNames">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.OnGroupNamesReply(OpenMetaverse.GroupNamesEventArgs)">
-            <summary>Raises the GroupNamesReply event</summary>
-            <param name="e">A GroupNamesEventArgs object containing the
-            data response from the simulator</param>
-        </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupNamesLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupProfile">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.OnGroupProfile(OpenMetaverse.GroupProfileEventArgs)">
-            <summary>Raises the GroupProfile event</summary>
-            <param name="e">An GroupProfileEventArgs object containing the
-            data returned from the simulator</param>
-        </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupProfileLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupMembers">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.OnGroupMembersReply(OpenMetaverse.GroupMembersReplyEventArgs)">
-            <summary>Raises the GroupMembers event</summary>
-            <param name="e">A GroupMembersEventArgs object containing the
-            data returned from the simulator</param>
-        </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupMembersLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupRoles">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.OnGroupRoleDataReply(OpenMetaverse.GroupRolesDataReplyEventArgs)">
-            <summary>Raises the GroupRolesDataReply event</summary>
-            <param name="e">A GroupRolesDataReplyEventArgs object containing the
-            data returned from the simulator</param>
-        </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupRolesLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupRoleMembers">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.OnGroupRoleMembers(OpenMetaverse.GroupRolesMembersReplyEventArgs)">
-            <summary>Raises the GroupRoleMembersReply event</summary>
-            <param name="e">A GroupRolesRoleMembersReplyEventArgs object containing the
-            data returned from the simulator</param>
-        </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupRolesMembersLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupTitles">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.OnGroupTitles(OpenMetaverse.GroupTitlesReplyEventArgs)">
-            <summary>Raises the GroupTitlesReply event</summary>
-            <param name="e">A GroupTitlesReplyEventArgs object containing the
-            data returned from the simulator</param>
-        </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupTitlesLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupAccountSummary">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.OnGroupAccountSummaryReply(OpenMetaverse.GroupAccountSummaryReplyEventArgs)">
-            <summary>Raises the GroupAccountSummary event</summary>
-            <param name="e">A GroupAccountSummaryReplyEventArgs object containing the
-            data returned from the simulator</param>
-        </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupAccountSummaryLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupCreated">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.OnGroupCreatedReply(OpenMetaverse.GroupCreatedReplyEventArgs)">
-            <summary>Raises the GroupCreated event</summary>
-            <param name="e">An GroupCreatedEventArgs object containing the
-            data returned from the simulator</param>
-        </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupCreatedLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupJoined">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.OnGroupJoinedReply(OpenMetaverse.GroupOperationEventArgs)">
-            <summary>Raises the GroupJoined event</summary>
-            <param name="e">A GroupOperationEventArgs object containing the
-            result of the operation returned from the simulator</param>
-        </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupJoinedLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupLeft">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.OnGroupLeaveReply(OpenMetaverse.GroupOperationEventArgs)">
-            <summary>Raises the GroupLeft event</summary>
-            <param name="e">A GroupOperationEventArgs object containing the
-            result of the operation returned from the simulator</param>
-        </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupLeftLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupDropped">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.OnGroupDropped(OpenMetaverse.GroupDroppedEventArgs)">
-            <summary>Raises the GroupDropped event</summary>
-            <param name="e">An GroupDroppedEventArgs object containing the
-            the group your agent left</param>
-        </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupDroppedLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupMemberEjected">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.OnGroupMemberEjected(OpenMetaverse.GroupOperationEventArgs)">
-            <summary>Raises the GroupMemberEjected event</summary>
-            <param name="e">An GroupMemberEjectedEventArgs object containing the
-            data returned from the simulator</param>
-        </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupMemberEjectedLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupNoticesListReply">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.OnGroupNoticesListReply(OpenMetaverse.GroupNoticesListReplyEventArgs)">
-            <summary>Raises the GroupNoticesListReply event</summary>
-            <param name="e">An GroupNoticesListReplyEventArgs object containing the
-            data returned from the simulator</param>
-        </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupNoticesListReplyLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupInvitation">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.OnGroupInvitation(OpenMetaverse.GroupInvitationEventArgs)">
-            <summary>Raises the GroupInvitation event</summary>
-            <param name="e">An GroupInvitationEventArgs object containing the
-            data returned from the simulator</param>
-        </member>
         <member name="F:OpenMetaverse.GroupManager.m_GroupInvitationLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.GroupManager.Client">
-            <summary>A reference to the current <seealso cref="T:OpenMetaverse.GridClient"/> instance</summary>
+            <summary>A reference to the current <seealso cref="T:OpenMetaverse.GridClient" /> instance</summary>
         </member>
         <member name="F:OpenMetaverse.GroupManager.GroupMembersRequests">
             <summary>Currently-active group members requests</summary>
@@ -10454,11 +9322,132 @@
         <member name="F:OpenMetaverse.GroupManager.GroupName2KeyCache">
             <summary>Caches group name lookups</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Construct a new instance of the GroupManager class
-            </summary>
-            <param name="client">A reference to the current <seealso cref="T:OpenMetaverse.GridClient"/> instance</param>
+        <member name="E:OpenMetaverse.GroupManager.CurrentGroups">
+            <summary>Raised when the simulator sends us data containing
+            our current group membership</summary>
+        </member>
+        <member name="E:OpenMetaverse.GroupManager.GroupNamesReply">
+            <summary>Raised when the simulator responds to a RequestGroupName
+            or RequestGroupNames request</summary>
+        </member>
+        <member name="E:OpenMetaverse.GroupManager.GroupProfile">
+            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.GroupManager.RequestGroupProfile(OpenMetaverse.UUID)" /> request</summary>
+        </member>
+        <member name="E:OpenMetaverse.GroupManager.GroupMembersReply">
+            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.GroupManager.RequestGroupMembers(OpenMetaverse.UUID)" /> request</summary>
+        </member>
+        <member name="E:OpenMetaverse.GroupManager.GroupRoleDataReply">
+            <summary>Raised when the simulator responds to a <see cref="!:RequestGroupRoleData" /> request</summary>
+        </member>
+        <member name="E:OpenMetaverse.GroupManager.GroupRoleMembersReply">
+            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.GroupManager.RequestGroupRolesMembers(OpenMetaverse.UUID)" /> request</summary>
+        </member>
+        <member name="E:OpenMetaverse.GroupManager.GroupTitlesReply">
+            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.GroupManager.RequestGroupTitles(OpenMetaverse.UUID)" /> request</summary>
+        </member>
+        <member name="E:OpenMetaverse.GroupManager.GroupAccountSummaryReply">
+            <summary>Raised when a response to a RequestGroupAccountSummary is returned
+            by the simulator</summary>
+        </member>
+        <member name="E:OpenMetaverse.GroupManager.GroupCreatedReply">
+            <summary>Raised when a request to create a group is successful</summary>
+        </member>
+        <member name="E:OpenMetaverse.GroupManager.GroupJoinedReply">
+            <summary>Raised when a request to join a group either
+            fails or succeeds</summary>
+        </member>
+        <member name="E:OpenMetaverse.GroupManager.GroupLeaveReply">
+            <summary>Raised when a request to leave a group either
+            fails or succeeds</summary>
+        </member>
+        <member name="E:OpenMetaverse.GroupManager.GroupDropped">
+            <summary>Raised when A group is removed from the group server</summary>
+        </member>
+        <member name="E:OpenMetaverse.GroupManager.GroupMemberEjected">
+            <summary>Raised when a request to eject a member from a group either
+            fails or succeeds</summary>
+        </member>
+        <member name="E:OpenMetaverse.GroupManager.GroupNoticesListReply">
+            <summary>Raised when the simulator sends us group notices</summary>
+            <seealso cref="M:OpenMetaverse.GroupManager.RequestGroupNoticesList(OpenMetaverse.UUID)" />
+        </member>
+        <member name="E:OpenMetaverse.GroupManager.GroupInvitation">
+            <summary>Raised when another agent invites our avatar to join a group</summary>
+        </member>
+        <member name="M:OpenMetaverse.GroupManager.OnCurrentGroups(OpenMetaverse.CurrentGroupsEventArgs)">
+            <summary>Raises the CurrentGroups event</summary>
+            <param name="e">A CurrentGroupsEventArgs object containing the
+            data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupNamesReply(OpenMetaverse.GroupNamesEventArgs)">
+            <summary>Raises the GroupNamesReply event</summary>
+            <param name="e">A GroupNamesEventArgs object containing the
+            data response from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupProfile(OpenMetaverse.GroupProfileEventArgs)">
+            <summary>Raises the GroupProfile event</summary>
+            <param name="e">An GroupProfileEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupMembersReply(OpenMetaverse.GroupMembersReplyEventArgs)">
+            <summary>Raises the GroupMembers event</summary>
+            <param name="e">A GroupMembersEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupRoleDataReply(OpenMetaverse.GroupRolesDataReplyEventArgs)">
+            <summary>Raises the GroupRolesDataReply event</summary>
+            <param name="e">A GroupRolesDataReplyEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupRoleMembers(OpenMetaverse.GroupRolesMembersReplyEventArgs)">
+            <summary>Raises the GroupRoleMembersReply event</summary>
+            <param name="e">A GroupRolesRoleMembersReplyEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupTitles(OpenMetaverse.GroupTitlesReplyEventArgs)">
+            <summary>Raises the GroupTitlesReply event</summary>
+            <param name="e">A GroupTitlesReplyEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupAccountSummaryReply(OpenMetaverse.GroupAccountSummaryReplyEventArgs)">
+            <summary>Raises the GroupAccountSummary event</summary>
+            <param name="e">A GroupAccountSummaryReplyEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupCreatedReply(OpenMetaverse.GroupCreatedReplyEventArgs)">
+            <summary>Raises the GroupCreated event</summary>
+            <param name="e">An GroupCreatedEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupJoinedReply(OpenMetaverse.GroupOperationEventArgs)">
+            <summary>Raises the GroupJoined event</summary>
+            <param name="e">A GroupOperationEventArgs object containing the
+            result of the operation returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupLeaveReply(OpenMetaverse.GroupOperationEventArgs)">
+            <summary>Raises the GroupLeft event</summary>
+            <param name="e">A GroupOperationEventArgs object containing the
+            result of the operation returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupDropped(OpenMetaverse.GroupDroppedEventArgs)">
+            <summary>Raises the GroupDropped event</summary>
+            <param name="e">An GroupDroppedEventArgs object containing the
+            the group your agent left</param>
+        </member>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupMemberEjected(OpenMetaverse.GroupOperationEventArgs)">
+            <summary>Raises the GroupMemberEjected event</summary>
+            <param name="e">An GroupMemberEjectedEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupNoticesListReply(OpenMetaverse.GroupNoticesListReplyEventArgs)">
+            <summary>Raises the GroupNoticesListReply event</summary>
+            <param name="e">An GroupNoticesListReplyEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.GroupManager.OnGroupInvitation(OpenMetaverse.GroupInvitationEventArgs)">
+            <summary>Raises the GroupInvitation event</summary>
+            <param name="e">An GroupInvitationEventArgs object containing the
+            data returned from the simulator</param>
         </member>
         <member name="M:OpenMetaverse.GroupManager.RequestCurrentGroups">
             <summary>
@@ -10539,7 +9528,7 @@
             <summary>
             Save wheather agent wants to accept group notices and list this group in their profile
             </summary>
-            <param name="groupID">Group <see cref="T:OpenMetaverse.UUID"/></param>
+            <param name="groupID">Group <see cref="T:OpenMetaverse.UUID" /></param>
             <param name="acceptNotices">Accept notices from this group</param>
             <param name="listInProfile">List this group in the profile</param>
         </member>
@@ -10603,12 +9592,14 @@
         <member name="M:OpenMetaverse.GroupManager.SendGroupNotice(OpenMetaverse.UUID,OpenMetaverse.GroupNotice)">
             <summary>Send out a group notice</summary>
             <param name="group">Group ID to update</param>
-            <param name="notice"><code>GroupNotice</code> structure containing notice data</param>
+            <param name="notice">
+                <code>GroupNotice</code> structure containing notice data</param>
         </member>
         <member name="M:OpenMetaverse.GroupManager.StartProposal(OpenMetaverse.UUID,OpenMetaverse.GroupProposal)">
             <summary>Start a group proposal (vote)</summary>
             <param name="group">The Group ID to send proposal to</param>
-            <param name="prop"><code>GroupProposal</code> structure containing the proposal</param>
+            <param name="prop">
+                <code>GroupProposal</code> structure containing the proposal</param>
         </member>
         <member name="M:OpenMetaverse.GroupManager.LeaveGroup(OpenMetaverse.UUID)">
             <summary>Request to leave a group</summary>
@@ -10690,58 +9681,6 @@
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="E:OpenMetaverse.GroupManager.CurrentGroups">
-            <summary>Raised when the simulator sends us data containing
-            our current group membership</summary>
-        </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupNamesReply">
-            <summary>Raised when the simulator responds to a RequestGroupName 
-            or RequestGroupNames request</summary>
-        </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupProfile">
-            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.GroupManager.RequestGroupProfile(OpenMetaverse.UUID)"/> request</summary>
-        </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupMembersReply">
-            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.GroupManager.RequestGroupMembers(OpenMetaverse.UUID)"/> request</summary>
-        </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupRoleDataReply">
-            <summary>Raised when the simulator responds to a <see cref="!:RequestGroupRoleData"/> request</summary>
-        </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupRoleMembersReply">
-            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.GroupManager.RequestGroupRolesMembers(OpenMetaverse.UUID)"/> request</summary>
-        </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupTitlesReply">
-            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.GroupManager.RequestGroupTitles(OpenMetaverse.UUID)"/> request</summary>
-        </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupAccountSummaryReply">
-            <summary>Raised when a response to a RequestGroupAccountSummary is returned
-            by the simulator</summary>
-        </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupCreatedReply">
-            <summary>Raised when a request to create a group is successful</summary>
-        </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupJoinedReply">
-            <summary>Raised when a request to join a group either
-            fails or succeeds</summary>
-        </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupLeaveReply">
-            <summary>Raised when a request to leave a group either
-            fails or succeeds</summary>
-        </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupDropped">
-            <summary>Raised when A group is removed from the group server</summary>
-        </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupMemberEjected">
-            <summary>Raised when a request to eject a member from a group either
-            fails or succeeds</summary>
-        </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupNoticesListReply">
-            <summary>Raised when the simulator sends us group notices</summary>
-            <seealso cref="M:OpenMetaverse.GroupManager.RequestGroupNoticesList(OpenMetaverse.UUID)"/>
-        </member>
-        <member name="E:OpenMetaverse.GroupManager.GroupInvitation">
-            <summary>Raised when another agent invites our avatar to join a group</summary>
-        </member>
         <member name="T:OpenMetaverse.CurrentGroupsEventArgs">
             <summary>Contains the current groups your agent is a member of</summary>
         </member>
@@ -10927,7 +9866,7 @@
             <summary>
             Provides notification of a group invitation request sent by another Avatar
             </summary>
-            <remarks>The <see cref="!:GroupInvitation"/> invitation is raised when another avatar makes an offer for our avatar
+            <remarks>The <see cref="!:GroupInvitation" /> invitation is raised when another avatar makes an offer for our avatar
             to join a group.</remarks>
         </member>
         <member name="P:OpenMetaverse.GroupInvitationEventArgs.AgentID">
@@ -10946,401 +9885,245 @@
         <member name="P:OpenMetaverse.GroupInvitationEventArgs.Accept">
             <summary>Set to true to accept invitation, false to decline</summary>
         </member>
-        <member name="M:OpenMetaverse.CoordinateFrame.LookDirection(OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
-            <summary>
-            
-            </summary>
-            <param name="at">Looking direction, must be a normalized vector</param>
-            <param name="upDirection">Up direction, must be a normalized vector</param>
-        </member>
-        <member name="M:OpenMetaverse.CoordinateFrame.LookDirection(System.Double)">
-            <summary>
-            Align the coordinate frame X and Y axis with a given rotation
-            around the Z axis in radians
-            </summary>
-            <param name="heading">Absolute rotation around the Z axis in
-            radians</param>
-        </member>
-        <member name="P:OpenMetaverse.CoordinateFrame.Origin">
-            <summary>Origin position of this coordinate frame</summary>
-        </member>
-        <member name="P:OpenMetaverse.CoordinateFrame.XAxis">
-            <summary>X axis of this coordinate frame, or Forward/At in grid terms</summary>
-        </member>
-        <member name="P:OpenMetaverse.CoordinateFrame.YAxis">
-            <summary>Y axis of this coordinate frame, or Left in grid terms</summary>
-        </member>
-        <member name="P:OpenMetaverse.CoordinateFrame.ZAxis">
-            <summary>Z axis of this coordinate frame, or Up in grid terms</summary>
-        </member>
-        <member name="T:OpenMetaverse.ProfileFlags">
-            <summary>
-            Avatar profile flags
-            </summary>
-        </member>
-        <member name="T:OpenMetaverse.Avatar">
-            <summary>
-            Represents an avatar (other than your own)
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Avatar.Groups">
-            <summary>Groups that this avatar is a member of</summary>
-        </member>
-        <member name="F:OpenMetaverse.Avatar.ProfileStatistics">
-            <summary>Positive and negative ratings</summary>
-        </member>
-        <member name="F:OpenMetaverse.Avatar.ProfileProperties">
-            <summary>Avatar properties including about text, profile URL, image IDs and 
-            publishing settings</summary>
-        </member>
-        <member name="F:OpenMetaverse.Avatar.ProfileInterests">
-            <summary>Avatar interests including spoken languages, skills, and "want to"
-            choices</summary>
-        </member>
-        <member name="F:OpenMetaverse.Avatar.ControlFlags">
-            <summary>Movement control flags for avatars. Typically not set or used by
-            clients. To move your avatar, use Client.Self.Movement instead</summary>
-        </member>
-        <member name="F:OpenMetaverse.Avatar.VisualParameters">
-            <summary>
-            Contains the visual parameters describing the deformation of the avatar
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Avatar.#ctor">
+        <member name="T:OpenMetaverse.Helpers">
             <summary>
-            Default constructor
+            Static helper functions and global variables
             </summary>
         </member>
-        <member name="P:OpenMetaverse.Avatar.FirstName">
-            <summary>First name</summary>
-        </member>
-        <member name="P:OpenMetaverse.Avatar.LastName">
-            <summary>Last name</summary>
-        </member>
-        <member name="P:OpenMetaverse.Avatar.Name">
-            <summary>Full name</summary>
-        </member>
-        <member name="P:OpenMetaverse.Avatar.GroupName">
-            <summary>Active group</summary>
-        </member>
-        <member name="T:OpenMetaverse.Avatar.Statistics">
+        <member name="T:OpenMetaverse.Helpers.LogLevel">
             <summary>
-            Positive and negative ratings
+            Passed to Logger.Log() to identify the severity of a log entry
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.BehaviorPositive">
-            <summary>Positive ratings for Behavior</summary>
-        </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.BehaviorNegative">
-            <summary>Negative ratings for Behavior</summary>
-        </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.AppearancePositive">
-            <summary>Positive ratings for Appearance</summary>
-        </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.AppearanceNegative">
-            <summary>Negative ratings for Appearance</summary>
-        </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.BuildingPositive">
-            <summary>Positive ratings for Building</summary>
+        <member name="F:OpenMetaverse.Helpers.LogLevel.None">
+            <summary>No logging information will be output</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.BuildingNegative">
-            <summary>Negative ratings for Building</summary>
+        <member name="F:OpenMetaverse.Helpers.LogLevel.Info">
+            <summary>Non-noisy useful information, may be helpful in
+            debugging a problem</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.GivenPositive">
-            <summary>Positive ratings given by this avatar</summary>
+        <member name="F:OpenMetaverse.Helpers.LogLevel.Warning">
+            <summary>A non-critical error occurred. A warning will not
+            prevent the rest of the library from operating as usual,
+            although it may be indicative of an underlying issue</summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.GivenNegative">
-            <summary>Negative ratings given by this avatar</summary>
+        <member name="F:OpenMetaverse.Helpers.LogLevel.Error">
+            <summary>A critical error has occurred. Generally this will
+            be followed by the network layer shutting down, although the
+            stability of the library after an error is uncertain</summary>
         </member>
-        <member name="T:OpenMetaverse.Avatar.AvatarProperties">
-            <summary>
-            Avatar properties including about text, profile URL, image IDs and 
-            publishing settings
+        <member name="F:OpenMetaverse.Helpers.LogLevel.Debug">
+            <summary>Used for internal testing, this logging level can
+            generate very noisy (long and/or repetitive) messages. Don't
+            pass this to the Log() function, use DebugLog() instead.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.FirstLifeText">
-            <summary>First Life about text</summary>
-        </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.FirstLifeImage">
-            <summary>First Life image ID</summary>
-        </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.Partner">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.AboutText">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.BornOn">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.CharterMember">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.ProfileImage">
-            <summary>Profile image ID</summary>
-        </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.Flags">
-            <summary>Flags of the profile</summary>
-        </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.ProfileURL">
-            <summary>Web URL for this profile</summary>
-        </member>
-        <member name="P:OpenMetaverse.Avatar.AvatarProperties.AllowPublish">
-            <summary>Should this profile be published on the web</summary>
-        </member>
-        <member name="P:OpenMetaverse.Avatar.AvatarProperties.Online">
-            <summary>Avatar Online Status</summary>
+        <member name="F:OpenMetaverse.Helpers.MSG_APPENDED_ACKS">
+            <summary>This header flag signals that ACKs are appended to the packet</summary>
         </member>
-        <member name="P:OpenMetaverse.Avatar.AvatarProperties.MaturePublish">
-            <summary>Is this a mature profile</summary>
+        <member name="F:OpenMetaverse.Helpers.MSG_RESENT">
+            <summary>This header flag signals that this packet has been sent before</summary>
         </member>
-        <member name="P:OpenMetaverse.Avatar.AvatarProperties.Identified">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Helpers.MSG_RELIABLE">
+            <summary>This header flags signals that an ACK is expected for this packet</summary>
         </member>
-        <member name="P:OpenMetaverse.Avatar.AvatarProperties.Transacted">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Helpers.MSG_ZEROCODED">
+            <summary>This header flag signals that the message is compressed using zerocoding</summary>
         </member>
-        <member name="T:OpenMetaverse.Avatar.Interests">
+        <member name="M:OpenMetaverse.Helpers.TEOffsetShort(System.Single)">
             <summary>
-            Avatar interests including spoken languages, skills, and "want to"
-            choices
             </summary>
+            <param name="offset">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Interests.LanguagesText">
-            <summary>Languages profile field</summary>
-        </member>
-        <member name="F:OpenMetaverse.Avatar.Interests.SkillsMask">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Avatar.Interests.SkillsText">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Avatar.Interests.WantToMask">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Avatar.Interests.WantToText">
-            <summary></summary>
-        </member>
-        <member name="M:OpenMetaverse.Voice.VoiceParticipant.IDFromName(System.String)">
+        <member name="M:OpenMetaverse.Helpers.TEOffsetFloat(System.Byte[],System.Int32)">
             <summary>
-            Extract the avatar UUID encoded in a SIP URI
             </summary>
-            <param name="inName"></param>
-            <returns></returns>
+            <param name="bytes">
+            </param>
+            <param name="pos">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="T:OpenMetaverse.MediaPermission">
+        <member name="M:OpenMetaverse.Helpers.TERotationShort(System.Single)">
             <summary>
-            Permissions for control of object media
             </summary>
+            <param name="rotation">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="T:OpenMetaverse.MediaControls">
+        <member name="M:OpenMetaverse.Helpers.TERotationFloat(System.Byte[],System.Int32)">
             <summary>
-            Style of cotrols that shold be displayed to the user
             </summary>
+            <param name="bytes">
+            </param>
+            <param name="pos">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="T:OpenMetaverse.MediaEntry">
+        <member name="M:OpenMetaverse.Helpers.GlobalPosToRegionHandle(System.Single,System.Single,System.Single@,System.Single@)">
             <summary>
-            Class representing media data for a single face
+            Given an X/Y location in absolute (grid-relative) terms, a region
+            handle is returned along with the local X/Y location in that region
             </summary>
+            <param name="globalX">The absolute X location, a number such as
+            255360.35</param>
+            <param name="globalY">The absolute Y location, a number such as
+            255360.35</param>
+            <param name="localX">The sim-local X position of the global X
+            position, a value from 0.0 to 256.0</param>
+            <param name="localY">The sim-local Y position of the global Y
+            position, a value from 0.0 to 256.0</param>
+            <returns>A 64-bit region handle that can be used to teleport to</returns>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.EnableAlterntiveImage">
-            <summary>Is display of the alternative image enabled</summary>
-        </member>
-        <member name="F:OpenMetaverse.MediaEntry.AutoLoop">
-            <summary>Should media auto loop</summary>
-        </member>
-        <member name="F:OpenMetaverse.MediaEntry.AutoPlay">
-            <summary>Shoule media be auto played</summary>
-        </member>
-        <member name="F:OpenMetaverse.MediaEntry.AutoScale">
-            <summary>Auto scale media to prim face</summary>
-        </member>
-        <member name="F:OpenMetaverse.MediaEntry.AutoZoom">
-            <summary>Should viewer automatically zoom in on the face when clicked</summary>
-        </member>
-        <member name="F:OpenMetaverse.MediaEntry.InteractOnFirstClick">
-            <summary>Should viewer interpret first click as interaction with the media
-            or when false should the first click be treated as zoom in commadn</summary>
-        </member>
-        <member name="F:OpenMetaverse.MediaEntry.Controls">
-            <summary>Style of controls viewer should display when
-            viewer media on this face</summary>
-        </member>
-        <member name="F:OpenMetaverse.MediaEntry.HomeURL">
-            <summary>Starting URL for the media</summary>
-        </member>
-        <member name="F:OpenMetaverse.MediaEntry.CurrentURL">
-            <summary>Currently navigated URL</summary>
-        </member>
-        <member name="F:OpenMetaverse.MediaEntry.Height">
-            <summary>Media height in pixes</summary>
-        </member>
-        <member name="F:OpenMetaverse.MediaEntry.Width">
-            <summary>Media width in pixels</summary>
-        </member>
-        <member name="F:OpenMetaverse.MediaEntry.ControlPermissions">
-            <summary>Who can controls the media</summary>
-        </member>
-        <member name="F:OpenMetaverse.MediaEntry.InteractPermissions">
-            <summary>Who can interact with the media</summary>
-        </member>
-        <member name="F:OpenMetaverse.MediaEntry.EnableWhiteList">
-            <summary>Is URL whitelist enabled</summary>
-        </member>
-        <member name="F:OpenMetaverse.MediaEntry.WhiteList">
-            <summary>Array of URLs that are whitelisted</summary>
-        </member>
-        <member name="M:OpenMetaverse.MediaEntry.GetOSD">
+        <member name="M:OpenMetaverse.Helpers.FloatToTerseString(System.Single)">
             <summary>
-            Serialize to OSD
+            Converts a floating point number to a terse string format used for
+            transmitting numbers in wearable asset files
             </summary>
-            <returns>OSDMap with the serialized data</returns>
+            <param name="val">Floating point number to convert to a string</param>
+            <returns>A terse string representation of the input number</returns>
         </member>
-        <member name="M:OpenMetaverse.MediaEntry.FromOSD(OpenMetaverse.StructuredData.OSD)">
+        <member name="M:OpenMetaverse.Helpers.FieldToString(System.Text.StringBuilder,System.Byte[],System.String)">
             <summary>
-            Deserialize from OSD data
+            Convert a variable length field (byte array) to a string, with a
+            field name prepended to each line of the output
             </summary>
-            <param name="osd">Serialized OSD data</param>
-            <returns>Deserialized object</returns>
+            <remarks>If the byte array has unprintable characters in it, a
+            hex dump will be written instead</remarks>
+            <param name="output">The StringBuilder object to write to</param>
+            <param name="bytes">The byte array to convert to a string</param>
+            <param name="fieldName">A field name to prepend to each line of output</param>
         </member>
-        <member name="T:OpenMetaverse.VisualColorOperation">
+        <member name="M:OpenMetaverse.Helpers.ZeroDecode(System.Byte[],System.Int32,System.Byte[])">
             <summary>
-            Operation to apply when applying color to texture
+            Decode a zerocoded byte array, used to decompress packets marked
+            with the zerocoded flag
             </summary>
+            <remarks>Any time a zero is encountered, the next byte is a count
+            of how many zeroes to expand. One zero is encoded with 0x00 0x01,
+            two zeroes is 0x00 0x02, three zeroes is 0x00 0x03, etc. The
+            first four bytes are copied directly to the output buffer.
+            </remarks>
+            <param name="src">The byte array to decode</param>
+            <param name="srclen">The length of the byte array to decode. This
+            would be the length of the packet up to (but not including) any
+            appended ACKs</param>
+            <param name="dest">The output byte array to decode to</param>
+            <returns>The length of the output buffer</returns>
         </member>
-        <member name="T:OpenMetaverse.VisualColorParam">
+        <member name="M:OpenMetaverse.Helpers.ZeroEncode(System.Byte[],System.Int32,System.Byte[])">
             <summary>
-            Information needed to translate visual param value to RGBA color
+            Encode a byte array with zerocoding. Used to compress packets marked
+            with the zerocoded flag. Any zeroes in the array are compressed down
+            to a single zero byte followed by a count of how many zeroes to expand
+            out. A single zero becomes 0x00 0x01, two zeroes becomes 0x00 0x02,
+            three zeroes becomes 0x00 0x03, etc. The first four bytes are copied
+            directly to the output buffer.
             </summary>
+            <param name="src">The byte array to encode</param>
+            <param name="srclen">The length of the byte array to encode</param>
+            <param name="dest">The output byte array to encode to</param>
+            <returns>The length of the output buffer</returns>
         </member>
-        <member name="M:OpenMetaverse.VisualColorParam.#ctor(OpenMetaverse.VisualColorOperation,OpenMetaverse.Color4[])">
+        <member name="M:OpenMetaverse.Helpers.InventoryCRC(System.Int32,System.Byte,System.SByte,System.SByte,OpenMetaverse.UUID,OpenMetaverse.UUID,System.Int32,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,System.UInt32,System.UInt32,System.UInt32,System.UInt32,System.UInt32)">
             <summary>
-            Construct VisualColorParam
+            Calculates the CRC (cyclic redundancy check) needed to upload inventory.
             </summary>
-            <param name="operation">Operation to apply when applying color to texture</param>
-            <param name="colors">Colors</param>
+            <param name="creationDate">Creation date</param>
+            <param name="saleType">Sale type</param>
+            <param name="invType">Inventory type</param>
+            <param name="type">Type</param>
+            <param name="assetID">Asset ID</param>
+            <param name="groupID">Group ID</param>
+            <param name="salePrice">Sale price</param>
+            <param name="ownerID">Owner ID</param>
+            <param name="creatorID">Creator ID</param>
+            <param name="itemID">Item ID</param>
+            <param name="folderID">Folder ID</param>
+            <param name="everyoneMask">Everyone mask (permissions)</param>
+            <param name="flags">Flags</param>
+            <param name="nextOwnerMask">Next owner mask (permissions)</param>
+            <param name="groupMask">Group mask (permissions)</param>
+            <param name="ownerMask">Owner mask (permissions)</param>
+            <returns>The calculated CRC</returns>
         </member>
-        <member name="T:OpenMetaverse.VisualAlphaParam">
+        <member name="M:OpenMetaverse.Helpers.GetResourceStream(System.String)">
             <summary>
-            Represents alpha blending and bump infor for a visual parameter
-            such as sleive length
+            Attempts to load a file embedded in the assembly
             </summary>
+            <param name="resourceName">The filename of the resource to load</param>
+            <returns>A Stream for the requested file, or null if the resource
+            was not successfully loaded</returns>
         </member>
-        <member name="F:OpenMetaverse.VisualAlphaParam.Domain">
-            <summary>Stregth of the alpha to apply</summary>
-        </member>
-        <member name="F:OpenMetaverse.VisualAlphaParam.TGAFile">
-            <summary>File containing the alpha channel</summary>
-        </member>
-        <member name="F:OpenMetaverse.VisualAlphaParam.SkipIfZero">
-            <summary>Skip blending if parameter value is 0</summary>
-        </member>
-        <member name="F:OpenMetaverse.VisualAlphaParam.MultiplyBlend">
-            <summary>Use miltiply insted of alpha blending</summary>
-        </member>
-        <member name="M:OpenMetaverse.VisualAlphaParam.#ctor(System.Single,System.String,System.Boolean,System.Boolean)">
+        <member name="M:OpenMetaverse.Helpers.GetResourceStream(System.String,System.String)">
             <summary>
-            Create new alhpa information for a visual param
+            Attempts to load a file either embedded in the assembly or found in
+            a given search path
             </summary>
-            <param name="domain">Stregth of the alpha to apply</param>
-            <param name="tgaFile">File containing the alpha channel</param>
-            <param name="skipIfZero">Skip blending if parameter value is 0</param>
-            <param name="multiplyBlend">Use miltiply insted of alpha blending</param>
+            <param name="resourceName">The filename of the resource to load</param>
+            <param name="searchPath">An optional path that will be searched if
+            the asset is not found embedded in the assembly</param>
+            <returns>A Stream for the requested file, or null if the resource
+            was not successfully loaded</returns>
         </member>
-        <member name="T:OpenMetaverse.VisualParam">
+        <member name="M:OpenMetaverse.Helpers.PrimListToOSD(System.Collections.Generic.List{OpenMetaverse.Primitive})">
             <summary>
-            A single visual characteristic of an avatar mesh, such as eyebrow height
+            Converts a list of primitives to an object that can be serialized
+            with the LLSD system
             </summary>
+            <param name="prims">Primitives to convert to a serializable object</param>
+            <returns>An object that can be serialized with LLSD</returns>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.ParamID">
-            <summary>Index of this visual param</summary>
-        </member>
-        <member name="F:OpenMetaverse.VisualParam.Name">
-            <summary>Internal name</summary>
-        </member>
-        <member name="F:OpenMetaverse.VisualParam.Group">
-            <summary>Group ID this parameter belongs to</summary>
-        </member>
-        <member name="F:OpenMetaverse.VisualParam.Wearable">
-            <summary>Name of the wearable this parameter belongs to</summary>
-        </member>
-        <member name="F:OpenMetaverse.VisualParam.Label">
-            <summary>Displayable label of this characteristic</summary>
-        </member>
-        <member name="F:OpenMetaverse.VisualParam.LabelMin">
-            <summary>Displayable label for the minimum value of this characteristic</summary>
-        </member>
-        <member name="F:OpenMetaverse.VisualParam.LabelMax">
-            <summary>Displayable label for the maximum value of this characteristic</summary>
-        </member>
-        <member name="F:OpenMetaverse.VisualParam.DefaultValue">
-            <summary>Default value</summary>
-        </member>
-        <member name="F:OpenMetaverse.VisualParam.MinValue">
-            <summary>Minimum value</summary>
-        </member>
-        <member name="F:OpenMetaverse.VisualParam.MaxValue">
-            <summary>Maximum value</summary>
-        </member>
-        <member name="F:OpenMetaverse.VisualParam.IsBumpAttribute">
-            <summary>Is this param used for creation of bump layer?</summary>
-        </member>
-        <member name="F:OpenMetaverse.VisualParam.AlphaParams">
-            <summary>Alpha blending/bump info</summary>
-        </member>
-        <member name="F:OpenMetaverse.VisualParam.ColorParams">
-            <summary>Color information</summary>
-        </member>
-        <member name="F:OpenMetaverse.VisualParam.Drivers">
-            <summary>Array of param IDs that are drivers for this parameter</summary>
-        </member>
-        <member name="M:OpenMetaverse.VisualParam.#ctor(System.Int32,System.String,System.Int32,System.String,System.String,System.String,System.String,System.Single,System.Single,System.Single,System.Boolean,System.Int32[],System.Nullable{OpenMetaverse.VisualAlphaParam},System.Nullable{OpenMetaverse.VisualColorParam})">
+        <member name="M:OpenMetaverse.Helpers.OSDToPrimList(OpenMetaverse.StructuredData.OSD)">
             <summary>
-            Set all the values through the constructor
+            Deserializes OSD in to a list of primitives
             </summary>
-            <param name="paramID">Index of this visual param</param>
-            <param name="name">Internal name</param>
-            <param name="group"></param>
-            <param name="wearable"></param>
-            <param name="label">Displayable label of this characteristic</param>
-            <param name="labelMin">Displayable label for the minimum value of this characteristic</param>
-            <param name="labelMax">Displayable label for the maximum value of this characteristic</param>
-            <param name="def">Default value</param>
-            <param name="min">Minimum value</param>
-            <param name="max">Maximum value</param>
-            <param name="isBumpAttribute">Is this param used for creation of bump layer?</param>
-            <param name="drivers">Array of param IDs that are drivers for this parameter</param>
-            <param name="alpha">Alpha blending/bump info</param>
-            <param name="colorParams">Color information</param>
+            <param name="osd">Structure holding the serialized primitive list,
+            must be of the SDMap type</param>
+            <returns>A list of deserialized primitives</returns>
         </member>
-        <member name="T:OpenMetaverse.VisualParams">
+        <member name="M:OpenMetaverse.Helpers.StructToString(System.Object)">
             <summary>
-            Holds the Params array of all the avatar appearance parameters
+            Converts a struct or class object containing fields only into a key value separated string
             </summary>
+            <param name="t">The struct object</param>
+            <returns>A string containing the struct fields as the keys, and the field value as the value separated</returns>
+            <example>
+                <code>
+            // Add the following code to any struct or class containing only fields to override the ToString()
+            // method to display the values of the passed object
+            /// <summary>Print the struct data as a string</summary>
+            ///<returns>A string containing the field name, and field value</returns>
+            public override string ToString()
+            {
+            return Helpers.StructToString(this);
+            }
+            </code>
+            </example>
         </member>
         <member name="T:OpenMetaverse.InternalDictionary`2">
             <summary>
             The InternalDictionary class is used through the library for storing key/value pairs.
-            It is intended to be a replacement for the generic Dictionary class and should 
+            It is intended to be a replacement for the generic Dictionary class and should
             be used in its place. It contains several methods for allowing access to the data from
             outside the library that are read only and thread safe.
-            
             </summary>
-            <typeparam name="TKey">Key <see langword="Tkey"/></typeparam>
-            <typeparam name="TValue">Value <see langword="TValue"/></typeparam>
-        </member>
-        <member name="F:OpenMetaverse.InternalDictionary`2.Dictionary">
-            <summary>Internal dictionary that this class wraps around. Do not
-            modify or enumerate the contents of this dictionary without locking
-            on this member</summary>
+            <typeparam name="TKey">Key <see langword="Tkey" /></typeparam>
+            <typeparam name="TValue">Value <see langword="TValue" /></typeparam>
         </member>
         <member name="M:OpenMetaverse.InternalDictionary`2.#ctor">
             <summary>
-            Initializes a new instance of the <seealso cref="T:InternalDictionary"/> Class 
+            Initializes a new instance of the <seealso cref="T:InternalDictionary" /> Class
             with the specified key/value, has the default initial capacity.
             </summary>
             <example>
-            <code>
+                <code>
             // initialize a new InternalDictionary named testDict with a string as the key and an int as the value.
             public InternalDictionary&lt;string, int&gt; testDict = new InternalDictionary&lt;string, int&gt;();
             </code>
@@ -11348,22 +10131,20 @@
         </member>
         <member name="M:OpenMetaverse.InternalDictionary`2.#ctor(System.Collections.Generic.IDictionary{`0,`1})">
             <summary>
-            Initializes a new instance of the <seealso cref="T:InternalDictionary"/> Class 
-            with the specified key/value, has its initial valies copied from the specified 
-            <seealso cref="T:System.Collections.Generic.Dictionary"/>
-            </summary>
-            <param name="dictionary"><seealso cref="T:System.Collections.Generic.Dictionary"/>
+            Initializes a new instance of the <seealso cref="T:InternalDictionary" /> Class
+            with the specified key/value, has its initial valies copied from the specified
+            <seealso cref="T:System.Collections.Generic.Dictionary" /></summary>
+            <param name="dictionary">
+                <seealso cref="T:System.Collections.Generic.Dictionary" />
             to copy initial values from</param>
             <example>
-            <code>
+                <code>
             // initialize a new InternalDictionary named testAvName with a UUID as the key and an string as the value.
             // populates with copied values from example KeyNameCache Dictionary.
-            
             // create source dictionary
             Dictionary&lt;UUID, string&gt; KeyNameCache = new Dictionary&lt;UUID, string&gt;();
             KeyNameCache.Add("8300f94a-7970-7810-cf2c-fc9aa6cdda24", "Jack Avatar");
             KeyNameCache.Add("27ba1e40-13f7-0708-3e98-5819d780bd62", "Jill Avatar");
-            
             // Initialize new dictionary.
             public InternalDictionary&lt;UUID, string&gt; testAvName = new InternalDictionary&lt;UUID, string&gt;(KeyNameCache);
             </code>
@@ -11371,33 +10152,50 @@
         </member>
         <member name="M:OpenMetaverse.InternalDictionary`2.#ctor(System.Int32)">
             <summary>
-            Initializes a new instance of the <seealso cref="T:OpenMetaverse.InternalDictionary"/> Class 
+            Initializes a new instance of the <seealso cref="T:OpenMetaverse.InternalDictionary" /> Class
             with the specified key/value, With its initial capacity specified.
             </summary>
             <param name="capacity">Initial size of dictionary</param>
             <example>
-            <code>
-            // initialize a new InternalDictionary named testDict with a string as the key and an int as the value, 
+                <code>
+            // initialize a new InternalDictionary named testDict with a string as the key and an int as the value,
             // initially allocated room for 10 entries.
             public InternalDictionary&lt;string, int&gt; testDict = new InternalDictionary&lt;string, int&gt;(10);
             </code>
             </example>
         </member>
+        <member name="F:OpenMetaverse.InternalDictionary`2.Dictionary">
+            <summary>Internal dictionary that this class wraps around. Do not
+            modify or enumerate the contents of this dictionary without locking
+            on this member</summary>
+        </member>
+        <member name="P:OpenMetaverse.InternalDictionary`2.Item(`0)">
+            <summary>
+            Indexer for the dictionary
+            </summary>
+            <param name="key">The key</param>
+            <returns>The value</returns>
+        </member>
+        <member name="P:OpenMetaverse.InternalDictionary`2.Count">
+            <summary>
+            Gets the number of Key/Value pairs contained in the <seealso cref="T:InternalDictionary" /></summary>
+        </member>
         <member name="M:OpenMetaverse.InternalDictionary`2.TryGetValue(`0,`1@)">
             <summary>
-            Try to get entry from <seealso cref="T:OpenMetaverse.InternalDictionary"/> with specified key 
+            Try to get entry from <seealso cref="T:OpenMetaverse.InternalDictionary" /> with specified key
             </summary>
             <param name="key">Key to use for lookup</param>
             <param name="value">Value returned</param>
-            <returns><see langword="true"/> if specified key exists,  <see langword="false"/> if not found</returns>
+            <returns>
+                <see langword="true" /> if specified key exists,  <see langword="false" /> if not found</returns>
             <example>
-            <code>
+                <code>
             // find your avatar using the Simulator.ObjectsAvatars InternalDictionary:
-               Avatar av;
-               if (Client.Network.CurrentSim.ObjectsAvatars.TryGetValue(Client.Self.AgentID, out av))
-                   Console.WriteLine("Found Avatar {0}", av.Name);
+            Avatar av;
+            if (Client.Network.CurrentSim.ObjectsAvatars.TryGetValue(Client.Self.AgentID, out av))
+            Console.WriteLine("Found Avatar {0}", av.Name);
             </code>
-            <seealso cref="F:OpenMetaverse.Simulator.ObjectsAvatars"/>
+                <seealso cref="F:OpenMetaverse.Simulator.ObjectsAvatars" />
             </example>
         </member>
         <member name="M:OpenMetaverse.InternalDictionary`2.Find(System.Predicate{`1})">
@@ -11407,90 +10205,91 @@
             <param name="match">The match.</param>
             <returns>Matched value</returns>
             <example>
-            <code>
+                <code>
             // use a delegate to find a prim in the ObjectsPrimitives InternalDictionary
             // with the ID 95683496
             uint findID = 95683496;
             Primitive findPrim = sim.ObjectsPrimitives.Find(
-                        delegate(Primitive prim) { return prim.ID == findID; });
+            delegate(Primitive prim) { return prim.ID == findID; });
             </code>
             </example>
         </member>
         <member name="M:OpenMetaverse.InternalDictionary`2.FindAll(System.Predicate{`1})">
-             <summary>Find All items in an <seealso cref="T:InternalDictionary"/></summary>
-             <param name="match">return matching items.</param>
-             <returns>a <seealso cref="T:System.Collections.Generic.List"/> containing found items.</returns>
-             <example>
-             Find All prims within 20 meters and store them in a List
-             <code>
-             int radius = 20;
-             List&lt;Primitive&gt; prims = Client.Network.CurrentSim.ObjectsPrimitives.FindAll(
-                     delegate(Primitive prim) {
-                         Vector3 pos = prim.Position;
-                         return ((prim.ParentID == 0) &amp;&amp; (pos != Vector3.Zero) &amp;&amp; (Vector3.Distance(pos, location) &lt; radius));
-                     }
-                ); 
-            </code>
-            </example>
+            <summary>Find All items in an <seealso cref="T:InternalDictionary" /></summary>
+            <param name="match">return matching items.</param>
+            <returns>a <seealso cref="T:System.Collections.Generic.List" /> containing found items.</returns>
+            <example>
+            Find All prims within 20 meters and store them in a List
+            <code>
+            int radius = 20;
+            List&lt;Primitive&gt; prims = Client.Network.CurrentSim.ObjectsPrimitives.FindAll(
+            delegate(Primitive prim) {
+            Vector3 pos = prim.Position;
+            return ((prim.ParentID == 0) &amp;&amp; (pos != Vector3.Zero) &amp;&amp; (Vector3.Distance(pos, location) &lt; radius));
+            }
+            );
+            </code></example>
         </member>
         <member name="M:OpenMetaverse.InternalDictionary`2.FindAll(System.Predicate{`0})">
-             <summary>Find All items in an <seealso cref="T:InternalDictionary"/></summary>
-             <param name="match">return matching keys.</param>
-             <returns>a <seealso cref="T:System.Collections.Generic.List"/> containing found keys.</returns>
-             <example>
-             Find All keys which also exist in another dictionary
-             <code>
-             List&lt;UUID&gt; matches = myDict.FindAll(
-                     delegate(UUID id) {
-                         return myOtherDict.ContainsKey(id);
-                     }
-                ); 
-            </code>
-            </example>
+            <summary>Find All items in an <seealso cref="T:InternalDictionary" /></summary>
+            <param name="match">return matching keys.</param>
+            <returns>a <seealso cref="T:System.Collections.Generic.List" /> containing found keys.</returns>
+            <example>
+            Find All keys which also exist in another dictionary
+            <code>
+            List&lt;UUID&gt; matches = myDict.FindAll(
+            delegate(UUID id) {
+            return myOtherDict.ContainsKey(id);
+            }
+            );
+            </code></example>
         </member>
         <member name="M:OpenMetaverse.InternalDictionary`2.ForEach(System.Action{`1})">
-             <summary>Perform an <seealso cref="T:System.Action"/> on each entry in an <seealso cref="T:OpenMetaverse.InternalDictionary"/></summary>
-             <param name="action"><seealso cref="T:System.Action"/> to perform</param>
-             <example>
-             <code>
-             // Iterates over the ObjectsPrimitives InternalDictionary and prints out some information.
-             Client.Network.CurrentSim.ObjectsPrimitives.ForEach(
-                 delegate(Primitive prim)
-                 {
-                     if (prim.Text != null)
-                     {
-                         Console.WriteLine("NAME={0} ID = {1} TEXT = '{2}'", 
-                             prim.PropertiesFamily.Name, prim.ID, prim.Text);
-                     }
-                 });
+            <summary>Perform an <seealso cref="T:System.Action" /> on each entry in an <seealso cref="T:OpenMetaverse.InternalDictionary" /></summary>
+            <param name="action">
+                <seealso cref="T:System.Action" /> to perform</param>
+            <example>
+                <code>
+            // Iterates over the ObjectsPrimitives InternalDictionary and prints out some information.
+            Client.Network.CurrentSim.ObjectsPrimitives.ForEach(
+            delegate(Primitive prim)
+            {
+            if (prim.Text != null)
+            {
+            Console.WriteLine("NAME={0} ID = {1} TEXT = '{2}'",
+            prim.PropertiesFamily.Name, prim.ID, prim.Text);
+            }
+            });
             </code>
             </example>
         </member>
         <member name="M:OpenMetaverse.InternalDictionary`2.ForEach(System.Action{`0})">
-            <summary>Perform an <seealso cref="T:System.Action"/> on each key of an <seealso cref="T:OpenMetaverse.InternalDictionary"/></summary>
-            <param name="action"><seealso cref="T:System.Action"/> to perform</param>
+            <summary>Perform an <seealso cref="T:System.Action" /> on each key of an <seealso cref="T:OpenMetaverse.InternalDictionary" /></summary>
+            <param name="action">
+                <seealso cref="T:System.Action" /> to perform</param>
         </member>
         <member name="M:OpenMetaverse.InternalDictionary`2.ForEach(System.Action{System.Collections.Generic.KeyValuePair{`0,`1}})">
             <summary>
-            Perform an <seealso cref="T:System.Action"/> on each KeyValuePair of an <seealso cref="T:OpenMetaverse.InternalDictionary"/>
-            </summary>
-            <param name="action"><seealso cref="T:System.Action"/> to perform</param>
+            Perform an <seealso cref="T:System.Action" /> on each KeyValuePair of an <seealso cref="T:OpenMetaverse.InternalDictionary" /></summary>
+            <param name="action">
+                <seealso cref="T:System.Action" /> to perform</param>
         </member>
         <member name="M:OpenMetaverse.InternalDictionary`2.ContainsKey(`0)">
             <summary>Check if Key exists in Dictionary</summary>
             <param name="key">Key to check for</param>
-            <returns><see langword="true"/> if found, <see langword="false"/> otherwise</returns>
+            <returns>
+                <see langword="true" /> if found, <see langword="false" /> otherwise</returns>
         </member>
         <member name="M:OpenMetaverse.InternalDictionary`2.ContainsValue(`1)">
             <summary>Check if Value exists in Dictionary</summary>
             <param name="value">Value to check for</param>
-            <returns><see langword="true"/> if found, <see langword="false"/> otherwise</returns>
+            <returns>
+                <see langword="true" /> if found, <see langword="false" /> otherwise</returns>
         </member>
         <member name="M:OpenMetaverse.InternalDictionary`2.Add(`0,`1)">
             <summary>
-            Adds the specified key to the dictionary, dictionary locking is not performed, 
-            <see cref="!:SafeAdd"/>
-            </summary>
+            Adds the specified key to the dictionary, dictionary locking is not performed,
+            <see cref="!:SafeAdd" /></summary>
             <param name="key">The key</param>
             <param name="value">The value</param>
         </member>
@@ -11499,3394 +10298,2625 @@
             Removes the specified key, dictionary locking is not performed
             </summary>
             <param name="key">The key.</param>
-            <returns><see langword="true"/> if successful, <see langword="false"/> otherwise</returns>
+            <returns>
+                <see langword="true" /> if successful, <see langword="false" /> otherwise</returns>
         </member>
-        <member name="P:OpenMetaverse.InternalDictionary`2.Count">
+        <member name="T:OpenMetaverse.InventoryException">
             <summary>
-            Gets the number of Key/Value pairs contained in the <seealso cref="T:InternalDictionary"/>
+            Exception class to identify inventory exceptions
             </summary>
         </member>
-        <member name="P:OpenMetaverse.InternalDictionary`2.Item(`0)">
+        <member name="T:OpenMetaverse.Inventory">
             <summary>
-            Indexer for the dictionary
+            Responsible for maintaining inventory structure. Inventory constructs nodes
+            and manages node children as is necessary to maintain a coherant hirarchy.
+            Other classes should not manipulate or create InventoryNodes explicitly. When
+            A node's parent changes (when a folder is moved, for example) simply pass
+            Inventory the updated InventoryFolder and it will make the appropriate changes
+            to its internal representation.
             </summary>
-            <param name="key">The key</param>
-            <returns>The value</returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectorCreate(System.String,System.String,System.UInt16,System.UInt16,OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings)">
+        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectUpdated">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectUpdatedLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectRemoved">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectRemovedLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectAdded">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectAddedLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="E:OpenMetaverse.Inventory.InventoryObjectUpdated">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
+        </member>
+        <member name="E:OpenMetaverse.Inventory.InventoryObjectRemoved">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
+        </member>
+        <member name="E:OpenMetaverse.Inventory.InventoryObjectAdded">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
+        </member>
+        <member name="P:OpenMetaverse.Inventory.Item(OpenMetaverse.UUID)">
             <summary>
-            This is used to initialize and stop the Connector as a whole. The Connector
-            Create call must be completed successfully before any other requests are made
-            (typically during application initialization). The shutdown should be called
-            when the application is shutting down to gracefully release resources
+            By using the bracket operator on this class, the program can get the
+            InventoryObject designated by the specified uuid. If the value for the corresponding
+            UUID is null, the call is equivelant to a call to <code>RemoveNodeFor(this[uuid])</code>.
+            If the value is non-null, it is equivelant to a call to <code>UpdateNodeFor(value)</code>,
+            the uuid parameter is ignored.
             </summary>
-            <param name="ClientName">A string value indicting the Application name</param>
-            <param name="AccountManagementServer">URL for the management server</param>
-            <param name="Logging">LoggingSettings</param>
-            <param name="MaximumPort"></param>
-            <param name="MinimumPort"></param>
+            <param name="uuid">The UUID of the InventoryObject to get or set, ignored if set to non-null value.</param>
+            <returns>The InventoryObject corresponding to <code>uuid</code>.</returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectorInitiateShutdown(System.String)">
+        <member name="P:OpenMetaverse.Inventory.RootFolder">
             <summary>
-            Shutdown Connector -- Should be called when the application is shutting down
-            to gracefully release resources
+            The root folder of this avatars inventory
             </summary>
-            <param name="ConnectorHandle">Handle returned from successful Connector ‘create’ request</param>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectorMuteLocalMic(System.String,System.Boolean)">
+        <member name="P:OpenMetaverse.Inventory.LibraryFolder">
             <summary>
-            Mute or unmute the microphone
+            The default shared library folder
             </summary>
-            <param name="ConnectorHandle">Handle returned from successful Connector ‘create’ request</param>
-            <param name="Mute">true (mute) or false (unmute)</param>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectorMuteLocalSpeaker(System.String,System.Boolean)">
+        <member name="P:OpenMetaverse.Inventory.RootNode">
             <summary>
-            Mute or unmute the speaker
+            The root node of the avatars inventory
             </summary>
-            <param name="ConnectorHandle">Handle returned from successful Connector ‘create’ request</param>
-            <param name="Mute">true (mute) or false (unmute)</param>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectorSetLocalMicVolume(System.String,System.Int32)">
+        <member name="P:OpenMetaverse.Inventory.LibraryRootNode">
             <summary>
-            Set microphone volume
+            The root node of the default shared library
             </summary>
-            <param name="ConnectorHandle">Handle returned from successful Connector ‘create’ request</param>
-            <param name="Value">The level of the audio, a number between -100 and 100 where
-            0 represents ‘normal’ speaking volume</param>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectorSetLocalSpeakerVolume(System.String,System.Int32)">
+        <member name="M:OpenMetaverse.Inventory.OnInventoryObjectUpdated(OpenMetaverse.InventoryObjectUpdatedEventArgs)">
+            <summary>Raises the InventoryObjectUpdated Event</summary>
+            <param name="e">A InventoryObjectUpdatedEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.Inventory.OnInventoryObjectRemoved(OpenMetaverse.InventoryObjectRemovedEventArgs)">
+            <summary>Raises the InventoryObjectRemoved Event</summary>
+            <param name="e">A InventoryObjectRemovedEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.Inventory.OnInventoryObjectAdded(OpenMetaverse.InventoryObjectAddedEventArgs)">
+            <summary>Raises the InventoryObjectAdded Event</summary>
+            <param name="e">A InventoryObjectAddedEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.Inventory.GetContents(OpenMetaverse.UUID)">
             <summary>
-            Set local speaker volume
+            Returns the contents of the specified folder
             </summary>
-            <param name="ConnectorHandle">Handle returned from successful Connector ‘create’ request</param>
-            <param name="Value">The level of the audio, a number between -100 and 100 where
-            0 represents ‘normal’ speaking volume</param>
+            <param name="folder">A folder's UUID</param>
+            <returns>The contents of the folder corresponding to <code>folder</code></returns>
+            <exception cref="T:OpenMetaverse.InventoryException">When <code>folder</code> does not exist in the inventory</exception>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.StartDaemon(System.String,System.String)">
+        <member name="M:OpenMetaverse.Inventory.UpdateNodeFor(OpenMetaverse.InventoryBase)">
             <summary>
-            Starts a thread that keeps the daemon running
+            Updates the state of the InventoryNode and inventory data structure that
+            is responsible for the InventoryObject. If the item was previously not added to inventory,
+            it adds the item, and updates structure accordingly. If it was, it updates the
+            InventoryNode, changing the parent node if <code>item.parentUUID</code> does
+            not match <code>node.Parent.Data.UUID</code>.
+            You can not set the inventory root folder using this method
             </summary>
-            <param name="path"></param>
-            <param name="args"></param>
+            <param name="item">The InventoryObject to store</param>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.StopDaemon">
+        <member name="M:OpenMetaverse.Inventory.RemoveNodeFor(OpenMetaverse.InventoryBase)">
             <summary>
-            Stops the daemon and the thread keeping it running
+            Removes the InventoryObject and all related node data from Inventory.
             </summary>
+            <param name="item">The InventoryObject to remove.</param>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectToDaemon(System.String,System.Int32)">
+        <member name="M:OpenMetaverse.Inventory.Contains(OpenMetaverse.UUID)">
             <summary>
-            
+            Used to find out if Inventory contains the InventoryObject
+            specified by <code>uuid</code>.
             </summary>
-            <param name="address"></param>
-            <param name="port"></param>
-            <returns></returns>
+            <param name="uuid">The UUID to check.</param>
+            <returns>true if inventory contains uuid, false otherwise</returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxGetCaptureDevices">
+        <member name="M:OpenMetaverse.Inventory.SaveToDisk(System.String)">
             <summary>
-            This is used to get a list of audio devices that can be used for capture (input) of voice.
+            Saves the current inventory structure to a cache file
             </summary>
-            <returns></returns>
+            <param name="filename">Name of the cache file to save to</param>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxGetRenderDevices">
+        <member name="M:OpenMetaverse.Inventory.RestoreFromDisk(System.String)">
             <summary>
-            This is used to get a list of audio devices that can be used for render (playback) of voice.
+            Loads in inventory cache file into the inventory structure. Note only valid to call after login has been successful.
             </summary>
+            <param name="filename">Name of the cache file to load</param>
+            <returns>The number of inventory items sucessfully reconstructed into the inventory node tree</returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxSetRenderDevice(System.String)">
+        <member name="F:OpenMetaverse.InventorySortOrder.ByName">
+            <summary>Sort by name</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventorySortOrder.ByDate">
+            <summary>Sort by date</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventorySortOrder.FoldersByName">
+            <summary>Sort folders by name, regardless of whether items are
+            sorted by name or date</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventorySortOrder.SystemFoldersToTop">
+            <summary>Place system folders at the top</summary>
+        </member>
+        <member name="T:OpenMetaverse.DeRezDestination">
             <summary>
-            This command is used to select the render device.
+            Possible destinations for DeRezObject request
             </summary>
-            <param name="RenderDeviceSpecifier">The name of the device as returned by the Aux.GetRenderDevices command.</param>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxSetCaptureDevice(System.String)">
+        <member name="F:OpenMetaverse.DeRezDestination.AgentInventorySave">
             <summary>
-            This command is used to select the capture device.
             </summary>
-            <param name="CaptureDeviceSpecifier">The name of the device as returned by the Aux.GetCaptureDevices command.</param>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxCaptureAudioStart(System.Int32)">
+        <member name="F:OpenMetaverse.DeRezDestination.AgentInventoryCopy">
+            <summary>Copy from in-world to agent inventory</summary>
+        </member>
+        <member name="F:OpenMetaverse.DeRezDestination.TaskInventory">
+            <summary>Derez to TaskInventory</summary>
+        </member>
+        <member name="F:OpenMetaverse.DeRezDestination.Attachment">
             <summary>
-            This command is used to start the audio capture process which will cause
-            AuxAudioProperty Events to be raised. These events can be used to display a
-            microphone VU meter for the currently selected capture device. This command
-            should not be issued if the user is on a call.
             </summary>
-            <param name="Duration">(unused but required)</param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxCaptureAudioStop">
+        <member name="F:OpenMetaverse.DeRezDestination.AgentInventoryTake">
+            <summary>Take Object</summary>
+        </member>
+        <member name="F:OpenMetaverse.DeRezDestination.ForceToGodInventory">
             <summary>
-            This command is used to stop the audio capture process.
             </summary>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxSetMicLevel(System.Int32)">
+        <member name="F:OpenMetaverse.DeRezDestination.TrashFolder">
+            <summary>Delete Object</summary>
+        </member>
+        <member name="F:OpenMetaverse.DeRezDestination.AttachmentToInventory">
+            <summary>Put an avatar attachment into agent inventory</summary>
+        </member>
+        <member name="F:OpenMetaverse.DeRezDestination.AttachmentExists">
             <summary>
-            This command is used to set the mic volume while in the audio tuning process.
-            Once an acceptable mic level is attained, the application must issue a
-            connector set mic volume command to have that level be used while on voice
-            calls.
             </summary>
-            <param name="Level">the microphone volume (-100 to 100 inclusive)</param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxSetSpeakerLevel(System.Int32)">
+        <member name="F:OpenMetaverse.DeRezDestination.ReturnToOwner">
+            <summary>Return an object back to the owner's inventory</summary>
+        </member>
+        <member name="F:OpenMetaverse.DeRezDestination.ReturnToLastOwner">
+            <summary>Return a deeded object back to the last owner's inventory</summary>
+        </member>
+        <member name="T:OpenMetaverse.InventoryItemFlags">
             <summary>
-            This command is used to set the speaker volume while in the audio tuning
-            process. Once an acceptable speaker level is attained, the application must
-            issue a connector set speaker volume command to have that level be used while
-            on voice calls.
+            Upper half of the Flags field for inventory items
             </summary>
-            <param name="Level">the speaker volume (-100 to 100 inclusive)</param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.SessionCreate(System.String,System.String,System.String,System.String,System.Boolean,System.Boolean,System.String)">
+        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectSlamPerm">
+            <summary>Indicates that the NextOwner permission will be set to the
+            most restrictive set of permissions found in the object set
+            (including linkset items and object inventory items) on next rez</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectSlamSale">
+            <summary>Indicates that the object sale information has been
+            changed</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectOverwriteBase">
+            <summary>If set, and a slam bit is set, indicates BaseMask will be overwritten on Rez</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectOverwriteOwner">
+            <summary>If set, and a slam bit is set, indicates OwnerMask will be overwritten on Rez</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectOverwriteGroup">
+            <summary>If set, and a slam bit is set, indicates GroupMask will be overwritten on Rez</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectOverwriteEveryone">
+            <summary>If set, and a slam bit is set, indicates EveryoneMask will be overwritten on Rez</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectOverwriteNextOwner">
+            <summary>If set, and a slam bit is set, indicates NextOwnerMask will be overwritten on Rez</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectHasMultipleItems">
+            <summary>Indicates whether this object is composed of multiple
+            items or not</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryItemFlags.SharedSingleReference">
+            <summary>Indicates that the asset is only referenced by this
+            inventory item. If this item is deleted or updated to reference a
+            new assetID, the asset can be deleted</summary>
+        </member>
+        <member name="T:OpenMetaverse.InventoryBase">
             <summary>
-            Create a Session
-            Sessions typically represent a connection to a media session with one or more
-            participants. This is used to generate an ‘outbound’ call to another user or
-            channel. The specifics depend on the media types involved. A session handle is
-            required to control the local user functions within the session (or remote
-            users if the current account has rights to do so). Currently creating a
-            session automatically connects to the audio media, there is no need to call
-            Session.Connect at this time, this is reserved for future use.
+            Base Class for Inventory Items
             </summary>
-            <param name="AccountHandle">Handle returned from successful Connector ‘create’ request</param>
-            <param name="URI">This is the URI of the terminating point of the session (ie who/what is being called)</param>
-            <param name="Name">This is the display name of the entity being called (user or channel)</param>
-            <param name="Password">Only needs to be supplied when the target URI is password protected</param>
-            <param name="PasswordHashAlgorithm">This indicates the format of the password as passed in. This can either be
-            “ClearText” or “SHA1UserName”. If this element does not exist, it is assumed to be “ClearText”. If it is
-            “SHA1UserName”, the password as passed in is the SHA1 hash of the password and username concatenated together,
-            then base64 encoded, with the final “=” character stripped off.</param>
-            <param name="JoinAudio"></param>
-            <param name="JoinText"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.SessionConnect(System.String,System.String)">
+        <member name="M:OpenMetaverse.InventoryBase.#ctor(OpenMetaverse.UUID)">
             <summary>
-            Used to accept a call
+            Constructor, takes an itemID as a parameter
             </summary>
-            <param name="SessionHandle">SessionHandle such as received from SessionNewEvent</param>
-            <param name="AudioMedia">"default"</param>
-            <returns></returns>
+            <param name="itemID">The <seealso cref="T:OpenMetaverse.UUID" /> of the item</param>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.SessionRenderAudioStart(System.String,System.Boolean)">
+        <member name="M:OpenMetaverse.InventoryBase.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            This command is used to start the audio render process, which will then play
-            the passed in file through the selected audio render device. This command
-            should not be issued if the user is on a call.
             </summary>
-            <param name="SoundFilePath">The fully qualified path to the sound file.</param>
-            <param name="Loop">True if the file is to be played continuously and false if it is should be played once.</param>
-            <returns></returns>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.SessionRenderAudioStop(System.String)">
+        <member name="F:OpenMetaverse.InventoryBase.UUID">
             <summary>
-            This command is used to stop the audio render process.
-            </summary>
-            <param name="SoundFilePath">The fully qualified path to the sound file issued in the start render command.</param>
-            <returns></returns>
+                <seealso cref="T:OpenMetaverse.UUID" /> of item/folder</summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.SessionTerminate(System.String)">
+        <member name="F:OpenMetaverse.InventoryBase.ParentUUID">
             <summary>
-            This is used to ‘end’ an established session (i.e. hang-up or disconnect).
-            </summary>
-            <param name="SessionHandle">Handle returned from successful Session ‘create’ request or a SessionNewEvent</param>
-            <returns></returns>
+                <seealso cref="T:OpenMetaverse.UUID" /> of parent folder</summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.SessionSet3DPosition(System.String,OpenMetaverse.Voice.VoicePosition,OpenMetaverse.Voice.VoicePosition)">
+        <member name="F:OpenMetaverse.InventoryBase.Name">
+            <summary>Name of item/folder</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryBase.OwnerID">
+            <summary>Item/Folder Owners <seealso cref="T:OpenMetaverse.UUID" /></summary>
+        </member>
+        <member name="M:OpenMetaverse.InventoryBase.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            Set the combined speaking and listening position in 3D space.
             </summary>
-            <param name="SessionHandle">Handle returned from successful Session ‘create’ request or a SessionNewEvent</param>
-            <param name="SpeakerPosition">Speaking position</param>
-            <param name="ListenerPosition">Listening position</param>
-            <returns></returns>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.SessionSetParticipantVolumeForMe(System.String,System.String,System.Int32)">
+        <member name="M:OpenMetaverse.InventoryBase.GetHashCode">
             <summary>
-            Set User Volume for a particular user. Does not affect how other users hear that user.
+            Generates a number corresponding to the value of the object to support the use of a hash table,
+            suitable for use in hashing algorithms and data structures such as a hash table
             </summary>
-            <param name="SessionHandle">Handle returned from successful Session ‘create’ request or a SessionNewEvent</param>
-            <param name="ParticipantURI"></param>
-            <param name="Volume">The level of the audio, a number between -100 and 100 where 0 represents ‘normal’ speaking volume</param>
-            <returns></returns>
+            <returns>A Hashcode of all the combined InventoryBase fields</returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.Start">
+        <member name="M:OpenMetaverse.InventoryBase.Equals(System.Object)">
             <summary>
-            Start up the Voice service.
+            Determine whether the specified <seealso cref="T:OpenMetaverse.InventoryBase" /> object is equal to the current object
             </summary>
+            <param name="o">InventoryBase object to compare against</param>
+            <returns>true if objects are the same</returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnVoiceResponse(System.Object,OpenMetaverse.Voice.VoiceGateway.VoiceResponseEventArgs)">
+        <member name="M:OpenMetaverse.InventoryBase.Equals(OpenMetaverse.InventoryBase)">
             <summary>
-            Handle miscellaneous request status
+            Determine whether the specified <seealso cref="T:OpenMetaverse.InventoryBase" /> object is equal to the current object
             </summary>
-            <param name="sender"></param>
-            <param name="e"></param>
-            ///<remarks>If something goes wrong, we log it.</remarks>
+            <param name="o">InventoryBase object to compare against</param>
+            <returns>true if objects are the same</returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.Dispose">
+        <member name="T:OpenMetaverse.InventoryItem">
             <summary>
-            Cleanup oject resources
+            An Item in Inventory
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.Network_EventQueueRunning(System.Object,OpenMetaverse.EventQueueRunningEventArgs)">
+        <member name="M:OpenMetaverse.InventoryItem.#ctor(OpenMetaverse.UUID)">
             <summary>
-            Request voice cap when changing regions
+            Construct a new InventoryItem object
             </summary>
+            <param name="itemID">The <seealso cref="T:OpenMetaverse.UUID" /> of the item</param>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnSessionStateChangeEvent(System.Object,OpenMetaverse.Voice.VoiceGateway.SessionStateChangeEventArgs)">
+        <member name="M:OpenMetaverse.InventoryItem.#ctor(OpenMetaverse.InventoryType,OpenMetaverse.UUID)">
             <summary>
-            Handle a change in session state
+            Construct a new InventoryItem object of a specific Type
             </summary>
+            <param name="type">The type of item from <seealso cref="T:OpenMetaverse.InventoryType" /></param>
+            <param name="itemID">
+                <seealso cref="T:OpenMetaverse.UUID" /> of the item</param>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.CloseSession(System.String)">
+        <member name="M:OpenMetaverse.InventoryItem.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            Close a voice session
             </summary>
-            <param name="sessionHandle"></param>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.FindSession(System.String,System.Boolean)">
+        <member name="F:OpenMetaverse.InventoryItem.AssetUUID">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID" /> of this item</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryItem.Permissions">
+            <summary>The combined <seealso cref="T:OpenMetaverse.Permissions" /> of this item</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryItem.AssetType">
+            <summary>The type of item from <seealso cref="T:OpenMetaverse.AssetType" /></summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryItem.InventoryType">
+            <summary>The type of item from the <seealso cref="T:OpenMetaverse.InventoryType" /> enum</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryItem.CreatorID">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID" /> of the creator of this item</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryItem.Description">
+            <summary>A Description of this item</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryItem.GroupID">
+            <summary>The <seealso cref="T:OpenMetaverse.Group" />s <seealso cref="T:OpenMetaverse.UUID" /> this item is set to or owned by</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryItem.GroupOwned">
+            <summary>If true, item is owned by a group</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryItem.SalePrice">
+            <summary>The price this item can be purchased for</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryItem.SaleType">
+            <summary>The type of sale from the <seealso cref="T:OpenMetaverse.SaleType" /> enum</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryItem.Flags">
+            <summary>Combined flags from <seealso cref="T:OpenMetaverse.InventoryItemFlags" /></summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryItem.CreationDate">
+            <summary>Time and date this inventory item was created, stored as
+            UTC (Coordinated Universal Time)</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryItem.TransactionID">
+            <summary>Used to update the AssetID in requests sent to the server</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryItem.LastOwnerID">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID" /> of the previous owner of the item</summary>
+        </member>
+        <member name="M:OpenMetaverse.InventoryItem.IsLink">
             <summary>
-            Locate a Session context from its handle
+            Indicates inventory item is a link
             </summary>
-            <remarks>Creates the session context if it does not exist.</remarks>
+            <returns>True if inventory item is a link to another inventory item</returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.cClient_OnComplete(OpenMetaverse.Http.CapsClient,OpenMetaverse.StructuredData.OSD,System.Exception)">
+        <member name="M:OpenMetaverse.InventoryItem.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            Handle completion of main voice cap request.
             </summary>
-            <param name="client"></param>
-            <param name="result"></param>
-            <param name="error"></param>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnDaemonRunning">
+        <member name="M:OpenMetaverse.InventoryItem.GetHashCode">
             <summary>
-            Daemon has started so connect to it.
+            Generates a number corresponding to the value of the object to support the use of a hash table.
+            Suitable for use in hashing algorithms and data structures such as a hash table
             </summary>
+            <returns>A Hashcode of all the combined InventoryItem fields</returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnDaemonConnected">
+        <member name="M:OpenMetaverse.InventoryItem.Equals(System.Object)">
             <summary>
-            The daemon TCP connection is open.
+            Compares an object
             </summary>
+            <param name="o">The object to compare</param>
+            <returns>true if comparison object matches</returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnConnectorCreateResponse(System.Object,OpenMetaverse.Voice.VoiceGateway.VoiceConnectorEventArgs)">
+        <member name="M:OpenMetaverse.InventoryItem.Equals(OpenMetaverse.InventoryBase)">
             <summary>
-            Handle creation of the Connector.
+            Determine whether the specified <seealso cref="T:OpenMetaverse.InventoryBase" /> object is equal to the current object
             </summary>
+            <param name="o">The <seealso cref="T:OpenMetaverse.InventoryBase" /> object to compare against</param>
+            <returns>true if objects are the same</returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnAuxGetRenderDevicesResponse(System.Object,OpenMetaverse.Voice.VoiceGateway.VoiceDevicesEventArgs)">
+        <member name="M:OpenMetaverse.InventoryItem.Equals(OpenMetaverse.InventoryItem)">
             <summary>
-            Handle response to audio output device query
+            Determine whether the specified <seealso cref="T:OpenMetaverse.InventoryItem" /> object is equal to the current object
             </summary>
+            <param name="o">The <seealso cref="T:OpenMetaverse.InventoryItem" /> object to compare against</param>
+            <returns>true if objects are the same</returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnAuxGetCaptureDevicesResponse(System.Object,OpenMetaverse.Voice.VoiceGateway.VoiceDevicesEventArgs)">
+        <member name="T:OpenMetaverse.InventoryTexture">
             <summary>
-            Handle response to audio input device query
+            InventoryTexture Class representing a graphical image
             </summary>
+            <seealso cref="!:ManagedImage" />
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.ParcelChanged">
-             <summary>
-             Set voice channel for new parcel
-             </summary>
-            
-        </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.RequestParcelInfo(System.Uri)">
+        <member name="M:OpenMetaverse.InventoryTexture.#ctor(OpenMetaverse.UUID)">
             <summary>
-            Request info from a parcel capability Uri.
+            Construct an InventoryTexture object
             </summary>
-            <param name="cap"></param>
+            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID" /> which becomes the
+            <seealso cref="T:OpenMetaverse.InventoryItem" /> objects AssetUUID</param>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.pCap_OnComplete(OpenMetaverse.Http.CapsClient,OpenMetaverse.StructuredData.OSD,System.Exception)">
+        <member name="M:OpenMetaverse.InventoryTexture.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            Receive parcel voice cap
+            Construct an InventoryTexture object from a serialization stream
             </summary>
-            <param name="client"></param>
-            <param name="result"></param>
-            <param name="error"></param>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.UpdatePosition(OpenMetaverse.AgentManager)">
+        <member name="T:OpenMetaverse.InventorySound">
             <summary>
-            Tell Vivox where we are standing
+            InventorySound Class representing a playable sound
             </summary>
-            <remarks>This has to be called when we move or turn.</remarks>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.PosUpdating(System.Boolean)">
+        <member name="M:OpenMetaverse.InventorySound.#ctor(OpenMetaverse.UUID)">
             <summary>
-            Start and stop updating out position.
+            Construct an InventorySound object
             </summary>
-            <param name="go"></param>
+            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID" /> which becomes the
+            <seealso cref="T:OpenMetaverse.InventoryItem" /> objects AssetUUID</param>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.AccountLogin(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Boolean)">
+        <member name="M:OpenMetaverse.InventorySound.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            This is used to login a specific user account(s). It may only be called after
-            Connector initialization has completed successfully
+            Construct an InventorySound object from a serialization stream
             </summary>
-            <param name="ConnectorHandle">Handle returned from successful Connector ‘create’ request</param>
-            <param name="AccountName">User's account name</param>
-            <param name="AccountPassword">User's account password</param>
-            <param name="AudioSessionAnswerMode">Values may be “AutoAnswer” or “VerifyAnswer”</param>
-            <param name="AccountURI">""</param>
-            <param name="ParticipantPropertyFrequency">This is an integer that specifies how often
-            the daemon will send participant property events while in a channel. If this is not set
-            the default will be “on state change”, which means that the events will be sent when
-            the participant starts talking, stops talking, is muted, is unmuted.
-            The valid values are:
-            0 – Never
-            5 – 10 times per second
-            10 – 5 times per second
-            50 – 1 time per second
-            100 – on participant state change (this is the default)</param>
-            <param name="EnableBuddiesAndPresence">false</param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.AccountLogout(System.String)">
+        <member name="T:OpenMetaverse.InventoryCallingCard">
             <summary>
-            This is used to logout a user session. It should only be called with a valid AccountHandle.
+            InventoryCallingCard Class, contains information on another avatar
             </summary>
-            <param name="AccountHandle">Handle returned from successful Connector ‘login’ request</param>
-            <returns></returns>
         </member>
-        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnVoiceResponse">
+        <member name="M:OpenMetaverse.InventoryCallingCard.#ctor(OpenMetaverse.UUID)">
             <summary>
-            Event for most mundane request reposnses.
+            Construct an InventoryCallingCard object
             </summary>
+            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID" /> which becomes the
+            <seealso cref="T:OpenMetaverse.InventoryItem" /> objects AssetUUID</param>
         </member>
-        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnConnectorCreateResponse">
-            <summary>Response to Connector.Create request</summary>
-        </member>
-        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnAuxGetCaptureDevicesResponse">
-            <summary>Response to Aux.GetCaptureDevices request</summary>
-        </member>
-        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnAuxGetRenderDevicesResponse">
-            <summary>Response to Aux.GetRenderDevices request</summary>
-        </member>
-        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnAuxAudioPropertiesEvent">
-            <summary>Audio Properties Events are sent after audio capture is started.
-            These events are used to display a microphone VU meter</summary>
-        </member>
-        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnAccountLoginResponse">
-            <summary>Response to Account.Login request</summary>
-        </member>
-        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnAccountLoginStateChangeEvent">
-            <summary>This event message is sent whenever the login state of the
-            particular Account has transitioned from one value to another</summary>
-        </member>
-        <member name="P:OpenMetaverse.Voice.VoiceGateway.CaptureDevices">
+        <member name="M:OpenMetaverse.InventoryCallingCard.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            List of audio input devices
+            Construct an InventoryCallingCard object from a serialization stream
             </summary>
         </member>
-        <member name="P:OpenMetaverse.Voice.VoiceGateway.PlaybackDevices">
+        <member name="T:OpenMetaverse.InventoryLandmark">
             <summary>
-            List of audio output devices
+            InventoryLandmark Class, contains details on a specific location
             </summary>
         </member>
-        <member name="P:OpenMetaverse.Voice.VoiceGateway.TestMode">
+        <member name="M:OpenMetaverse.InventoryLandmark.#ctor(OpenMetaverse.UUID)">
             <summary>
-            Set audio test mode
+            Construct an InventoryLandmark object
             </summary>
+            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID" /> which becomes the
+            <seealso cref="T:OpenMetaverse.InventoryItem" /> objects AssetUUID</param>
         </member>
-        <member name="F:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.Enabled">
-            <summary>Enable logging</summary>
-        </member>
-        <member name="F:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.Folder">
-            <summary>The folder where any logs will be created</summary>
-        </member>
-        <member name="F:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.FileNamePrefix">
-            <summary>This will be prepended to beginning of each log file</summary>
-        </member>
-        <member name="F:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.FileNameSuffix">
-            <summary>The suffix or extension to be appended to each log file</summary>
-        </member>
-        <member name="F:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.LogLevel">
+        <member name="M:OpenMetaverse.InventoryLandmark.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            0: NONE - No logging
-            1: ERROR - Log errors only
-            2: WARNING - Log errors and warnings
-            3: INFO - Log errors, warnings and info
-            4: DEBUG - Log errors, warnings, info and debug
+            Construct an InventoryLandmark object from a serialization stream
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.#ctor">
+        <member name="P:OpenMetaverse.InventoryLandmark.LandmarkVisited">
             <summary>
-            Constructor for default logging settings
+            Landmarks use the InventoryItemFlags struct and will have a flag of 1 set if they have been visited
             </summary>
         </member>
-        <member name="T:OpenMetaverse.Voice.VoiceGateway.AudioPropertiesEventArgs">
-            Audio Properties Events are sent after audio capture is started. These events are used to display a microphone VU meter
-        </member>
-        <member name="T:OpenMetaverse.Rendering.IRendering">
+        <member name="T:OpenMetaverse.InventoryObject">
             <summary>
-            Abstract base for rendering plugins
+            InventoryObject Class contains details on a primitive or coalesced set of primitives
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Rendering.IRendering.GenerateSimpleMesh(OpenMetaverse.Primitive,OpenMetaverse.Rendering.DetailLevel)">
+        <member name="M:OpenMetaverse.InventoryObject.#ctor(OpenMetaverse.UUID)">
             <summary>
-            Generates a basic mesh structure from a primitive
+            Construct an InventoryObject object
             </summary>
-            <param name="prim">Primitive to generate the mesh from</param>
-            <param name="lod">Level of detail to generate the mesh at</param>
-            <returns>The generated mesh</returns>
+            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID" /> which becomes the
+            <seealso cref="T:OpenMetaverse.InventoryItem" /> objects AssetUUID</param>
         </member>
-        <member name="M:OpenMetaverse.Rendering.IRendering.GenerateSimpleSculptMesh(OpenMetaverse.Primitive,System.Drawing.Bitmap,OpenMetaverse.Rendering.DetailLevel)">
+        <member name="M:OpenMetaverse.InventoryObject.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            Generates a basic mesh structure from a sculpted primitive and
-            texture
+            Construct an InventoryObject object from a serialization stream
             </summary>
-            <param name="prim">Sculpted primitive to generate the mesh from</param>
-            <param name="sculptTexture">Sculpt texture</param>
-            <param name="lod">Level of detail to generate the mesh at</param>
-            <returns>The generated mesh</returns>
         </member>
-        <member name="M:OpenMetaverse.Rendering.IRendering.GenerateFacetedMesh(OpenMetaverse.Primitive,OpenMetaverse.Rendering.DetailLevel)">
+        <member name="P:OpenMetaverse.InventoryObject.ItemFlags">
             <summary>
-            Generates a series of faces, each face containing a mesh and
-            metadata
+            Gets or sets the upper byte of the Flags value
             </summary>
-            <param name="prim">Primitive to generate the mesh from</param>
-            <param name="lod">Level of detail to generate the mesh at</param>
-            <returns>The generated mesh</returns>
         </member>
-        <member name="M:OpenMetaverse.Rendering.IRendering.GenerateFacetedSculptMesh(OpenMetaverse.Primitive,System.Drawing.Bitmap,OpenMetaverse.Rendering.DetailLevel)">
+        <member name="P:OpenMetaverse.InventoryObject.AttachPoint">
             <summary>
-            Generates a series of faces for a sculpted prim, each face 
-            containing a mesh and metadata
+            Gets or sets the object attachment point, the lower byte of the Flags value
             </summary>
-            <param name="prim">Sculpted primitive to generate the mesh from</param>
-            <param name="sculptTexture">Sculpt texture</param>
-            <param name="lod">Level of detail to generate the mesh at</param>
-            <returns>The generated mesh</returns>
         </member>
-        <member name="M:OpenMetaverse.Rendering.IRendering.TransformTexCoords(System.Collections.Generic.List{OpenMetaverse.Rendering.Vertex},OpenMetaverse.Vector3,OpenMetaverse.Primitive.TextureEntryFace)">
+        <member name="T:OpenMetaverse.InventoryNotecard">
             <summary>
-            Apply texture coordinate modifications from a
-            <seealso cref="!:TextureEntryFace"/> to a list of vertices
+            InventoryNotecard Class, contains details on an encoded text document
             </summary>
-            <param name="vertices">Vertex list to modify texture coordinates for</param>
-            <param name="center">Center-point of the face</param>
-            <param name="teFace">Face texture parameters</param>
         </member>
-        <member name="T:OpenMetaverse.Sounds">
+        <member name="M:OpenMetaverse.InventoryNotecard.#ctor(OpenMetaverse.UUID)">
             <summary>
-            pre-defined built in sounds
+            Construct an InventoryNotecard object
             </summary>
+            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID" /> which becomes the
+            <seealso cref="T:OpenMetaverse.InventoryItem" /> objects AssetUUID</param>
         </member>
-        <member name="F:OpenMetaverse.Sounds.BELL_TING">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.CLICK">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.HEALTH_REDUCTION_FEMALE">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.HEALTH_REDUCTION_MALE">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.IM_START">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.INSTANT_MESSAGE_NOTIFICATION">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.INVALID_OPERATION">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.KEYBOARD_LOOP">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.MONEY_REDUCTION_COINS">
-            <summary>coins</summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.MONEY_INCREASE_CASH_REGISTER_BELL">
-            <summary>cash register bell</summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.NULL_KEYSTROKE">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_RUBBER">
-            <summary>rubber</summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_PLASTIC">
-            <summary>plastic</summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_FLESH">
-            <summary>flesh</summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_WOOD_SPLINTERING">
-            <summary>wood splintering?</summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_GLASS_BREAK">
-            <summary>glass break</summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_METAL_CLUNK">
-            <summary>metal clunk</summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_CREATE_WHOOSH">
-            <summary>whoosh</summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_DELETE_SHAKE">
-            <summary>shake</summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_REZ">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_APPEAR_DING">
-            <summary>ding</summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT1">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT2">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT3">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT4">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT5">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT6">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT7">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.SNAPSHOT">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.TELEPORT_TEXTURE_APPLY">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.THUNDER">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.WINDOW_CLOSE">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.WINDOW_OPEN">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Sounds.ZIPPER">
-            <summary></summary>
-        </member>
-        <member name="M:OpenMetaverse.Sounds.ToDictionary">
+        <member name="M:OpenMetaverse.InventoryNotecard.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            A dictionary containing all pre-defined sounds
+            Construct an InventoryNotecard object from a serialization stream
             </summary>
-            <returns>A dictionary containing the pre-defined sounds, 
-            where the key is the sounds ID, and the value is a string
-            containing a name to identify the purpose of the sound</returns>
         </member>
-        <member name="T:OpenMetaverse.RegionFlags">
+        <member name="T:OpenMetaverse.InventoryCategory">
             <summary>
-            Simulator (region) properties
+            InventoryCategory Class
             </summary>
+            <remarks>TODO: Is this even used for anything?</remarks>
         </member>
-        <member name="F:OpenMetaverse.RegionFlags.None">
-            <summary>No flags set</summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.AllowDamage">
-            <summary>Agents can take damage and be killed</summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.AllowLandmark">
-            <summary>Landmarks can be created here</summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.AllowSetHome">
-            <summary>Home position can be set in this sim</summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.ResetHomeOnTeleport">
-            <summary>Home position is reset when an agent teleports away</summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.SunFixed">
-            <summary>Sun does not move</summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.TaxFree">
-            <summary>No object, land, etc. taxes</summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.BlockTerraform">
-            <summary>Disable heightmap alterations (agents can still plant
-            foliage)</summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.BlockLandResell">
-            <summary>Land cannot be released, sold, or purchased</summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.Sandbox">
-            <summary>All content is wiped nightly</summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.NullLayer">
-            <summary>Unknown: Related to the availability of an overview world map tile.(Think mainland images when zoomed out.)</summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.SkipAgentAction">
-            <summary>Unknown: Related to region debug flags. Possibly to skip processing of agent interaction with world. </summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.SkipUpdateInterestList">
-            <summary>Region does not update agent prim interest lists. Internal debugging option.</summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.SkipCollisions">
-            <summary>No collision detection for non-agent objects</summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.SkipScripts">
-            <summary>No scripts are ran</summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.SkipPhysics">
-            <summary>All physics processing is turned off</summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.ExternallyVisible">
-            <summary>Region can be seen from other regions on world map. (Legacy world map option?) </summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.MainlandVisible">
-            <summary>Region can be seen from mainland on world map. (Legacy world map option?) </summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.PublicAllowed">
-            <summary>Agents not explicitly on the access list can visit the region. </summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.BlockDwell">
-            <summary>Traffic calculations are not run across entire region, overrides parcel settings. </summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.NoFly">
-            <summary>Flight is disabled (not currently enforced by the sim)</summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.AllowDirectTeleport">
-            <summary>Allow direct (p2p) teleporting</summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.EstateSkipScripts">
-            <summary>Estate owner has temporarily disabled scripting</summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.RestrictPushObject">
-            <summary>Restricts the usage of the LSL llPushObject function, applies to whole region.</summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.DenyAnonymous">
-            <summary>Deny agents with no payment info on file</summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.DenyIdentified">
-            <summary>Deny agents with payment info on file</summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.DenyTransacted">
-            <summary>Deny agents who have made a monetary transaction</summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.AllowParcelChanges">
-            <summary>Parcels within the region may be joined or divided by anyone, not just estate owners/managers. </summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.AbuseEmailToEstateOwner">
-            <summary>Abuse reports sent from within this region are sent to the estate owner defined email. </summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.AllowVoice">
-            <summary>Region is Voice Enabled</summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.BlockParcelSearch">
-            <summary>Removes the ability from parcel owners to set their parcels to show in search.</summary>
-        </member>
-        <member name="F:OpenMetaverse.RegionFlags.DenyAgeUnverified">
-            <summary>Deny agents who have not been age verified from entering the region.</summary>
-        </member>
-        <member name="T:OpenMetaverse.SimAccess">
+        <member name="M:OpenMetaverse.InventoryCategory.#ctor(OpenMetaverse.UUID)">
             <summary>
-            Access level for a simulator
+            Construct an InventoryCategory object
             </summary>
+            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID" /> which becomes the
+            <seealso cref="T:OpenMetaverse.InventoryItem" /> objects AssetUUID</param>
         </member>
-        <member name="F:OpenMetaverse.SimAccess.Unknown">
-            <summary>Unknown or invalid access level</summary>
-        </member>
-        <member name="F:OpenMetaverse.SimAccess.Trial">
-            <summary>Trial accounts allowed</summary>
-        </member>
-        <member name="F:OpenMetaverse.SimAccess.PG">
-            <summary>PG rating</summary>
-        </member>
-        <member name="F:OpenMetaverse.SimAccess.Mature">
-            <summary>Mature rating</summary>
-        </member>
-        <member name="F:OpenMetaverse.SimAccess.Adult">
-            <summary>Adult rating</summary>
-        </member>
-        <member name="F:OpenMetaverse.SimAccess.Down">
-            <summary>Simulator is offline</summary>
-        </member>
-        <member name="F:OpenMetaverse.SimAccess.NonExistent">
-            <summary>Simulator does not exist</summary>
-        </member>
-        <member name="T:OpenMetaverse.Simulator">
+        <member name="M:OpenMetaverse.InventoryCategory.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            
+            Construct an InventoryCategory object from a serialization stream
             </summary>
         </member>
-        <member name="T:OpenMetaverse.UDPBase">
+        <member name="T:OpenMetaverse.InventoryLSL">
             <summary>
-            
+            InventoryLSL Class, represents a Linden Scripting Language object
             </summary>
         </member>
-        <member name="M:OpenMetaverse.UDPBase.#ctor(System.Int32)">
+        <member name="M:OpenMetaverse.InventoryLSL.#ctor(OpenMetaverse.UUID)">
             <summary>
-            Initialize the UDP packet handler in server mode
+            Construct an InventoryLSL object
             </summary>
-            <param name="port">Port to listening for incoming UDP packets on</param>
+            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID" /> which becomes the
+            <seealso cref="T:OpenMetaverse.InventoryItem" /> objects AssetUUID</param>
         </member>
-        <member name="M:OpenMetaverse.UDPBase.#ctor(System.Net.IPEndPoint)">
+        <member name="M:OpenMetaverse.InventoryLSL.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            Initialize the UDP packet handler in client mode
+            Construct an InventoryLSL object from a serialization stream
             </summary>
-            <param name="endPoint">Remote UDP server to connect to</param>
         </member>
-        <member name="M:OpenMetaverse.UDPBase.Start">
+        <member name="T:OpenMetaverse.InventorySnapshot">
             <summary>
-            
+            InventorySnapshot Class, an image taken with the viewer
             </summary>
         </member>
-        <member name="M:OpenMetaverse.UDPBase.Stop">
+        <member name="M:OpenMetaverse.InventorySnapshot.#ctor(OpenMetaverse.UUID)">
             <summary>
-            
+            Construct an InventorySnapshot object
             </summary>
+            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID" /> which becomes the
+            <seealso cref="T:OpenMetaverse.InventoryItem" /> objects AssetUUID</param>
         </member>
-        <member name="P:OpenMetaverse.UDPBase.IsRunning">
+        <member name="M:OpenMetaverse.InventorySnapshot.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            
+            Construct an InventorySnapshot object from a serialization stream
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.Client">
-            <summary>A public reference to the client that this Simulator object
-            is attached to</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.ID">
-            <summary>A Unique Cache identifier for this simulator</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.Caps">
-            <summary>The capabilities for this simulator</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.Handle">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.SimVersion">
-            <summary>The current version of software this simulator is running</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.Name">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.ParcelOverlay">
-            <summary>A 64x64 grid of parcel coloring values. The values stored 
-            in this array are of the <seealso cref="!:ParcelArrayType"/> type</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.ParcelOverlaysReceived">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange00">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange01">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange10">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange11">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight00">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight01">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight10">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight11">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.WaterHeight">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.SimOwner">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainBase0">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainBase1">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainBase2">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainBase3">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainDetail0">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainDetail1">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainDetail2">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainDetail3">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.IsEstateManager">
-            <summary>true if your agent has Estate Manager rights on this region</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.Flags">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.Access">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.BillableFactor">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.Stats">
-            <summary>Statistics information for this simulator and the
-            connection to the simulator, calculated by the simulator itself
-            and the library</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.RegionID">
-            <summary>The regions Unique ID</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.ColoLocation">
-            <summary>The physical data center the simulator is located</summary>
-            <remarks>Known values are:
-            <list type="table">
-            <item>Dallas</item>
-            <item>Chandler</item>
-            <item>SF</item>
-            </list>
-            </remarks>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.CPUClass">
-            <summary>The CPU Class of the simulator</summary>
-            <remarks>Most full mainland/estate sims appear to be 5,
-            Homesteads and Openspace appear to be 501</remarks>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.CPURatio">
-            <summary>The number of regions sharing the same CPU as this one</summary>
-            <remarks>"Full Sims" appear to be 1, Homesteads appear to be 4</remarks>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.ProductName">
-            <summary>The billing product name</summary>
-            <remarks>Known values are:
-            <list type="table">
-            <item>Mainland / Full Region (Sku: 023)</item>
-            <item>Estate / Full Region (Sku: 024)</item>
-            <item>Estate / Openspace (Sku: 027)</item>
-            <item>Estate / Homestead (Sku: 029)</item>
-            <item>Mainland / Homestead (Sku: 129) (Linden Owned)</item>
-            <item>Mainland / Linden Homes (Sku: 131)</item>
-            </list>
-            </remarks>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.ProductSku">
-            <summary>The billing product SKU</summary>
-            <remarks>Known values are:
-            <list type="table">
-            <item>023 Mainland / Full Region</item>
-            <item>024 Estate / Full Region</item>
-            <item>027 Estate / Openspace</item>
-            <item>029 Estate / Homestead</item>
-            <item>129 Mainland / Homestead (Linden Owned)</item>
-            <item>131 Linden Homes / Full Region</item>
-            </list>
-            </remarks>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.Sequence">
-            <summary>The current sequence number for packets sent to this
-            simulator. Must be Interlocked before modifying. Only
-            useful for applications manipulating sequence numbers</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.ObjectsAvatars">
+        <member name="T:OpenMetaverse.InventoryAttachment">
             <summary>
-            A thread-safe dictionary containing avatars in a simulator        
+            InventoryAttachment Class, contains details on an attachable object
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.ObjectsPrimitives">
+        <member name="M:OpenMetaverse.InventoryAttachment.#ctor(OpenMetaverse.UUID)">
             <summary>
-            A thread-safe dictionary containing primitives in a simulator
+            Construct an InventoryAttachment object
             </summary>
+            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID" /> which becomes the
+            <seealso cref="T:OpenMetaverse.InventoryItem" /> objects AssetUUID</param>
         </member>
-        <member name="F:OpenMetaverse.Simulator.Parcels">
+        <member name="M:OpenMetaverse.InventoryAttachment.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            Provides access to an internal thread-safe dictionary containing parcel
-            information found in this simulator
+            Construct an InventoryAttachment object from a serialization stream
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.IsParcelMapFull">
+        <member name="P:OpenMetaverse.InventoryAttachment.AttachmentPoint">
             <summary>
-            Checks simulator parcel map to make sure it has downloaded all data successfully
+            Get the last AttachmentPoint this object was attached to
             </summary>
-            <returns>true if map is full (contains no 0's)</returns>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.DisconnectCandidate">
-            <summary>Used internally to track sim disconnections</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.ConnectedEvent">
-            <summary>Event that is triggered when the simulator successfully
-            establishes a connection</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.connected">
-            <summary>Whether this sim is currently connected or not. Hooked up
-            to the property Connected</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.avatarPositions">
-            <summary>Coarse locations of avatars in this simulator</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.preyID">
-            <summary>AvatarPositions key representing TrackAgent target</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.PacketArchive">
-            <summary>Sequence numbers of packets we've received
-            (for duplicate checking)</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.NeedAck">
-            <summary>Packets we sent out that need ACKs from the simulator</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.pauseSerial">
-            <summary>Sequence number for pause/resume</summary>
-        </member>
-        <member name="F:OpenMetaverse.Simulator.handshakeComplete">
-            <summary>Indicates if UDP connection to the sim is fully established</summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.#ctor(OpenMetaverse.GridClient,System.Net.IPEndPoint,System.UInt64)">
+        <member name="T:OpenMetaverse.InventoryWearable">
             <summary>
-            
+            InventoryWearable Class, details on a clothing item or body part
             </summary>
-            <param name="client">Reference to the GridClient object</param>
-            <param name="address">IPEndPoint of the simulator</param>
-            <param name="handle">handle of the simulator</param>
         </member>
-        <member name="M:OpenMetaverse.Simulator.Dispose">
+        <member name="M:OpenMetaverse.InventoryWearable.#ctor(OpenMetaverse.UUID)">
             <summary>
-            Called when this Simulator object is being destroyed
+            Construct an InventoryWearable object
             </summary>
+            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID" /> which becomes the
+            <seealso cref="T:OpenMetaverse.InventoryItem" /> objects AssetUUID</param>
         </member>
-        <member name="M:OpenMetaverse.Simulator.Connect(System.Boolean)">
+        <member name="M:OpenMetaverse.InventoryWearable.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            Attempt to connect to this simulator
+            Construct an InventoryWearable object from a serialization stream
             </summary>
-            <param name="moveToSim">Whether to move our agent in to this sim or not</param>
-            <returns>True if the connection succeeded or connection status is
-            unknown, false if there was a failure</returns>
         </member>
-        <member name="M:OpenMetaverse.Simulator.UseCircuitCode">
+        <member name="P:OpenMetaverse.InventoryWearable.WearableType">
             <summary>
-            Initiates connection to the simulator
+            The <seealso cref="T:OpenMetaverse.WearableType" />, Skin, Shape, Skirt, Etc
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.Disconnect(System.Boolean)">
+        <member name="T:OpenMetaverse.InventoryAnimation">
             <summary>
-            Disconnect from this simulator
+            InventoryAnimation Class, A bvh encoded object which animates an avatar
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.Pause">
+        <member name="M:OpenMetaverse.InventoryAnimation.#ctor(OpenMetaverse.UUID)">
             <summary>
-            Instructs the simulator to stop sending update (and possibly other) packets
+            Construct an InventoryAnimation object
             </summary>
+            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID" /> which becomes the
+            <seealso cref="T:OpenMetaverse.InventoryItem" /> objects AssetUUID</param>
         </member>
-        <member name="M:OpenMetaverse.Simulator.Resume">
+        <member name="M:OpenMetaverse.InventoryAnimation.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            Instructs the simulator to resume sending update packets (unpause)
+            Construct an InventoryAnimation object from a serialization stream
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.TerrainHeightAtPoint(System.Int32,System.Int32,System.Single@)">
+        <member name="T:OpenMetaverse.InventoryGesture">
             <summary>
-            Retrieve the terrain height at a given coordinate
+            InventoryGesture Class, details on a series of animations, sounds, and actions
             </summary>
-            <param name="x">Sim X coordinate, valid range is from 0 to 255</param>
-            <param name="y">Sim Y coordinate, valid range is from 0 to 255</param>
-            <param name="height">The terrain height at the given point if the
-            lookup was successful, otherwise 0.0f</param>
-            <returns>True if the lookup was successful, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.Simulator.SendPacket(OpenMetaverse.Packets.Packet)">
+        <member name="M:OpenMetaverse.InventoryGesture.#ctor(OpenMetaverse.UUID)">
             <summary>
-            Sends a packet
+            Construct an InventoryGesture object
             </summary>
-            <param name="packet">Packet to be sent</param>
+            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID" /> which becomes the
+            <seealso cref="T:OpenMetaverse.InventoryItem" /> objects AssetUUID</param>
         </member>
-        <member name="M:OpenMetaverse.Simulator.SendPing">
+        <member name="M:OpenMetaverse.InventoryGesture.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            
+            Construct an InventoryGesture object from a serialization stream
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.ToString">
+        <member name="T:OpenMetaverse.InventoryFolder">
             <summary>
-            Returns Simulator Name as a String
+            A folder contains <seealso cref="T:OpenMetaverse.InventoryItem" />s and has certain attributes specific
+            to itself
             </summary>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Simulator.GetHashCode">
+        <member name="M:OpenMetaverse.InventoryFolder.#ctor(OpenMetaverse.UUID)">
             <summary>
-            
+            Constructor
             </summary>
-            <returns></returns>
+            <param name="itemID">UUID of the folder</param>
         </member>
-        <member name="M:OpenMetaverse.Simulator.Equals(System.Object)">
+        <member name="M:OpenMetaverse.InventoryFolder.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            
+            Construct an InventoryFolder object from a serialization stream
             </summary>
-            <param name="obj"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Simulator.SendAcks">
+        <member name="F:OpenMetaverse.InventoryFolder.PreferredType">
+            <summary>The Preferred <seealso cref="T:OpenMetaverse.AssetType" /> for a folder.</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryFolder.Version">
+            <summary>The Version of this folder</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryFolder.DescendentCount">
+            <summary>Number of child items this folder contains.</summary>
+        </member>
+        <member name="M:OpenMetaverse.InventoryFolder.ToString">
             <summary>
-            Sends out pending acknowledgements
             </summary>
-            <returns>Number of ACKs sent</returns>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.Simulator.ResendUnacked">
+        <member name="M:OpenMetaverse.InventoryFolder.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            Resend unacknowledged packets
+            Get Serilization data for this InventoryFolder object
             </summary>
         </member>
-        <member name="P:OpenMetaverse.Simulator.ParcelMap">
+        <member name="M:OpenMetaverse.InventoryFolder.GetHashCode">
             <summary>
-            Provides access to an internal thread-safe multidimensional array containing a x,y grid mapped
-            to each 64x64 parcel's LocalID.
             </summary>
+            <returns>
+            </returns>
         </member>
-        <member name="P:OpenMetaverse.Simulator.IPEndPoint">
-            <summary>The IP address and port of the server</summary>
-        </member>
-        <member name="P:OpenMetaverse.Simulator.Connected">
-            <summary>Whether there is a working connection to the simulator or 
-            not</summary>
+        <member name="M:OpenMetaverse.InventoryFolder.Equals(System.Object)">
+            <summary>
+            </summary>
+            <param name="o">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="P:OpenMetaverse.Simulator.AvatarPositions">
-            <summary>Coarse locations of avatars in this simulator</summary>
+        <member name="M:OpenMetaverse.InventoryFolder.Equals(OpenMetaverse.InventoryBase)">
+            <summary>
+            </summary>
+            <param name="o">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="P:OpenMetaverse.Simulator.PreyID">
-            <summary>AvatarPositions key representing TrackAgent target</summary>
+        <member name="M:OpenMetaverse.InventoryFolder.Equals(OpenMetaverse.InventoryFolder)">
+            <summary>
+            </summary>
+            <param name="o">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="P:OpenMetaverse.Simulator.HandshakeComplete">
-            <summary>Indicates if UDP connection to the sim is fully established</summary>
+        <member name="T:OpenMetaverse.InventoryManager">
+            <summary>
+            Tools for dealing with agents inventory
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Simulator.SimStats">
+        <member name="M:OpenMetaverse.InventoryManager.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            Simulator Statistics
+            Default constructor
             </summary>
+            <param name="client">Reference to the GridClient object</param>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.SentPackets">
-            <summary>Total number of packets sent by this simulator to this agent</summary>
+        <member name="T:OpenMetaverse.InventoryManager.ItemCreatedCallback">
+            <summary>
+            Callback for inventory item creation finishing
+            </summary>
+            <param name="success">Whether the request to create an inventory
+            item succeeded or not</param>
+            <param name="item">Inventory item being created. If success is
+            false this will be null</param>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.RecvPackets">
-            <summary>Total number of packets received by this simulator to this agent</summary>
+        <member name="T:OpenMetaverse.InventoryManager.ItemCreatedFromAssetCallback">
+            <summary>
+            Callback for an inventory item being create from an uploaded asset
+            </summary>
+            <param name="success">true if inventory item creation was successful</param>
+            <param name="status">
+            </param>
+            <param name="itemID">
+            </param>
+            <param name="assetID">
+            </param>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.SentBytes">
-            <summary>Total number of bytes sent by this simulator to this agent</summary>
+        <member name="T:OpenMetaverse.InventoryManager.ItemCopiedCallback">
+            <summary>
+            </summary>
+            <param name="item">
+            </param>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.RecvBytes">
-            <summary>Total number of bytes received by this simulator to this agent</summary>
+        <member name="T:OpenMetaverse.InventoryManager.InventoryUploadedAssetCallback">
+            <summary>
+            Reply received when uploading an inventory asset
+            </summary>
+            <param name="success">Has upload been successful</param>
+            <param name="status">Error message if upload failed</param>
+            <param name="itemID">Inventory asset UUID</param>
+            <param name="assetID">New asset UUID</param>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ConnectTime">
-            <summary>Time in seconds agent has been connected to simulator</summary>
+        <member name="T:OpenMetaverse.InventoryManager.ScriptUpdatedCallback">
+            <summary>
+            Delegate that is invoked when script upload is completed
+            </summary>
+            <param name="uploadSuccess">Has upload succeded (note, there still might be compile errors)</param>
+            <param name="uploadStatus">Upload status message</param>
+            <param name="compileSuccess">Is compilation successful</param>
+            <param name="compileMessages">If compilation failed, list of error messages, null on compilation success</param>
+            <param name="itemID">Script inventory UUID</param>
+            <param name="assetID">Script's new asset UUID</param>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ResentPackets">
-            <summary>Total number of packets that have been resent</summary>
+        <member name="F:OpenMetaverse.InventoryManager.MAGIC_ID">
+            <summary>Used for converting shadow_id to asset_id</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ReceivedResends">
-            <summary>Total number of resent packets recieved</summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_ItemReceived">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.SentPings">
-            <summary>Total number of pings sent to this simulator by this agent</summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_ItemReceivedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ReceivedPongs">
-            <summary>Total number of ping replies sent to this agent by this simulator</summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_FolderUpdated">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.IncomingBPS">
-            <summary>
-            Incoming bytes per second
-            </summary>
-            <remarks>It would be nice to have this claculated on the fly, but
-            this is far, far easier</remarks>
+        <member name="F:OpenMetaverse.InventoryManager.m_FolderUpdatedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.OutgoingBPS">
-            <summary>
-            Outgoing bytes per second
-            </summary>
-            <remarks>It would be nice to have this claculated on the fly, but
-            this is far, far easier</remarks>
+        <member name="F:OpenMetaverse.InventoryManager.m_InventoryObjectOffered">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.LastPingSent">
-            <summary>Time last ping was sent</summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_InventoryObjectOfferedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.LastPingID">
-            <summary>ID of last Ping sent</summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_TaskItemReceived">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.LastLag">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_TaskItemReceivedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.MissedPings">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_FindObjectByPathReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.Dilation">
-            <summary>Current time dilation of this simulator</summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_FindObjectByPathReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.FPS">
-            <summary>Current Frames per second of simulator</summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_TaskInventoryReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.PhysicsFPS">
-            <summary>Current Physics frames per second of simulator</summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_TaskInventoryReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.AgentUpdates">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_SaveAssetToInventory">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.FrameTime">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_SaveAssetToInventoryLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.NetTime">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_ScriptRunningReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.PhysicsTime">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_ScriptRunningReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ImageTime">
-            <summary></summary>
+        <member name="F:OpenMetaverse.InventoryManager._NewFolderNames">
+            <summary>Partial mapping of AssetTypes to folder names</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ScriptTime">
-            <summary></summary>
+        <member name="E:OpenMetaverse.InventoryManager.ItemReceived">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.AgentTime">
-            <summary></summary>
+        <member name="E:OpenMetaverse.InventoryManager.FolderUpdated">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.OtherTime">
-            <summary></summary>
+        <member name="E:OpenMetaverse.InventoryManager.InventoryObjectOffered">
+            <summary>Raised when the simulator sends us data containing
+            an inventory object sent by another avatar or primitive</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.Objects">
-            <summary>Total number of objects Simulator is simulating</summary>
+        <member name="E:OpenMetaverse.InventoryManager.TaskItemReceived">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ScriptedObjects">
-            <summary>Total number of Active (Scripted) objects running</summary>
+        <member name="E:OpenMetaverse.InventoryManager.FindObjectByPathReply">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.Agents">
-            <summary>Number of agents currently in this simulator</summary>
+        <member name="E:OpenMetaverse.InventoryManager.TaskInventoryReply">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ChildAgents">
-            <summary>Number of agents in neighbor simulators</summary>
+        <member name="E:OpenMetaverse.InventoryManager.SaveAssetToInventory">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ActiveScripts">
-            <summary>Number of Active scripts running in this simulator</summary>
+        <member name="E:OpenMetaverse.InventoryManager.ScriptRunningReply">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.LSLIPS">
-            <summary></summary>
+        <member name="P:OpenMetaverse.InventoryManager.Store">
+            <summary>
+            Get this agents Inventory data
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.INPPS">
-            <summary></summary>
+        <member name="M:OpenMetaverse.InventoryManager.OnItemReceived(OpenMetaverse.ItemReceivedEventArgs)">
+            <summary>Raises the ItemReceived Event</summary>
+            <param name="e">A ItemReceivedEventArgs object containing
+            the data sent from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.OUTPPS">
-            <summary></summary>
+        <member name="M:OpenMetaverse.InventoryManager.OnFolderUpdated(OpenMetaverse.FolderUpdatedEventArgs)">
+            <summary>Raises the FolderUpdated Event</summary>
+            <param name="e">A FolderUpdatedEventArgs object containing
+            the data sent from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.PendingDownloads">
-            <summary>Number of downloads pending</summary>
+        <member name="M:OpenMetaverse.InventoryManager.OnInventoryObjectOffered(OpenMetaverse.InventoryObjectOfferedEventArgs)">
+            <summary>Raises the InventoryObjectOffered Event</summary>
+            <param name="e">A InventoryObjectOfferedEventArgs object containing
+            the data sent from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.PendingUploads">
-            <summary>Number of uploads pending</summary>
+        <member name="M:OpenMetaverse.InventoryManager.OnTaskItemReceived(OpenMetaverse.TaskItemReceivedEventArgs)">
+            <summary>Raises the TaskItemReceived Event</summary>
+            <param name="e">A TaskItemReceivedEventArgs object containing
+            the data sent from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.VirtualSize">
-            <summary></summary>
+        <member name="M:OpenMetaverse.InventoryManager.OnFindObjectByPathReply(OpenMetaverse.FindObjectByPathReplyEventArgs)">
+            <summary>Raises the FindObjectByPath Event</summary>
+            <param name="e">A FindObjectByPathEventArgs object containing
+            the data sent from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ResidentSize">
-            <summary></summary>
+        <member name="M:OpenMetaverse.InventoryManager.OnTaskInventoryReply(OpenMetaverse.TaskInventoryReplyEventArgs)">
+            <summary>Raises the TaskInventoryReply Event</summary>
+            <param name="e">A TaskInventoryReplyEventArgs object containing
+            the data sent from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.PendingLocalUploads">
-            <summary>Number of local uploads pending</summary>
+        <member name="M:OpenMetaverse.InventoryManager.OnSaveAssetToInventory(OpenMetaverse.SaveAssetToInventoryEventArgs)">
+            <summary>Raises the SaveAssetToInventory Event</summary>
+            <param name="e">A SaveAssetToInventoryEventArgs object containing
+            the data sent from the simulator</param>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.UnackedBytes">
-            <summary>Unacknowledged bytes in queue</summary>
+        <member name="M:OpenMetaverse.InventoryManager.OnScriptRunningReply(OpenMetaverse.ScriptRunningReplyEventArgs)">
+            <summary>Raises the ScriptRunningReply Event</summary>
+            <param name="e">A ScriptRunningReplyEventArgs object containing
+            the data sent from the simulator</param>
         </member>
-        <member name="M:OpenMetaverse.WrappedObject`1.Dispose">
+        <member name="M:OpenMetaverse.InventoryManager.FetchItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Int32)">
             <summary>
-            Checks the instance back into the object pool
+            Fetch an inventory item from the dataserver
             </summary>
+            <param name="itemID">The items <seealso cref="T:OpenMetaverse.UUID" /></param>
+            <param name="ownerID">The item Owners <seealso cref="T:OpenMetaverse.UUID" /></param>
+            <param name="timeoutMS">a integer representing the number of milliseconds to wait for results</param>
+            <returns>An <seealso cref="T:OpenMetaverse.InventoryItem" /> object on success, or null if no item was found</returns>
+            <remarks>Items will also be sent to the <seealso cref="M:OpenMetaverse.InventoryManager.OnItemReceived(OpenMetaverse.ItemReceivedEventArgs)" /> event</remarks>
         </member>
-        <member name="P:OpenMetaverse.WrappedObject`1.Instance">
+        <member name="M:OpenMetaverse.InventoryManager.RequestFetchInventory(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Returns an instance of the class that has been checked out of the Object Pool.
+            Request A single inventory item
             </summary>
+            <param name="itemID">The items <seealso cref="T:OpenMetaverse.UUID" /></param>
+            <param name="ownerID">The item Owners <seealso cref="T:OpenMetaverse.UUID" /></param>
+            <seealso cref="M:OpenMetaverse.InventoryManager.OnItemReceived(OpenMetaverse.ItemReceivedEventArgs)" />
         </member>
-        <member name="M:OpenMetaverse.ObjectPoolBase`1.#ctor">
+        <member name="M:OpenMetaverse.InventoryManager.RequestFetchInventory(System.Collections.Generic.List{OpenMetaverse.UUID},System.Collections.Generic.List{OpenMetaverse.UUID})">
             <summary>
-            Creates a new instance of the ObjectPoolBase class. Initialize MUST be called
-            after using this constructor.
+            Request inventory items
             </summary>
+            <param name="itemIDs">Inventory items to request</param>
+            <param name="ownerIDs">Owners of the inventory items</param>
+            <seealso cref="M:OpenMetaverse.InventoryManager.OnItemReceived(OpenMetaverse.ItemReceivedEventArgs)" />
         </member>
-        <member name="M:OpenMetaverse.ObjectPoolBase`1.#ctor(System.Int32,System.Int32,System.Boolean,System.Int32)">
+        <member name="M:OpenMetaverse.InventoryManager.FolderContents(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventorySortOrder,System.Int32)">
             <summary>
-            Creates a new instance of the ObjectPool Base class.        
+            Get contents of a folder
             </summary>
-            <param name="itemsPerSegment">The object pool is composed of segments, which 
-            are allocated whenever the size of the pool is exceeded. The number of items
-            in a segment should be large enough that allocating a new segmeng is a rare
-            thing. For example, on a server that will have 10k people logged in at once, 
-            the receive buffer object pool should have segment sizes of at least 1000 
-            byte arrays per segment.
-            </param>
-            <param name="minimumSegmentCount">The minimun number of segments that may exist.</param>
-            <param name="gcOnPoolGrowth">Perform a full GC.Collect whenever a segment is allocated, and then again after allocation to compact the heap.</param>
-            <param name="cleanupFrequenceMS">The frequency which segments are checked to see if they're eligible for cleanup.</param>
+            <param name="folder">The <seealso cref="T:OpenMetaverse.UUID" /> of the folder to search</param>
+            <param name="owner">The <seealso cref="T:OpenMetaverse.UUID" /> of the folders owner</param>
+            <param name="folders">true to retrieve folders</param>
+            <param name="items">true to retrieve items</param>
+            <param name="order">sort order to return results in</param>
+            <param name="timeoutMS">a integer representing the number of milliseconds to wait for results</param>
+            <returns>A list of inventory items matching search criteria within folder</returns>
+            <seealso cref="M:OpenMetaverse.InventoryManager.RequestFolderContents(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventorySortOrder)" />
+            <remarks>InventoryFolder.DescendentCount will only be accurate if both folders and items are
+            requested</remarks>
         </member>
-        <member name="M:OpenMetaverse.ObjectPoolBase`1.ForceCleanup">
+        <member name="M:OpenMetaverse.InventoryManager.RequestFolderContents(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventorySortOrder)">
             <summary>
-            Forces the segment cleanup algorithm to be run. This method is intended 
-            primarly for use from the Unit Test libraries.
+            Request the contents of an inventory folder
             </summary>
+            <param name="folder">The folder to search</param>
+            <param name="owner">The folder owners <seealso cref="T:OpenMetaverse.UUID" /></param>
+            <param name="folders">true to return <seealso cref="!:InventoryManager.InventoryFolder" />s contained in folder</param>
+            <param name="items">true to return <seealso cref="!:InventoryManager.InventoryItem" />s containd in folder</param>
+            <param name="order">the sort order to return items in</param>
+            <seealso cref="M:OpenMetaverse.InventoryManager.FolderContents(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventorySortOrder,System.Int32)" />
         </member>
-        <member name="M:OpenMetaverse.ObjectPoolBase`1.GetObjectInstance">
+        <member name="M:OpenMetaverse.InventoryManager.RequestFolderContentsCap(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventorySortOrder)">
             <summary>
-            Responsible for allocate 1 instance of an object that will be stored in a segment. 
+            Request the contents of an inventory folder using HTTP capabilities
             </summary>
-            <returns>An instance of whatever objec the pool is pooling.</returns>
+            <param name="folderID">The folder to search</param>
+            <param name="ownerID">The folder owners <seealso cref="T:OpenMetaverse.UUID" /></param>
+            <param name="fetchFolders">true to return <seealso cref="!:InventoryManager.InventoryFolder" />s contained in folder</param>
+            <param name="fetchItems">true to return <seealso cref="!:InventoryManager.InventoryItem" />s containd in folder</param>
+            <param name="order">the sort order to return items in</param>
+            <seealso cref="M:OpenMetaverse.InventoryManager.FolderContents(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventorySortOrder,System.Int32)" />
         </member>
-        <member name="M:OpenMetaverse.ObjectPoolBase`1.CheckIn(OpenMetaverse.ObjectPoolSegment{`0},`0)">
+        <member name="M:OpenMetaverse.InventoryManager.FindFolderForType(OpenMetaverse.AssetType)">
             <summary>
-            Checks in an instance of T owned by the object pool. This method is only intended to be called
-            by the <c>WrappedObject</c> class.
+            Returns the UUID of the folder (category) that defaults to
+            containing 'type'. The folder is not necessarily only for that
+            type
             </summary>
-            <param name="owningSegment">The segment from which the instance is checked out.</param>
-            <param name="instance">The instance of <c>T</c> to check back into the segment.</param>
+            <remarks>This will return the root folder if one does not exist</remarks>
+            <param name="type">
+            </param>
+            <returns>The UUID of the desired folder if found, the UUID of the RootFolder
+            if not found, or UUID.Zero on failure</returns>
         </member>
-        <member name="M:OpenMetaverse.ObjectPoolBase`1.CheckOut">
+        <member name="M:OpenMetaverse.InventoryManager.FindObjectByPath(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.Int32)">
             <summary>
-            Checks an instance of <c>T</c> from the pool. If the pool is not sufficient to 
-            allow the checkout, a new segment is created. 
+            Find an object in inventory using a specific path to search
             </summary>
-            <returns>A <c>WrappedObject</c> around the instance of <c>T</c>. To check
-            the instance back into the segment, be sureto dispose the WrappedObject 
-            when finished. </returns>
+            <param name="baseFolder">The folder to begin the search in</param>
+            <param name="inventoryOwner">The object owners <seealso cref="T:OpenMetaverse.UUID" /></param>
+            <param name="path">A string path to search</param>
+            <param name="timeoutMS">milliseconds to wait for a reply</param>
+            <returns>Found items <seealso cref="T:OpenMetaverse.UUID" /> or <seealso cref="F:OpenMetaverse.UUID.Zero" /> if
+            timeout occurs or item is not found</returns>
         </member>
-        <member name="P:OpenMetaverse.ObjectPoolBase`1.TotalSegments">
+        <member name="M:OpenMetaverse.InventoryManager.RequestFindObjectByPath(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String)">
             <summary>
-            The total number of segments created. Intended to be used by the Unit Tests.
+            Find inventory items by path
             </summary>
+            <param name="baseFolder">The folder to begin the search in</param>
+            <param name="inventoryOwner">The object owners <seealso cref="T:OpenMetaverse.UUID" /></param>
+            <param name="path">A string path to search, folders/objects separated by a '/'</param>
+            <remarks>Results are sent to the <seealso cref="!:InventoryManager.OnFindObjectByPath" /> event</remarks>
         </member>
-        <member name="P:OpenMetaverse.ObjectPoolBase`1.ItemsPerSegment">
+        <member name="M:OpenMetaverse.InventoryManager.LocalFind(OpenMetaverse.UUID,System.String[],System.Int32,System.Boolean)">
             <summary>
-            The number of items that are in a segment. Items in a segment 
-            are all allocated at the same time, and are hopefully close to 
-            each other in the managed heap. 
+            Search inventory Store object for an item or folder
             </summary>
+            <param name="baseFolder">The folder to begin the search in</param>
+            <param name="path">An array which creates a path to search</param>
+            <param name="level">Number of levels below baseFolder to conduct searches</param>
+            <param name="firstOnly">if True, will stop searching after first match is found</param>
+            <returns>A list of inventory items found</returns>
         </member>
-        <member name="P:OpenMetaverse.ObjectPoolBase`1.MinimumSegmentCount">
+        <member name="M:OpenMetaverse.InventoryManager.Move(OpenMetaverse.InventoryBase,OpenMetaverse.InventoryFolder)">
             <summary>
-            The minimum number of segments. When segments are reclaimed, 
-            this number of segments will always be left alone. These
-            segments are allocated at startup.
+            Move an inventory item or folder to a new location
             </summary>
+            <param name="item">The <seealso cref="T:InventoryBase" /> item or folder to move</param>
+            <param name="newParent">The <seealso cref="T:InventoryFolder" /> to move item or folder to</param>
         </member>
-        <member name="P:OpenMetaverse.ObjectPoolBase`1.MinimumSegmentAgePriorToCleanup">
+        <member name="M:OpenMetaverse.InventoryManager.Move(OpenMetaverse.InventoryBase,OpenMetaverse.InventoryFolder,System.String)">
             <summary>
-            The age a segment must be before it's eligible for cleanup. 
-            This  is used to prevent thrash, and typical values are in 
-            the 5 minute range.
+            Move an inventory item or folder to a new location and change its name
             </summary>
+            <param name="item">The <seealso cref="T:InventoryBase" /> item or folder to move</param>
+            <param name="newParent">The <seealso cref="T:InventoryFolder" /> to move item or folder to</param>
+            <param name="newName">The name to change the item or folder to</param>
         </member>
-        <member name="P:OpenMetaverse.ObjectPoolBase`1.CleanupFrequencyMilliseconds">
+        <member name="M:OpenMetaverse.InventoryManager.MoveFolder(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String)">
             <summary>
-            The frequence which the cleanup thread runs. This is typically
-            expected to be in the 5 minute range. 
+            Move and rename a folder
             </summary>
+            <param name="folderID">The source folders <seealso cref="T:OpenMetaverse.UUID" /></param>
+            <param name="newparentID">The destination folders <seealso cref="T:OpenMetaverse.UUID" /></param>
+            <param name="newName">The name to change the folder to</param>
         </member>
-        <member name="T:OpenMetaverse.InventoryException">
+        <member name="M:OpenMetaverse.InventoryManager.UpdateFolderProperties(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.AssetType)">
             <summary>
-            Exception class to identify inventory exceptions
+            Update folder properties
             </summary>
+            <param name="folderID">
+                <seealso cref="T:OpenMetaverse.UUID" /> of the folder to update</param>
+            <param name="parentID">Sets folder's parent to <seealso cref="T:OpenMetaverse.UUID" /></param>
+            <param name="name">Folder name</param>
+            <param name="type">Folder type</param>
         </member>
-        <member name="T:OpenMetaverse.Inventory">
+        <member name="M:OpenMetaverse.InventoryManager.MoveFolder(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Responsible for maintaining inventory structure. Inventory constructs nodes
-            and manages node children as is necessary to maintain a coherant hirarchy.
-            Other classes should not manipulate or create InventoryNodes explicitly. When
-            A node's parent changes (when a folder is moved, for example) simply pass
-            Inventory the updated InventoryFolder and it will make the appropriate changes
-            to its internal representation.
+            Move a folder
             </summary>
+            <param name="folderID">The source folders <seealso cref="T:OpenMetaverse.UUID" /></param>
+            <param name="newParentID">The destination folders <seealso cref="T:OpenMetaverse.UUID" /></param>
         </member>
-        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectUpdated">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.Inventory.OnInventoryObjectUpdated(OpenMetaverse.InventoryObjectUpdatedEventArgs)">
-            <summary>Raises the InventoryObjectUpdated Event</summary>
-             <param name="e">A InventoryObjectUpdatedEventArgs object containing
-             the data sent from the simulator</param>
-        </member>
-        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectUpdatedLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectRemoved">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.Inventory.OnInventoryObjectRemoved(OpenMetaverse.InventoryObjectRemovedEventArgs)">
-            <summary>Raises the InventoryObjectRemoved Event</summary>
-             <param name="e">A InventoryObjectRemovedEventArgs object containing
-             the data sent from the simulator</param>
-        </member>
-        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectRemovedLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectAdded">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.Inventory.OnInventoryObjectAdded(OpenMetaverse.InventoryObjectAddedEventArgs)">
-            <summary>Raises the InventoryObjectAdded Event</summary>
-             <param name="e">A InventoryObjectAddedEventArgs object containing
-             the data sent from the simulator</param>
-        </member>
-        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectAddedLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="M:OpenMetaverse.Inventory.GetContents(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.InventoryManager.MoveFolders(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.UUID})">
             <summary>
-            Returns the contents of the specified folder
+            Move multiple folders, the keys in the Dictionary parameter,
+            to a new parents, the value of that folder's key.
             </summary>
-            <param name="folder">A folder's UUID</param>
-            <returns>The contents of the folder corresponding to <code>folder</code></returns>
-            <exception cref="T:OpenMetaverse.InventoryException">When <code>folder</code> does not exist in the inventory</exception>
+            <param name="foldersNewParents">A Dictionary containing the
+            <seealso cref="T:OpenMetaverse.UUID" /> of the source as the key, and the
+            <seealso cref="T:OpenMetaverse.UUID" /> of the destination as the value</param>
         </member>
-        <member name="M:OpenMetaverse.Inventory.UpdateNodeFor(OpenMetaverse.InventoryBase)">
+        <member name="M:OpenMetaverse.InventoryManager.MoveItem(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Updates the state of the InventoryNode and inventory data structure that
-            is responsible for the InventoryObject. If the item was previously not added to inventory,
-            it adds the item, and updates structure accordingly. If it was, it updates the 
-            InventoryNode, changing the parent node if <code>item.parentUUID</code> does 
-            not match <code>node.Parent.Data.UUID</code>.
-            
-            You can not set the inventory root folder using this method
+            Move an inventory item to a new folder
             </summary>
-            <param name="item">The InventoryObject to store</param>
+            <param name="itemID">The <seealso cref="T:OpenMetaverse.UUID" /> of the source item to move</param>
+            <param name="folderID">The <seealso cref="T:OpenMetaverse.UUID" /> of the destination folder</param>
         </member>
-        <member name="M:OpenMetaverse.Inventory.RemoveNodeFor(OpenMetaverse.InventoryBase)">
+        <member name="M:OpenMetaverse.InventoryManager.MoveItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String)">
             <summary>
-            Removes the InventoryObject and all related node data from Inventory.
+            Move and rename an inventory item
             </summary>
-            <param name="item">The InventoryObject to remove.</param>
+            <param name="itemID">The <seealso cref="T:OpenMetaverse.UUID" /> of the source item to move</param>
+            <param name="folderID">The <seealso cref="T:OpenMetaverse.UUID" /> of the destination folder</param>
+            <param name="newName">The name to change the folder to</param>
         </member>
-        <member name="M:OpenMetaverse.Inventory.Contains(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.InventoryManager.MoveItems(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.UUID})">
             <summary>
-            Used to find out if Inventory contains the InventoryObject
-            specified by <code>uuid</code>.
+            Move multiple inventory items to new locations
             </summary>
-            <param name="uuid">The UUID to check.</param>
-            <returns>true if inventory contains uuid, false otherwise</returns>
+            <param name="itemsNewParents">A Dictionary containing the
+            <seealso cref="T:OpenMetaverse.UUID" /> of the source item as the key, and the
+            <seealso cref="T:OpenMetaverse.UUID" /> of the destination folder as the value</param>
         </member>
-        <member name="M:OpenMetaverse.Inventory.SaveToDisk(System.String)">
+        <member name="M:OpenMetaverse.InventoryManager.RemoveDescendants(OpenMetaverse.UUID)">
             <summary>
-            Saves the current inventory structure to a cache file
+            Remove descendants of a folder
             </summary>
-            <param name="filename">Name of the cache file to save to</param>
+            <param name="folder">The <seealso cref="T:OpenMetaverse.UUID" /> of the folder</param>
         </member>
-        <member name="M:OpenMetaverse.Inventory.RestoreFromDisk(System.String)">
+        <member name="M:OpenMetaverse.InventoryManager.RemoveItem(OpenMetaverse.UUID)">
             <summary>
-            Loads in inventory cache file into the inventory structure. Note only valid to call after login has been successful.
+            Remove a single item from inventory
             </summary>
-            <param name="filename">Name of the cache file to load</param>
-            <returns>The number of inventory items sucessfully reconstructed into the inventory node tree</returns>
-        </member>
-        <member name="E:OpenMetaverse.Inventory.InventoryObjectUpdated">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
-        </member>
-        <member name="E:OpenMetaverse.Inventory.InventoryObjectRemoved">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
-        </member>
-        <member name="E:OpenMetaverse.Inventory.InventoryObjectAdded">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+            <param name="item">The <seealso cref="T:OpenMetaverse.UUID" /> of the inventory item to remove</param>
         </member>
-        <member name="P:OpenMetaverse.Inventory.RootFolder">
+        <member name="M:OpenMetaverse.InventoryManager.RemoveFolder(OpenMetaverse.UUID)">
             <summary>
-            The root folder of this avatars inventory
+            Remove a folder from inventory
             </summary>
+            <param name="folder">The <seealso cref="T:OpenMetaverse.UUID" /> of the folder to remove</param>
         </member>
-        <member name="P:OpenMetaverse.Inventory.LibraryFolder">
+        <member name="M:OpenMetaverse.InventoryManager.Remove(System.Collections.Generic.List{OpenMetaverse.UUID},System.Collections.Generic.List{OpenMetaverse.UUID})">
             <summary>
-            The default shared library folder
+            Remove multiple items or folders from inventory
             </summary>
+            <param name="items">A List containing the <seealso cref="T:OpenMetaverse.UUID" />s of items to remove</param>
+            <param name="folders">A List containing the <seealso cref="T:OpenMetaverse.UUID" />s of the folders to remove</param>
         </member>
-        <member name="P:OpenMetaverse.Inventory.RootNode">
+        <member name="M:OpenMetaverse.InventoryManager.EmptyLostAndFound">
             <summary>
-            The root node of the avatars inventory
+            Empty the Lost and Found folder
             </summary>
         </member>
-        <member name="P:OpenMetaverse.Inventory.LibraryRootNode">
+        <member name="M:OpenMetaverse.InventoryManager.EmptyTrash">
             <summary>
-            The root node of the default shared library
+            Empty the Trash folder
             </summary>
         </member>
-        <member name="P:OpenMetaverse.Inventory.Item(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.InventoryManager.RequestCreateItem(OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.UUID,OpenMetaverse.InventoryType,OpenMetaverse.PermissionMask,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
             <summary>
-            By using the bracket operator on this class, the program can get the 
-            InventoryObject designated by the specified uuid. If the value for the corresponding
-            UUID is null, the call is equivelant to a call to <code>RemoveNodeFor(this[uuid])</code>.
-            If the value is non-null, it is equivelant to a call to <code>UpdateNodeFor(value)</code>,
-            the uuid parameter is ignored.
             </summary>
-            <param name="uuid">The UUID of the InventoryObject to get or set, ignored if set to non-null value.</param>
-            <returns>The InventoryObject corresponding to <code>uuid</code>.</returns>
+            <param name="parentFolder">
+            </param>
+            <param name="name">
+            </param>
+            <param name="description">
+            </param>
+            <param name="type">
+            </param>
+            <param name="assetTransactionID">Proper use is to upload the inventory's asset first, then provide the Asset's TransactionID here.</param>
+            <param name="invType">
+            </param>
+            <param name="nextOwnerMask">
+            </param>
+            <param name="callback">
+            </param>
         </member>
-        <member name="T:OpenMetaverse.PacketEventDictionary">
+        <member name="M:OpenMetaverse.InventoryManager.RequestCreateItem(OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.UUID,OpenMetaverse.InventoryType,OpenMetaverse.WearableType,OpenMetaverse.PermissionMask,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
             <summary>
-            Registers, unregisters, and fires events generated by incoming packets
             </summary>
+            <param name="parentFolder">
+            </param>
+            <param name="name">
+            </param>
+            <param name="description">
+            </param>
+            <param name="type">
+            </param>
+            <param name="assetTransactionID">Proper use is to upload the inventory's asset first, then provide the Asset's TransactionID here.</param>
+            <param name="invType">
+            </param>
+            <param name="wearableType">
+            </param>
+            <param name="nextOwnerMask">
+            </param>
+            <param name="callback">
+            </param>
         </member>
-        <member name="F:OpenMetaverse.PacketEventDictionary.Client">
-            <summary>Reference to the GridClient object</summary>
-        </member>
-        <member name="M:OpenMetaverse.PacketEventDictionary.#ctor(OpenMetaverse.GridClient)">
+        <member name="M:OpenMetaverse.InventoryManager.CreateFolder(OpenMetaverse.UUID,System.String)">
             <summary>
-            Default constructor
+            Creates a new inventory folder
             </summary>
-            <param name="client"></param>
+            <param name="parentID">ID of the folder to put this folder in</param>
+            <param name="name">Name of the folder to create</param>
+            <returns>The UUID of the newly created folder</returns>
         </member>
-        <member name="M:OpenMetaverse.PacketEventDictionary.RegisterEvent(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs},System.Boolean)">
+        <member name="M:OpenMetaverse.InventoryManager.CreateFolder(OpenMetaverse.UUID,System.String,OpenMetaverse.AssetType)">
             <summary>
-            Register an event handler
+            Creates a new inventory folder
             </summary>
-            <remarks>Use PacketType.Default to fire this event on every 
-            incoming packet</remarks>
-            <param name="packetType">Packet type to register the handler for</param>
-            <param name="eventHandler">Callback to be fired</param>
-            <param name="isAsync">True if this callback should be ran 
-            asynchronously, false to run it synchronous</param>
+            <param name="parentID">ID of the folder to put this folder in</param>
+            <param name="name">Name of the folder to create</param>
+            <param name="preferredType">Sets this folder as the default folder
+            for new assets of the specified type. Use <code>AssetType.Unknown</code>
+            to create a normal folder, otherwise it will likely create a
+            duplicate of an existing folder type</param>
+            <returns>The UUID of the newly created folder</returns>
+            <remarks>If you specify a preferred type of <code>AsseType.Folder</code>
+            it will create a new root folder which may likely cause all sorts
+            of strange problems</remarks>
         </member>
-        <member name="M:OpenMetaverse.PacketEventDictionary.UnregisterEvent(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs})">
+        <member name="M:OpenMetaverse.InventoryManager.RequestCreateItemFromAsset(System.Byte[],System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.InventoryType,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCreatedFromAssetCallback)">
             <summary>
-            Unregister an event handler
+            Create an inventory item and upload asset data
             </summary>
-            <param name="packetType">Packet type to unregister the handler for</param>
-            <param name="eventHandler">Callback to be unregistered</param>
+            <param name="data">Asset data</param>
+            <param name="name">Inventory item name</param>
+            <param name="description">Inventory item description</param>
+            <param name="assetType">Asset type</param>
+            <param name="invType">Inventory type</param>
+            <param name="folderID">Put newly created inventory in this folder</param>
+            <param name="callback">Delegate that will receive feedback on success or failure</param>
         </member>
-        <member name="M:OpenMetaverse.PacketEventDictionary.RaiseEvent(OpenMetaverse.Packets.PacketType,OpenMetaverse.Packets.Packet,OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.InventoryManager.RequestCreateItemFromAsset(System.Byte[],System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.InventoryType,OpenMetaverse.UUID,OpenMetaverse.Permissions,OpenMetaverse.InventoryManager.ItemCreatedFromAssetCallback)">
             <summary>
-            Fire the events registered for this packet type
+            Create an inventory item and upload asset data
             </summary>
-            <param name="packetType">Incoming packet type</param>
-            <param name="packet">Incoming packet</param>
-            <param name="simulator">Simulator this packet was received from</param>
+            <param name="data">Asset data</param>
+            <param name="name">Inventory item name</param>
+            <param name="description">Inventory item description</param>
+            <param name="assetType">Asset type</param>
+            <param name="invType">Inventory type</param>
+            <param name="folderID">Put newly created inventory in this folder</param>
+            <param name="permissions">Permission of the newly created item
+            (EveryoneMask, GroupMask, and NextOwnerMask of Permissions struct are supported)</param>
+            <param name="callback">Delegate that will receive feedback on success or failure</param>
         </member>
-        <member name="T:OpenMetaverse.PacketEventDictionary.PacketCallbackWrapper">
+        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.InventoryBase,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
             <summary>
-            Object that is passed to worker threads in the ThreadPool for
-            firing packet callbacks
+            Creates inventory link to another inventory item or folder
             </summary>
+            <param name="folderID">Put newly created link in folder with this UUID</param>
+            <param name="bse">Inventory item or folder</param>
+            <param name="callback">Method to call upon creation of the link</param>
         </member>
-        <member name="F:OpenMetaverse.PacketEventDictionary.PacketCallbackWrapper.Callback">
-            <summary>Callback to fire for this packet</summary>
-        </member>
-        <member name="F:OpenMetaverse.PacketEventDictionary.PacketCallbackWrapper.Simulator">
-            <summary>Reference to the simulator that this packet came from</summary>
-        </member>
-        <member name="F:OpenMetaverse.PacketEventDictionary.PacketCallbackWrapper.Packet">
-            <summary>The packet that needs to be processed</summary>
-        </member>
-        <member name="T:OpenMetaverse.CapsEventDictionary">
+        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.InventoryItem,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
             <summary>
-            Registers, unregisters, and fires events generated by the Capabilities
-            event queue
+            Creates inventory link to another inventory item
             </summary>
+            <param name="folderID">Put newly created link in folder with this UUID</param>
+            <param name="item">Original inventory item</param>
+            <param name="callback">Method to call upon creation of the link</param>
         </member>
-        <member name="F:OpenMetaverse.CapsEventDictionary.Client">
-            <summary>Reference to the GridClient object</summary>
-        </member>
-        <member name="M:OpenMetaverse.CapsEventDictionary.#ctor(OpenMetaverse.GridClient)">
+        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.InventoryFolder,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
             <summary>
-            Default constructor
+            Creates inventory link to another inventory folder
             </summary>
-            <param name="client">Reference to the GridClient object</param>
+            <param name="folderID">Put newly created link in folder with this UUID</param>
+            <param name="folder">Original inventory folder</param>
+            <param name="callback">Method to call upon creation of the link</param>
         </member>
-        <member name="M:OpenMetaverse.CapsEventDictionary.RegisterEvent(System.String,OpenMetaverse.Caps.EventQueueCallback)">
+        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.InventoryType,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
             <summary>
-            Register an new event handler for a capabilities event sent via the EventQueue
+            Creates inventory link to another inventory item or folder
             </summary>
-            <remarks>Use String.Empty to fire this event on every CAPS event</remarks>
-            <param name="capsEvent">Capability event name to register the 
-            handler for</param>
-            <param name="eventHandler">Callback to fire</param>
+            <param name="folderID">Put newly created link in folder with this UUID</param>
+            <param name="itemID">Original item's UUID</param>
+            <param name="name">Name</param>
+            <param name="description">Description</param>
+            <param name="assetType">Asset Type</param>
+            <param name="invType">Inventory Type</param>
+            <param name="transactionID">Transaction UUID</param>
+            <param name="callback">Method to call upon creation of the link</param>
         </member>
-        <member name="M:OpenMetaverse.CapsEventDictionary.UnregisterEvent(System.String,OpenMetaverse.Caps.EventQueueCallback)">
+        <member name="M:OpenMetaverse.InventoryManager.RequestCopyItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.InventoryManager.ItemCopiedCallback)">
             <summary>
-            Unregister a previously registered capabilities handler 
             </summary>
-            <param name="capsEvent">Capability event name unregister the 
-            handler for</param>
-            <param name="eventHandler">Callback to unregister</param>
+            <param name="item">
+            </param>
+            <param name="newParent">
+            </param>
+            <param name="newName">
+            </param>
+            <param name="callback">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.CapsEventDictionary.RaiseEvent(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.InventoryManager.RequestCopyItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCopiedCallback)">
             <summary>
-            Fire the events registered for this event type synchronously
             </summary>
-            <param name="capsEvent">Capability name</param>
-            <param name="message">Decoded event body</param>
-            <param name="simulator">Reference to the simulator that 
-            generated this event</param>
+            <param name="item">
+            </param>
+            <param name="newParent">
+            </param>
+            <param name="newName">
+            </param>
+            <param name="oldOwnerID">
+            </param>
+            <param name="callback">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.CapsEventDictionary.BeginRaiseEvent(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.InventoryManager.RequestCopyItems(System.Collections.Generic.List{OpenMetaverse.UUID},System.Collections.Generic.List{OpenMetaverse.UUID},System.Collections.Generic.List{System.String},OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCopiedCallback)">
             <summary>
-            Fire the events registered for this event type asynchronously
             </summary>
-            <param name="capsEvent">Capability name</param>
-            <param name="message">Decoded event body</param>
-            <param name="simulator">Reference to the simulator that 
-            generated this event</param>
+            <param name="items">
+            </param>
+            <param name="targetFolders">
+            </param>
+            <param name="newNames">
+            </param>
+            <param name="oldOwnerID">
+            </param>
+            <param name="callback">
+            </param>
         </member>
-        <member name="T:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper">
+        <member name="M:OpenMetaverse.InventoryManager.RequestCopyItemFromNotecard(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCopiedCallback)">
             <summary>
-            Object that is passed to worker threads in the ThreadPool for
-            firing CAPS callbacks
+            Request a copy of an asset embedded within a notecard
             </summary>
+            <param name="objectID">Usually UUID.Zero for copying an asset from a notecard</param>
+            <param name="notecardID">UUID of the notecard to request an asset from</param>
+            <param name="folderID">Target folder for asset to go to in your inventory</param>
+            <param name="itemID">UUID of the embedded asset</param>
+            <param name="callback">callback to run when item is copied to inventory</param>
         </member>
-        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.Callback">
-            <summary>Callback to fire for this packet</summary>
-        </member>
-        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.CapsEvent">
-            <summary>Name of the CAPS event</summary>
-        </member>
-        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.Message">
-            <summary>Strongly typed decoded data</summary>
-        </member>
-        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.Simulator">
-            <summary>Reference to the simulator that generated this event</summary>
-        </member>
-        <member name="T:OpenMetaverse.DownloadRequest">
+        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateItem(OpenMetaverse.InventoryItem)">
             <summary>
-            Represends individual HTTP Download request
             </summary>
+            <param name="item">
+            </param>
         </member>
-        <member name="F:OpenMetaverse.DownloadRequest.Address">
-            <summary>URI of the item to fetch</summary>
-        </member>
-        <member name="F:OpenMetaverse.DownloadRequest.MillisecondsTimeout">
-            <summary>Timout specified in milliseconds</summary>
-        </member>
-        <member name="F:OpenMetaverse.DownloadRequest.DownloadProgressCallback">
-            <summary>Download progress callback</summary>
-        </member>
-        <member name="F:OpenMetaverse.DownloadRequest.CompletedCallback">
-            <summary>Download completed callback</summary>
-        </member>
-        <member name="F:OpenMetaverse.DownloadRequest.ContentType">
-            <summary>Accept the following content type</summary>
-        </member>
-        <member name="M:OpenMetaverse.DownloadRequest.#ctor">
-            <summary>Default constructor</summary>
-        </member>
-        <member name="M:OpenMetaverse.DownloadRequest.#ctor(System.Uri,System.Int32,System.String,OpenMetaverse.Http.CapsBase.DownloadProgressEventHandler,OpenMetaverse.Http.CapsBase.RequestCompletedEventHandler)">
-            <summary>Constructor</summary>
-        </member>
-        <member name="T:OpenMetaverse.DownloadManager">
+        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateItems(System.Collections.Generic.List{OpenMetaverse.InventoryItem})">
             <summary>
-            Manages async HTTP downloads with a limit on maximum
-            concurrent downloads
             </summary>
+            <param name="items">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.DownloadManager.#ctor">
-            <summary>Default constructor</summary>
-        </member>
-        <member name="M:OpenMetaverse.DownloadManager.Dispose">
-            <summary>Cleanup method</summary>
-        </member>
-        <member name="M:OpenMetaverse.DownloadManager.SetupRequest(System.Uri,System.String)">
-            <summary>Setup http download request</summary>
-        </member>
-        <member name="M:OpenMetaverse.DownloadManager.EnqueuePending">
-            <summary>Check the queue for pending work</summary>
-        </member>
-        <member name="M:OpenMetaverse.DownloadManager.QueueDownlad(OpenMetaverse.DownloadRequest)">
-            <summary>Enqueue a new HTPP download</summary>
-        </member>
-        <member name="P:OpenMetaverse.DownloadManager.ParallelDownloads">
-            <summary>Maximum number of parallel downloads from a single endpoint</summary>
-        </member>
-        <member name="P:OpenMetaverse.DownloadManager.ClientCert">
-            <summary>Client certificate</summary>
-        </member>
-        <member name="F:OpenMetaverse.Voice.VoicePosition.Position">
-            <summary>Positional vector of the users position</summary>
-        </member>
-        <member name="F:OpenMetaverse.Voice.VoicePosition.Velocity">
-            <summary>Velocity vector of the position</summary>
-        </member>
-        <member name="F:OpenMetaverse.Voice.VoicePosition.AtOrientation">
-            <summary>At Orientation (X axis) of the position</summary>
-        </member>
-        <member name="F:OpenMetaverse.Voice.VoicePosition.UpOrientation">
-            <summary>Up Orientation (Y axis) of the position</summary>
-        </member>
-        <member name="F:OpenMetaverse.Voice.VoicePosition.LeftOrientation">
-            <summary>Left Orientation (Z axis) of the position</summary>
-        </member>
-        <member name="T:OpenMetaverse.Assets.AssetMesh">
+        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateItems(System.Collections.Generic.List{OpenMetaverse.InventoryItem},OpenMetaverse.UUID)">
             <summary>
-            Represents Mesh asset
             </summary>
+            <param name="items">
+            </param>
+            <param name="transactionID">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetMesh.#ctor">
-            <summary>Initializes a new instance of an AssetMesh object</summary>
-        </member>
-        <member name="M:OpenMetaverse.Assets.AssetMesh.#ctor(OpenMetaverse.UUID,System.Byte[])">
-            <summary>Initializes a new instance of an AssetMesh object with parameters</summary>
-            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
-            <param name="assetData">A byte array containing the raw asset data</param>
-        </member>
-        <member name="M:OpenMetaverse.Assets.AssetMesh.Encode">
+        <member name="M:OpenMetaverse.InventoryManager.RequestUploadNotecardAsset(System.Byte[],OpenMetaverse.UUID,OpenMetaverse.InventoryManager.InventoryUploadedAssetCallback)">
             <summary>
-            TODO: Encodes a scripts contents into a LSO Bytecode file
             </summary>
+            <param name="data">
+            </param>
+            <param name="notecardID">
+            </param>
+            <param name="callback">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetMesh.Decode">
+        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateNotecardTask(System.Byte[],OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.InventoryUploadedAssetCallback)">
             <summary>
-            TODO: Decode LSO Bytecode into a string
+            Save changes to notecard embedded in object contents
             </summary>
-            <returns>true</returns>
-        </member>
-        <member name="P:OpenMetaverse.Assets.AssetMesh.AssetType">
-            <summary>Override the base classes AssetType</summary>
+            <param name="data">Encoded notecard asset data</param>
+            <param name="notecardID">Notecard UUID</param>
+            <param name="taskID">Object's UUID</param>
+            <param name="callback">Called upon finish of the upload with status information</param>
         </member>
-        <member name="T:OpenMetaverse.Helpers">
+        <member name="M:OpenMetaverse.InventoryManager.RequestUploadGestureAsset(System.Byte[],OpenMetaverse.UUID,OpenMetaverse.InventoryManager.InventoryUploadedAssetCallback)">
             <summary>
-            Static helper functions and global variables
+            Upload new gesture asset for an inventory gesture item
             </summary>
+            <param name="data">Encoded gesture asset</param>
+            <param name="gestureID">Gesture inventory UUID</param>
+            <param name="callback">Callback whick will be called when upload is complete</param>
         </member>
-        <member name="F:OpenMetaverse.Helpers.MSG_APPENDED_ACKS">
-            <summary>This header flag signals that ACKs are appended to the packet</summary>
-        </member>
-        <member name="F:OpenMetaverse.Helpers.MSG_RESENT">
-            <summary>This header flag signals that this packet has been sent before</summary>
-        </member>
-        <member name="F:OpenMetaverse.Helpers.MSG_RELIABLE">
-            <summary>This header flags signals that an ACK is expected for this packet</summary>
-        </member>
-        <member name="F:OpenMetaverse.Helpers.MSG_ZEROCODED">
-            <summary>This header flag signals that the message is compressed using zerocoding</summary>
-        </member>
-        <member name="M:OpenMetaverse.Helpers.TEOffsetShort(System.Single)">
+        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateScriptAgentInventory(System.Byte[],OpenMetaverse.UUID,System.Boolean,OpenMetaverse.InventoryManager.ScriptUpdatedCallback)">
             <summary>
-            
+            Update an existing script in an agents Inventory
             </summary>
-            <param name="offset"></param>
-            <returns></returns>
+            <param name="data">A byte[] array containing the encoded scripts contents</param>
+            <param name="itemID">the itemID of the script</param>
+            <param name="mono">if true, sets the script content to run on the mono interpreter</param>
+            <param name="callback">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.Helpers.TEOffsetFloat(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateScriptTask(System.Byte[],OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventoryManager.ScriptUpdatedCallback)">
             <summary>
-            
+            Update an existing script in an task Inventory
             </summary>
-            <param name="bytes"></param>
-            <param name="pos"></param>
-            <returns></returns>
+            <param name="data">A byte[] array containing the encoded scripts contents</param>
+            <param name="itemID">the itemID of the script</param>
+            <param name="taskID">UUID of the prim containting the script</param>
+            <param name="mono">if true, sets the script content to run on the mono interpreter</param>
+            <param name="running">if true, sets the script to running</param>
+            <param name="callback">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.Helpers.TERotationShort(System.Single)">
+        <member name="M:OpenMetaverse.InventoryManager.RequestRezFromInventory(OpenMetaverse.Simulator,OpenMetaverse.Quaternion,OpenMetaverse.Vector3,OpenMetaverse.InventoryItem)">
             <summary>
-            
+            Rez an object from inventory
             </summary>
-            <param name="rotation"></param>
-            <returns></returns>
+            <param name="simulator">Simulator to place object in</param>
+            <param name="rotation">Rotation of the object when rezzed</param>
+            <param name="position">Vector of where to place object</param>
+            <param name="item">InventoryItem object containing item details</param>
         </member>
-        <member name="M:OpenMetaverse.Helpers.TERotationFloat(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.InventoryManager.RequestRezFromInventory(OpenMetaverse.Simulator,OpenMetaverse.Quaternion,OpenMetaverse.Vector3,OpenMetaverse.InventoryItem,OpenMetaverse.UUID)">
             <summary>
-            
+            Rez an object from inventory
             </summary>
-            <param name="bytes"></param>
-            <param name="pos"></param>
-            <returns></returns>
+            <param name="simulator">Simulator to place object in</param>
+            <param name="rotation">Rotation of the object when rezzed</param>
+            <param name="position">Vector of where to place object</param>
+            <param name="item">InventoryItem object containing item details</param>
+            <param name="groupOwner">UUID of group to own the object</param>
         </member>
-        <member name="M:OpenMetaverse.Helpers.GlobalPosToRegionHandle(System.Single,System.Single,System.Single@,System.Single@)">
+        <member name="M:OpenMetaverse.InventoryManager.RequestRezFromInventory(OpenMetaverse.Simulator,OpenMetaverse.Quaternion,OpenMetaverse.Vector3,OpenMetaverse.InventoryItem,OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean)">
             <summary>
-            Given an X/Y location in absolute (grid-relative) terms, a region
-            handle is returned along with the local X/Y location in that region
+            Rez an object from inventory
             </summary>
-            <param name="globalX">The absolute X location, a number such as 
-            255360.35</param>
-            <param name="globalY">The absolute Y location, a number such as
-            255360.35</param>
-            <param name="localX">The sim-local X position of the global X
-            position, a value from 0.0 to 256.0</param>
-            <param name="localY">The sim-local Y position of the global Y
-            position, a value from 0.0 to 256.0</param>
-            <returns>A 64-bit region handle that can be used to teleport to</returns>
+            <param name="simulator">Simulator to place object in</param>
+            <param name="rotation">Rotation of the object when rezzed</param>
+            <param name="position">Vector of where to place object</param>
+            <param name="item">InventoryItem object containing item details</param>
+            <param name="groupOwner">UUID of group to own the object</param>
+            <param name="queryID">User defined queryID to correlate replies</param>
+            <param name="rezSelected">If set to true, the CreateSelected flag
+            will be set on the rezzed object</param>
         </member>
-        <member name="M:OpenMetaverse.Helpers.FloatToTerseString(System.Single)">
+        <member name="M:OpenMetaverse.InventoryManager.RequestDeRezToInventory(System.UInt32)">
             <summary>
-            Converts a floating point number to a terse string format used for
-            transmitting numbers in wearable asset files
+            DeRez an object from the simulator to the agents Objects folder in the agents Inventory
             </summary>
-            <param name="val">Floating point number to convert to a string</param>
-            <returns>A terse string representation of the input number</returns>
+            <param name="objectLocalID">The simulator Local ID of the object</param>
+            <remarks>If objectLocalID is a child primitive in a linkset, the entire linkset will be derezzed</remarks>
         </member>
-        <member name="M:OpenMetaverse.Helpers.FieldToString(System.Text.StringBuilder,System.Byte[],System.String)">
+        <member name="M:OpenMetaverse.InventoryManager.RequestDeRezToInventory(System.UInt32,OpenMetaverse.DeRezDestination,OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Convert a variable length field (byte array) to a string, with a
-            field name prepended to each line of the output
+            DeRez an object from the simulator and return to inventory
             </summary>
-            <remarks>If the byte array has unprintable characters in it, a 
-            hex dump will be written instead</remarks>
-            <param name="output">The StringBuilder object to write to</param>
-            <param name="bytes">The byte array to convert to a string</param>
-            <param name="fieldName">A field name to prepend to each line of output</param>
+            <param name="objectLocalID">The simulator Local ID of the object</param>
+            <param name="destType">The type of destination from the <seealso cref="T:OpenMetaverse.DeRezDestination" /> enum</param>
+            <param name="destFolder">The destination inventory folders <seealso cref="T:OpenMetaverse.UUID" /> -or-
+            if DeRezzing object to a tasks Inventory, the Tasks <seealso cref="T:OpenMetaverse.UUID" /></param>
+            <param name="transactionID">The transaction ID for this request which
+            can be used to correlate this request with other packets</param>
+            <remarks>If objectLocalID is a child primitive in a linkset, the entire linkset will be derezzed</remarks>
         </member>
-        <member name="M:OpenMetaverse.Helpers.ZeroDecode(System.Byte[],System.Int32,System.Byte[])">
+        <member name="M:OpenMetaverse.InventoryManager.RequestRestoreRezFromInventory(OpenMetaverse.Simulator,OpenMetaverse.InventoryItem,OpenMetaverse.UUID)">
             <summary>
-            Decode a zerocoded byte array, used to decompress packets marked
-            with the zerocoded flag
+            Rez an item from inventory to its previous simulator location
             </summary>
-            <remarks>Any time a zero is encountered, the next byte is a count 
-            of how many zeroes to expand. One zero is encoded with 0x00 0x01, 
-            two zeroes is 0x00 0x02, three zeroes is 0x00 0x03, etc. The 
-            first four bytes are copied directly to the output buffer.
-            </remarks>
-            <param name="src">The byte array to decode</param>
-            <param name="srclen">The length of the byte array to decode. This 
-            would be the length of the packet up to (but not including) any
-            appended ACKs</param>
-            <param name="dest">The output byte array to decode to</param>
-            <returns>The length of the output buffer</returns>
+            <param name="simulator">
+            </param>
+            <param name="item">
+            </param>
+            <param name="queryID">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.Helpers.ZeroEncode(System.Byte[],System.Int32,System.Byte[])">
+        <member name="M:OpenMetaverse.InventoryManager.GiveItem(OpenMetaverse.UUID,System.String,OpenMetaverse.AssetType,OpenMetaverse.UUID,System.Boolean)">
             <summary>
-            Encode a byte array with zerocoding. Used to compress packets marked
-            with the zerocoded flag. Any zeroes in the array are compressed down
-            to a single zero byte followed by a count of how many zeroes to expand
-            out. A single zero becomes 0x00 0x01, two zeroes becomes 0x00 0x02,
-            three zeroes becomes 0x00 0x03, etc. The first four bytes are copied
-            directly to the output buffer.
+            Give an inventory item to another avatar
             </summary>
-            <param name="src">The byte array to encode</param>
-            <param name="srclen">The length of the byte array to encode</param>
-            <param name="dest">The output byte array to encode to</param>
-            <returns>The length of the output buffer</returns>
+            <param name="itemID">The <seealso cref="T:OpenMetaverse.UUID" /> of the item to give</param>
+            <param name="itemName">The name of the item</param>
+            <param name="assetType">The type of the item from the <seealso cref="T:OpenMetaverse.AssetType" /> enum</param>
+            <param name="recipient">The <seealso cref="T:OpenMetaverse.UUID" /> of the recipient</param>
+            <param name="doEffect">true to generate a beameffect during transfer</param>
         </member>
-        <member name="M:OpenMetaverse.Helpers.InventoryCRC(System.Int32,System.Byte,System.SByte,System.SByte,OpenMetaverse.UUID,OpenMetaverse.UUID,System.Int32,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,System.UInt32,System.UInt32,System.UInt32,System.UInt32,System.UInt32)">
+        <member name="M:OpenMetaverse.InventoryManager.GiveFolder(OpenMetaverse.UUID,System.String,OpenMetaverse.AssetType,OpenMetaverse.UUID,System.Boolean)">
             <summary>
-            Calculates the CRC (cyclic redundancy check) needed to upload inventory.
+            Give an inventory Folder with contents to another avatar
             </summary>
-            <param name="creationDate">Creation date</param>
-            <param name="saleType">Sale type</param>
-            <param name="invType">Inventory type</param>
-            <param name="type">Type</param>
-            <param name="assetID">Asset ID</param>
-            <param name="groupID">Group ID</param>
-            <param name="salePrice">Sale price</param>
-            <param name="ownerID">Owner ID</param>
-            <param name="creatorID">Creator ID</param>
-            <param name="itemID">Item ID</param>
-            <param name="folderID">Folder ID</param>
-            <param name="everyoneMask">Everyone mask (permissions)</param>
-            <param name="flags">Flags</param>
-            <param name="nextOwnerMask">Next owner mask (permissions)</param>
-            <param name="groupMask">Group mask (permissions)</param>
-            <param name="ownerMask">Owner mask (permissions)</param>
-            <returns>The calculated CRC</returns>
+            <param name="folderID">The <seealso cref="T:OpenMetaverse.UUID" /> of the Folder to give</param>
+            <param name="folderName">The name of the folder</param>
+            <param name="assetType">The type of the item from the <seealso cref="T:OpenMetaverse.AssetType" /> enum</param>
+            <param name="recipient">The <seealso cref="T:OpenMetaverse.UUID" /> of the recipient</param>
+            <param name="doEffect">true to generate a beameffect during transfer</param>
         </member>
-        <member name="M:OpenMetaverse.Helpers.GetResourceStream(System.String)">
+        <member name="M:OpenMetaverse.InventoryManager.UpdateTaskInventory(System.UInt32,OpenMetaverse.InventoryItem)">
             <summary>
-            Attempts to load a file embedded in the assembly
+            Copy or move an <see cref="T:OpenMetaverse.InventoryItem" /> from agent inventory to a task (primitive) inventory
             </summary>
-            <param name="resourceName">The filename of the resource to load</param>
-            <returns>A Stream for the requested file, or null if the resource
-            was not successfully loaded</returns>
+            <param name="objectLocalID">The target object</param>
+            <param name="item">The item to copy or move from inventory</param>
+            <returns>
+            </returns>
+            <remarks>For items with copy permissions a copy of the item is placed in the tasks inventory,
+            for no-copy items the object is moved to the tasks inventory</remarks>
         </member>
-        <member name="M:OpenMetaverse.Helpers.GetResourceStream(System.String,System.String)">
+        <member name="M:OpenMetaverse.InventoryManager.GetTaskInventory(OpenMetaverse.UUID,System.UInt32,System.Int32)">
             <summary>
-            Attempts to load a file either embedded in the assembly or found in
-            a given search path
+            Retrieve a listing of the items contained in a task (Primitive)
             </summary>
-            <param name="resourceName">The filename of the resource to load</param>
-            <param name="searchPath">An optional path that will be searched if
-            the asset is not found embedded in the assembly</param>
-            <returns>A Stream for the requested file, or null if the resource
-            was not successfully loaded</returns>
+            <param name="objectID">The tasks <seealso cref="T:OpenMetaverse.UUID" /></param>
+            <param name="objectLocalID">The tasks simulator local ID</param>
+            <param name="timeoutMS">milliseconds to wait for reply from simulator</param>
+            <returns>A list containing the inventory items inside the task or null
+            if a timeout occurs</returns>
+            <remarks>This request blocks until the response from the simulator arrives
+            or timeoutMS is exceeded</remarks>
         </member>
-        <member name="M:OpenMetaverse.Helpers.PrimListToOSD(System.Collections.Generic.List{OpenMetaverse.Primitive})">
+        <member name="M:OpenMetaverse.InventoryManager.RequestTaskInventory(System.UInt32)">
             <summary>
-            Converts a list of primitives to an object that can be serialized
-            with the LLSD system
+            Request the contents of a tasks (primitives) inventory from the
+            current simulator
             </summary>
-            <param name="prims">Primitives to convert to a serializable object</param>
-            <returns>An object that can be serialized with LLSD</returns>
+            <param name="objectLocalID">The LocalID of the object</param>
+            <seealso cref="E:OpenMetaverse.InventoryManager.TaskInventoryReply" />
         </member>
-        <member name="M:OpenMetaverse.Helpers.OSDToPrimList(OpenMetaverse.StructuredData.OSD)">
+        <member name="M:OpenMetaverse.InventoryManager.RequestTaskInventory(System.UInt32,OpenMetaverse.Simulator)">
             <summary>
-            Deserializes OSD in to a list of primitives
+            Request the contents of a tasks (primitives) inventory
             </summary>
-            <param name="osd">Structure holding the serialized primitive list,
-            must be of the SDMap type</param>
-            <returns>A list of deserialized primitives</returns>
-        </member>
-        <member name="M:OpenMetaverse.Helpers.StructToString(System.Object)">
-             <summary>
-             Converts a struct or class object containing fields only into a key value separated string
-             </summary>
-             <param name="t">The struct object</param>
-             <returns>A string containing the struct fields as the keys, and the field value as the value separated</returns>
-             <example>
-             <code>
-             // Add the following code to any struct or class containing only fields to override the ToString() 
-             // method to display the values of the passed object
-             
-             /// <summary>Print the struct data as a string</summary>
-             ///<returns>A string containing the field name, and field value</returns>
-            public override string ToString()
-            {
-                return Helpers.StructToString(this);
-            }
-             </code>
-             </example>
+            <param name="objectLocalID">The simulator Local ID of the object</param>
+            <param name="simulator">A reference to the simulator object that contains the object</param>
+            <seealso cref="E:OpenMetaverse.InventoryManager.TaskInventoryReply" />
         </member>
-        <member name="T:OpenMetaverse.Helpers.LogLevel">
+        <member name="M:OpenMetaverse.InventoryManager.MoveTaskInventory(System.UInt32,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.Simulator)">
             <summary>
-            Passed to Logger.Log() to identify the severity of a log entry
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Helpers.LogLevel.None">
-            <summary>No logging information will be output</summary>
-        </member>
-        <member name="F:OpenMetaverse.Helpers.LogLevel.Info">
-            <summary>Non-noisy useful information, may be helpful in 
-            debugging a problem</summary>
-        </member>
-        <member name="F:OpenMetaverse.Helpers.LogLevel.Warning">
-            <summary>A non-critical error occurred. A warning will not 
-            prevent the rest of the library from operating as usual, 
-            although it may be indicative of an underlying issue</summary>
-        </member>
-        <member name="F:OpenMetaverse.Helpers.LogLevel.Error">
-            <summary>A critical error has occurred. Generally this will 
-            be followed by the network layer shutting down, although the 
-            stability of the library after an error is uncertain</summary>
-        </member>
-        <member name="F:OpenMetaverse.Helpers.LogLevel.Debug">
-            <summary>Used for internal testing, this logging level can 
-            generate very noisy (long and/or repetitive) messages. Don't
-            pass this to the Log() function, use DebugLog() instead.
+            Move an item from a tasks (Primitive) inventory to the specified folder in the avatars inventory
             </summary>
+            <param name="objectLocalID">LocalID of the object in the simulator</param>
+            <param name="taskItemID">UUID of the task item to move</param>
+            <param name="inventoryFolderID">The ID of the destination folder in this agents inventory</param>
+            <param name="simulator">Simulator Object</param>
+            <remarks>Raises the <see cref="M:OpenMetaverse.InventoryManager.OnTaskItemReceived(OpenMetaverse.TaskItemReceivedEventArgs)" /> event</remarks>
         </member>
-        <member name="T:OpenMetaverse.Imaging.Baker">
+        <member name="M:OpenMetaverse.InventoryManager.RemoveTaskInventory(System.UInt32,OpenMetaverse.UUID,OpenMetaverse.Simulator)">
             <summary>
-            A set of textures that are layered on texture of each other and "baked"
-            in to a single texture, for avatar appearances
+            Remove an item from an objects (Prim) Inventory
             </summary>
+            <param name="objectLocalID">LocalID of the object in the simulator</param>
+            <param name="taskItemID">UUID of the task item to remove</param>
+            <param name="simulator">Simulator Object</param>
+            <remarks>You can confirm the removal by comparing the tasks inventory serial before and after the
+            request with the <see cref="M:OpenMetaverse.InventoryManager.RequestTaskInventory(System.UInt32,OpenMetaverse.Simulator)" /> request combined with
+            the <seealso cref="E:OpenMetaverse.InventoryManager.TaskInventoryReply" /> event</remarks>
         </member>
-        <member name="F:OpenMetaverse.Imaging.Baker.bakedTexture">
-            <summary>Final baked texture</summary>
-        </member>
-        <member name="F:OpenMetaverse.Imaging.Baker.textures">
-            <summary>Component layers</summary>
-        </member>
-        <member name="F:OpenMetaverse.Imaging.Baker.bakeWidth">
-            <summary>Width of the final baked image and scratchpad</summary>
-        </member>
-        <member name="F:OpenMetaverse.Imaging.Baker.bakeHeight">
-            <summary>Height of the final baked image and scratchpad</summary>
-        </member>
-        <member name="F:OpenMetaverse.Imaging.Baker.bakeType">
-            <summary>Bake type</summary>
-        </member>
-        <member name="M:OpenMetaverse.Imaging.Baker.#ctor(OpenMetaverse.BakeType)">
+        <member name="M:OpenMetaverse.InventoryManager.CopyScriptToTask(System.UInt32,OpenMetaverse.InventoryItem,System.Boolean)">
             <summary>
-            Default constructor
+            Copy an InventoryScript item from the Agents Inventory into a primitives task inventory
             </summary>
-            <param name="bakeType">Bake type</param>
+            <param name="objectLocalID">An unsigned integer representing a primitive being simulated</param>
+            <param name="item">An <seealso cref="T:OpenMetaverse.InventoryItem" /> which represents a script object from the agents inventory</param>
+            <param name="enableScript">true to set the scripts running state to enabled</param>
+            <returns>A Unique Transaction ID</returns>
+            <example>
+            The following example shows the basic steps necessary to copy a script from the agents inventory into a tasks inventory
+            and assumes the script exists in the agents inventory.
+            <code>
+            uint primID = 95899503; // Fake prim ID
+            UUID scriptID = UUID.Parse("92a7fe8a-e949-dd39-a8d8-1681d8673232"); // Fake Script UUID in Inventory
+            Client.Inventory.FolderContents(Client.Inventory.FindFolderForType(AssetType.LSLText), Client.Self.AgentID,
+            false, true, InventorySortOrder.ByName, 10000);
+            Client.Inventory.RezScript(primID, (InventoryItem)Client.Inventory.Store[scriptID]);
+            </code></example>
         </member>
-        <member name="M:OpenMetaverse.Imaging.Baker.AddTexture(OpenMetaverse.AppearanceManager.TextureData)">
+        <member name="M:OpenMetaverse.InventoryManager.RequestGetScriptRunning(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Adds layer for baking
+            Request the running status of a script contained in a task (primitive) inventory
             </summary>
-            <param name="tdata">TexturaData struct that contains texture and its params</param>
+            <param name="objectID">The ID of the primitive containing the script</param>
+            <param name="scriptID">The ID of the script</param>
+            <remarks>The <see cref="E:OpenMetaverse.InventoryManager.ScriptRunningReply" /> event can be used to obtain the results of the
+            request</remarks>
+            <seealso cref="E:OpenMetaverse.InventoryManager.ScriptRunningReply" />
         </member>
-        <member name="M:OpenMetaverse.Imaging.Baker.BakeTypeFor(OpenMetaverse.AvatarTextureIndex)">
+        <member name="M:OpenMetaverse.InventoryManager.RequestSetScriptRunning(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean)">
             <summary>
-            Converts avatar texture index (face) to Bake type
+            Send a request to set the running state of a script contained in a task (primitive) inventory
             </summary>
-            <param name="index">Face number (AvatarTextureIndex)</param>
-            <returns>BakeType, layer to which this texture belongs to</returns>
+            <param name="objectID">The ID of the primitive containing the script</param>
+            <param name="scriptID">The ID of the script</param>
+            <param name="running">true to set the script running, false to stop a running script</param>
+            <remarks>To verify the change you can use the <see cref="M:OpenMetaverse.InventoryManager.RequestGetScriptRunning(OpenMetaverse.UUID,OpenMetaverse.UUID)" /> method combined
+            with the <see cref="E:OpenMetaverse.InventoryManager.ScriptRunningReply" /> event</remarks>
         </member>
-        <member name="M:OpenMetaverse.Imaging.Baker.SanitizeLayers(OpenMetaverse.Imaging.ManagedImage,OpenMetaverse.Imaging.ManagedImage)">
+        <member name="M:OpenMetaverse.InventoryManager.ItemCRC(OpenMetaverse.InventoryItem)">
             <summary>
-            Make sure images exist, resize source if needed to match the destination
+            Create a CRC from an InventoryItem
             </summary>
-            <param name="dest">Destination image</param>
-            <param name="src">Source image</param>
-            <returns>Sanitization was succefull</returns>
+            <param name="iitem">The source InventoryItem</param>
+            <returns>A uint representing the source InventoryItem as a CRC</returns>
         </member>
-        <member name="M:OpenMetaverse.Imaging.Baker.InitBakedLayerColor(OpenMetaverse.Color4)">
+        <member name="M:OpenMetaverse.InventoryManager.DecryptShadowID(OpenMetaverse.UUID)">
             <summary>
-            Fills a baked layer as a solid *appearing* color. The colors are 
-            subtly dithered on a 16x16 grid to prevent the JPEG2000 stage from 
-            compressing it too far since it seems to cause upload failures if 
-            the image is a pure solid color
+            Reverses a cheesy XORing with a fixed UUID to convert a shadow_id to an asset_id
             </summary>
-            <param name="color">Color of the base of this layer</param>
+            <param name="shadowID">Obfuscated shadow_id value</param>
+            <returns>Deobfuscated asset_id value</returns>
         </member>
-        <member name="M:OpenMetaverse.Imaging.Baker.InitBakedLayerColor(System.Single,System.Single,System.Single)">
+        <member name="M:OpenMetaverse.InventoryManager.EncryptAssetID(OpenMetaverse.UUID)">
             <summary>
-            Fills a baked layer as a solid *appearing* color. The colors are 
-            subtly dithered on a 16x16 grid to prevent the JPEG2000 stage from 
-            compressing it too far since it seems to cause upload failures if 
-            the image is a pure solid color
+            Does a cheesy XORing with a fixed UUID to convert an asset_id to a shadow_id
             </summary>
-            <param name="r">Red value</param>
-            <param name="g">Green value</param>
-            <param name="b">Blue value</param>
-        </member>
-        <member name="P:OpenMetaverse.Imaging.Baker.BakedTexture">
-            <summary>Final baked texture</summary>
-        </member>
-        <member name="P:OpenMetaverse.Imaging.Baker.Textures">
-            <summary>Component layers</summary>
-        </member>
-        <member name="P:OpenMetaverse.Imaging.Baker.BakeWidth">
-            <summary>Width of the final baked image and scratchpad</summary>
-        </member>
-        <member name="P:OpenMetaverse.Imaging.Baker.BakeHeight">
-            <summary>Height of the final baked image and scratchpad</summary>
-        </member>
-        <member name="P:OpenMetaverse.Imaging.Baker.BakeType">
-            <summary>Bake type</summary>
-        </member>
-        <member name="P:OpenMetaverse.Imaging.Baker.IsSkin">
-            <summary>Is this one of the 3 skin bakes</summary>
+            <param name="assetID">asset_id value to obfuscate</param>
+            <returns>Obfuscated shadow_id value</returns>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetAnimation">
+        <member name="M:OpenMetaverse.InventoryManager.CreateInventoryItem(OpenMetaverse.InventoryType,OpenMetaverse.UUID)">
             <summary>
-            Represents an Animation
+            Wrapper for creating a new <seealso cref="T:OpenMetaverse.InventoryItem" /> object
             </summary>
+            <param name="type">The type of item from the <seealso cref="T:OpenMetaverse.InventoryType" /> enum</param>
+            <param name="id">The <seealso cref="T:OpenMetaverse.UUID" /> of the newly created object</param>
+            <returns>An <seealso cref="T:OpenMetaverse.InventoryItem" /> object with the type and id passed</returns>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetAnimation.#ctor">
-            <summary>Default Constructor</summary>
-        </member>
-        <member name="M:OpenMetaverse.Assets.AssetAnimation.#ctor(OpenMetaverse.UUID,System.Byte[])">
+        <member name="M:OpenMetaverse.InventoryManager.ParseTaskInventory(System.String)">
             <summary>
-            Construct an Asset object of type Animation
+            Parse the results of a RequestTaskInventory() response
             </summary>
-            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
-            <param name="assetData">A byte array containing the raw asset data</param>
+            <param name="taskData">A string which contains the data from the task reply</param>
+            <returns>A List containing the items contained within the tasks inventory</returns>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetAnimation.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="M:OpenMetaverse.InventoryManager.SaveAssetIntoInventoryHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="T:OpenMetaverse.AvatarTextureIndex">
-            <summary>
-            Index of TextureEntry slots for avatar appearances
-            </summary>
+        <member name="M:OpenMetaverse.InventoryManager.InventoryDescendentsHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="T:OpenMetaverse.BakeType">
+        <member name="M:OpenMetaverse.InventoryManager.UpdateCreateInventoryItemHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>
-            Bake layers for avatar appearance
+            UpdateCreateInventoryItem packets are received when a new inventory item
+            is created. This may occur when an object that's rezzed in world is
+            taken into inventory, when an item is created using the CreateInventoryItem
+            packet, or when an object is purchased
             </summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.MAX_CONCURRENT_DOWNLOADS">
-            <summary>Maximum number of concurrent downloads for wearable assets and textures</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.MAX_CONCURRENT_UPLOADS">
-            <summary>Maximum number of concurrent uploads for baked textures</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.INVENTORY_TIMEOUT">
-            <summary>Timeout for fetching inventory listings</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WEARABLE_TIMEOUT">
-            <summary>Timeout for fetching a single wearable, or receiving a single packet response</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.TEXTURE_TIMEOUT">
-            <summary>Timeout for fetching a single texture</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.UPLOAD_TIMEOUT">
-            <summary>Timeout for uploading a single baked texture</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.UPLOAD_RETRIES">
-            <summary>Number of times to retry bake upload</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.REBAKE_DELAY">
-            <summary>When changing outfit, kick off rebake after
-            20 seconds has passed since the last change</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WEARABLE_COUNT">
-            <summary>Total number of wearables for each avatar</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.BAKED_TEXTURE_COUNT">
-            <summary>Total number of baked textures on each avatar</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WEARABLES_PER_LAYER">
-            <summary>Total number of wearables per bake layer</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.BakeIndexToTextureIndex">
-            <summary>Mapping between BakeType and AvatarTextureIndex</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WEARABLE_BAKE_MAP">
-            <summary>Map of what wearables are included in each bake</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.BAKED_TEXTURE_HASH">
-            <summary>Magic values to finalize the cache check hashes for each
-            bake</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.DEFAULT_AVATAR_TEXTURE">
-            <summary>Default avatar texture, used to detect when a custom
-            texture is not set for a face</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_AgentWearablesReply">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.AppearanceManager.OnAgentWearables(OpenMetaverse.AgentWearablesReplyEventArgs)">
-            <summary>Raises the AgentWearablesReply event</summary>
-            <param name="e">An AgentWearablesReplyEventArgs object containing the
-            data returned from the data server</param>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_AgentWearablesLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_AgentCachedBakesReply">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.AppearanceManager.OnAgentCachedBakes(OpenMetaverse.AgentCachedBakesReplyEventArgs)">
-            <summary>Raises the CachedBakesReply event</summary>
-            <param name="e">An AgentCachedBakesReplyEventArgs object containing the
-            data returned from the data server AgentCachedTextureResponse</param>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_AgentCachedBakesLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_AppearanceSet">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.AppearanceManager.OnAppearanceSet(OpenMetaverse.AppearanceSetEventArgs)">
-            <summary>Raises the AppearanceSet event</summary>
-            <param name="e">An AppearanceSetEventArgs object indicating if the operatin was successfull</param>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_AppearanceSetLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_RebakeAvatarReply">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.AppearanceManager.OnRebakeAvatar(OpenMetaverse.RebakeAvatarTexturesEventArgs)">
-            <summary>Raises the RebakeAvatarRequested event</summary>
-            <param name="e">An RebakeAvatarTexturesEventArgs object containing the
-            data returned from the data server</param>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_RebakeAvatarLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.Wearables">
-            <summary>A cache of wearables currently being worn</summary>
+        <member name="M:OpenMetaverse.InventoryManager.MoveInventoryItemHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.Textures">
-            <summary>A cache of textures currently being worn</summary>
+        <member name="M:OpenMetaverse.InventoryManager.BulkUpdateInventoryHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.CacheCheckSerialNum">
-            <summary>Incrementing serial number for AgentCachedTexture packets</summary>
+        <member name="M:OpenMetaverse.InventoryManager.FetchInventoryReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.SetAppearanceSerialNum">
-            <summary>Incrementing serial number for AgentSetAppearance packets</summary>
+        <member name="M:OpenMetaverse.InventoryManager.ReplyTaskInventoryHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.AppearanceThreadRunning">
-            <summary>Indicates whether or not the appearance thread is currently
-            running, to prevent multiple appearance threads from running
-            simultaneously</summary>
+        <member name="P:OpenMetaverse.InventoryObjectOfferedEventArgs.Accept">
+            <summary>Set to true to accept offer, false to decline it</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.Client">
-            <summary>Reference to our agent</summary>
+        <member name="P:OpenMetaverse.InventoryObjectOfferedEventArgs.FolderID">
+            <summary>The folder to accept the inventory into, if null default folder for <see cref="T:OpenMetaverse.AssetType" /> will be used</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.RebakeScheduleTimer">
+        <member name="T:OpenMetaverse.TaskItemReceivedEventArgs">
             <summary>
-            Timer used for delaying rebake on changing outfit
+            Callback when an inventory object is accepted and received from a
+            task inventory. This is the callback in which you actually get
+            the ItemID, as in ObjectOfferedCallback it is null when received
+            from a task.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.AppearanceThread">
+        <member name="M:OpenMetaverse.InventoryNode.#ctor">
             <summary>
-            Main appearance thread
             </summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="M:OpenMetaverse.InventoryNode.#ctor(OpenMetaverse.InventoryBase)">
             <summary>
-            Default constructor
             </summary>
-            <param name="client">A reference to our agent</param>
+            <param name="data">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.SetPreviousAppearance">
+        <member name="M:OpenMetaverse.InventoryNode.#ctor(OpenMetaverse.InventoryBase,OpenMetaverse.InventoryNode)">
             <summary>
-            Obsolete method for setting appearance. This function no longer does anything.
-            Use RequestSetAppearance() to manually start the appearance thread
+            De-serialization constructor for the InventoryNode Class
             </summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.SetPreviousAppearance(System.Boolean)">
+        <member name="M:OpenMetaverse.InventoryNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            Obsolete method for setting appearance. This function no longer does anything.
-            Use RequestSetAppearance() to manually start the appearance thread
+            De-serialization handler for the InventoryNode Class
             </summary>
-            <param name="allowBake">Unused parameter</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.RequestSetAppearance">
+        <member name="P:OpenMetaverse.InventoryNode.Data">
             <summary>
-            Starts the appearance setting thread
             </summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.RequestSetAppearance(System.Boolean)">
+        <member name="P:OpenMetaverse.InventoryNode.Parent">
             <summary>
-            Starts the appearance setting thread
             </summary>
-            <param name="forceRebake">True to force rebaking, otherwise false</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.RequestAgentWearables">
+        <member name="P:OpenMetaverse.InventoryNode.ParentID">
             <summary>
-            Ask the server what textures our agent is currently wearing
             </summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.RequestCachedBakes">
+        <member name="P:OpenMetaverse.InventoryNode.Nodes">
             <summary>
-            Build hashes out of the texture assetIDs for each baking layer to
-            ask the simulator whether it has cached copies of each baked texture
             </summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.GetWearableAsset(OpenMetaverse.WearableType)">
+        <member name="P:OpenMetaverse.InventoryNode.NeedsUpdate">
             <summary>
-            Returns the AssetID of the asset that is currently being worn in a 
-            given WearableType slot
+            For inventory folder nodes specifies weather the folder needs to be
+            refreshed from the server
             </summary>
-            <param name="type">WearableType slot to get the AssetID for</param>
-            <returns>The UUID of the asset being worn in the given slot, or
-            UUID.Zero if no wearable is attached to the given slot or wearables
-            have not been downloaded yet</returns>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.AddToOutfit(OpenMetaverse.InventoryItem)">
+        <member name="M:OpenMetaverse.InventoryNode.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            Add a wearable to the current outfit and set appearance
+            Serialization handler for the InventoryNode Class
             </summary>
-            <param name="wearableItem">Wearable to be added to the outfit</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.AddToOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryItem})">
+        <member name="M:OpenMetaverse.InventoryNode.ToString">
             <summary>
-            Add a list of wearables to the current outfit and set appearance
             </summary>
-            <param name="wearableItems">List of wearable inventory items to
-            be added to the outfit</param>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.RemoveFromOutfit(OpenMetaverse.InventoryItem)">
+        <member name="T:OpenMetaverse.Logger">
             <summary>
-            Remove a wearable from the current outfit and set appearance
+            Singleton logging class for the entire library
             </summary>
-            <param name="wearableItem">Wearable to be removed from the outfit</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.RemoveFromOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryItem})">
+        <member name="M:OpenMetaverse.Logger.#ctor">
             <summary>
-            Removes a list of wearables from the current outfit and set appearance
+            Default constructor
             </summary>
-            <param name="wearableItems">List of wearable inventory items to
-            be removed from the outfit</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.ReplaceOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryItem})">
+        <member name="T:OpenMetaverse.Logger.LogCallback">
             <summary>
-            Replace the current outfit with a list of wearables and set appearance
+            Callback used for client apps to receive log messages from
+            the library
             </summary>
-            <param name="wearableItems">List of wearable inventory items that
-            define a new outfit</param>
+            <param name="message">Data being logged</param>
+            <param name="level">The severity of the log entry from <seealso cref="T:OpenMetaverse.Helpers.LogLevel" /></param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.IsItemWorn(OpenMetaverse.InventoryItem)">
-            <summary>
-            Checks if an inventory item is currently being worn
-            </summary>
-            <param name="item">The inventory item to check against the agent
-            wearables</param>
-            <returns>The WearableType slot that the item is being worn in,
-            or WearbleType.Invalid if it is not currently being worn</returns>
+        <member name="F:OpenMetaverse.Logger.LogInstance">
+            <summary>log4net logging engine</summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.GetWearables">
-            <summary>
-            Returns a copy of the agents currently worn wearables
-            </summary>
-            <returns>A copy of the agents currently worn wearables</returns>
-            <remarks>Avoid calling this function multiple times as it will make
-            a copy of all of the wearable data each time</remarks>
+        <member name="E:OpenMetaverse.Logger.OnLogMessage">
+            <summary>Triggered whenever a message is logged. If this is left
+            null, log messages will go to the console</summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.WearOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryBase},System.Boolean)">
+        <member name="M:OpenMetaverse.Logger.Log(System.Object,OpenMetaverse.Helpers.LogLevel)">
             <summary>
-            Calls either <seealso cref="M:OpenMetaverse.AppearanceManager.ReplaceOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryItem})"/> or
-            <seealso cref="M:OpenMetaverse.AppearanceManager.AddToOutfit(OpenMetaverse.InventoryItem)"/> depending on the value of
-            replaceItems
+            Send a log message to the logging engine
             </summary>
-            <param name="wearables">List of wearable inventory items to add
-            to the outfit or become a new outfit</param>
-            <param name="replaceItems">True to replace existing items with the
-            new list of items, false to add these items to the existing outfit</param>
+            <param name="message">The log message</param>
+            <param name="level">The severity of the log entry</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.AddAttachments(System.Collections.Generic.List{OpenMetaverse.InventoryItem},System.Boolean)">
+        <member name="M:OpenMetaverse.Logger.Log(System.Object,OpenMetaverse.Helpers.LogLevel,OpenMetaverse.GridClient)">
             <summary>
-            Adds a list of attachments to our agent
+            Send a log message to the logging engine
             </summary>
-            <param name="attachments">A List containing the attachments to add</param>
-            <param name="removeExistingFirst">If true, tells simulator to remove existing attachment
-            first</param>
+            <param name="message">The log message</param>
+            <param name="level">The severity of the log entry</param>
+            <param name="client">Instance of the client</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.Attach(OpenMetaverse.InventoryItem,OpenMetaverse.AttachmentPoint)">
+        <member name="M:OpenMetaverse.Logger.Log(System.Object,OpenMetaverse.Helpers.LogLevel,System.Exception)">
             <summary>
-            Attach an item to our agent at a specific attach point
+            Send a log message to the logging engine
             </summary>
-            <param name="item">A <seealso cref="T:OpenMetaverse.InventoryItem"/> to attach</param>
-            <param name="attachPoint">the <seealso cref="T:OpenMetaverse.AttachmentPoint"/> on the avatar 
-            to attach the item to</param>
+            <param name="message">The log message</param>
+            <param name="level">The severity of the log entry</param>
+            <param name="exception">Exception that was raised</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.Attach(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.Permissions,System.UInt32,OpenMetaverse.AttachmentPoint)">
+        <member name="M:OpenMetaverse.Logger.Log(System.Object,OpenMetaverse.Helpers.LogLevel,OpenMetaverse.GridClient,System.Exception)">
             <summary>
-            Attach an item to our agent specifying attachment details
+            Send a log message to the logging engine
             </summary>
-            <param name="itemID">The <seealso cref="T:OpenMetaverse.UUID"/> of the item to attach</param>
-            <param name="ownerID">The <seealso cref="T:OpenMetaverse.UUID"/> attachments owner</param>
-            <param name="name">The name of the attachment</param>
-            <param name="description">The description of the attahment</param>
-            <param name="perms">The <seealso cref="T:OpenMetaverse.Permissions"/> to apply when attached</param>
-            <param name="itemFlags">The <seealso cref="T:OpenMetaverse.InventoryItemFlags"/> of the attachment</param>
-            <param name="attachPoint">The <seealso cref="T:OpenMetaverse.AttachmentPoint"/> on the agent
-            to attach the item to</param>
+            <param name="message">The log message</param>
+            <param name="level">The severity of the log entry</param>
+            <param name="client">Instance of the client</param>
+            <param name="exception">Exception that was raised</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.Detach(OpenMetaverse.InventoryItem)">
+        <member name="M:OpenMetaverse.Logger.DebugLog(System.Object)">
             <summary>
-            Detach an item from our agent using an <seealso cref="T:OpenMetaverse.InventoryItem"/> object
+            If the library is compiled with DEBUG defined, an event will be
+            fired if an <code>OnLogMessage</code> handler is registered and the
+            message will be sent to the logging engine
             </summary>
-            <param name="item">An <seealso cref="T:OpenMetaverse.InventoryItem"/> object</param>
+            <param name="message">The message to log at the DEBUG level to the
+            current logging engine</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.Detach(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Logger.DebugLog(System.Object,OpenMetaverse.GridClient)">
             <summary>
-            Detach an item from our agent
+            If the library is compiled with DEBUG defined and
+            <code>GridClient.Settings.DEBUG</code> is true, an event will be
+            fired if an <code>OnLogMessage</code> handler is registered and the
+            message will be sent to the logging engine
             </summary>
-            <param name="itemID">The inventory itemID of the item to detach</param>
+            <param name="message">The message to log at the DEBUG level to the
+            current logging engine</param>
+            <param name="client">Instance of the client</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.SendAgentIsNowWearing">
+        <member name="T:OpenMetaverse.LoginStatus">
             <summary>
-            Inform the sim which wearables are part of our current outfit
             </summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.ReplaceOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryWearable})">
+        <member name="F:OpenMetaverse.LoginStatus.Failed">
             <summary>
-            Replaces the Wearables collection with a list of new wearable items
             </summary>
-            <param name="wearableItems">Wearable items to replace the Wearables collection with</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.GetColorFromParams(System.Collections.Generic.List{OpenMetaverse.AppearanceManager.ColorParamInfo})">
+        <member name="F:OpenMetaverse.LoginStatus.None">
             <summary>
-            Calculates base color/tint for a specific wearable
-            based on its params
             </summary>
-            <param name="param">All the color info gathered from wearable's VisualParams
-            passed as list of ColorParamInfo tuples</param>
-            <returns>Base color/tint for the wearable</returns>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.GetAgentWearables">
+        <member name="F:OpenMetaverse.LoginStatus.ConnectingToLogin">
             <summary>
-            Blocking method to populate the Wearables dictionary
             </summary>
-            <returns>True on success, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.GetCachedBakes">
+        <member name="F:OpenMetaverse.LoginStatus.ReadingResponse">
             <summary>
-            Blocking method to populate the Textures array with cached bakes
             </summary>
-            <returns>True on success, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.DecodeWearableParams(OpenMetaverse.AppearanceManager.WearableData)">
+        <member name="F:OpenMetaverse.LoginStatus.ConnectingToSim">
             <summary>
-            Populates textures and visual params from a decoded asset
             </summary>
-            <param name="wearable">Wearable to decode</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.DownloadWearables">
+        <member name="F:OpenMetaverse.LoginStatus.Redirecting">
             <summary>
-            Blocking method to download and parse currently worn wearable assets
             </summary>
-            <returns>True on success, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.GetTextureDownloadList(OpenMetaverse.BakeType)">
+        <member name="F:OpenMetaverse.LoginStatus.Success">
             <summary>
-            Get a list of all of the textures that need to be downloaded for a
-            single bake layer
             </summary>
-            <param name="bakeType">Bake layer to get texture AssetIDs for</param>
-            <returns>A list of texture AssetIDs to download</returns>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.AddTextureDownload(OpenMetaverse.AvatarTextureIndex,System.Collections.Generic.List{OpenMetaverse.UUID})">
+        <member name="T:OpenMetaverse.LoginParams">
             <summary>
-            Helper method to lookup the TextureID for a single layer and add it
-            to a list if it is not already present
+            Login Request Parameters
             </summary>
-            <param name="index"></param>
-            <param name="textures"></param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.DownloadTextures(System.Collections.Generic.List{OpenMetaverse.BakeType})">
+        <member name="M:OpenMetaverse.LoginParams.#ctor">
             <summary>
-            Blocking method to download all of the textures needed for baking 
-            the given bake layers
+            Default constuctor, initializes sane default values
             </summary>
-            <param name="bakeLayers">A list of layers that need baking</param>
-            <remarks>No return value is given because the baking will happen
-            whether or not all textures are successfully downloaded</remarks>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.CreateBakes">
+        <member name="M:OpenMetaverse.LoginParams.#ctor(OpenMetaverse.GridClient,System.String,System.String,System.String,System.String,System.String)">
             <summary>
-            Blocking method to create and upload baked textures for all of the
-            missing bakes
+            Instantiates new LoginParams object and fills in the values
             </summary>
-            <returns>True on success, otherwise false</returns>
+            <param name="client">Instance of GridClient to read settings from</param>
+            <param name="firstName">Login first name</param>
+            <param name="lastName">Login last name</param>
+            <param name="password">Password</param>
+            <param name="channel">Login channnel (application name)</param>
+            <param name="version">Client version, should be application name + version number</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.CreateBake(OpenMetaverse.BakeType)">
+        <member name="M:OpenMetaverse.LoginParams.#ctor(OpenMetaverse.GridClient,System.String,System.String,System.String,System.String,System.String,System.String)">
             <summary>
-            Blocking method to create and upload a baked texture for a single 
-            bake layer
+            Instantiates new LoginParams object and fills in the values
             </summary>
-            <param name="bakeType">Layer to bake</param>
-            <returns>True on success, otherwise false</returns>
+            <param name="client">Instance of GridClient to read settings from</param>
+            <param name="firstName">Login first name</param>
+            <param name="lastName">Login last name</param>
+            <param name="password">Password</param>
+            <param name="channel">Login channnel (application name)</param>
+            <param name="version">Client version, should be application name + version number</param>
+            <param name="loginURI">URI of the login server</param>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.UploadBake(System.Byte[])">
-            <summary>
-            Blocking method to upload a baked texture
-            </summary>
-            <param name="textureData">Five channel JPEG2000 texture data to upload</param>
-            <returns>UUID of the newly created asset on success, otherwise UUID.Zero</returns>
+        <member name="F:OpenMetaverse.LoginParams.URI">
+            <summary>The URL of the Login Server</summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.MakeParamValues">
-            <summary>
-            Creates a dictionary of visual param values from the downloaded wearables
-            </summary>
-            <returns>A dictionary of visual param indices mapping to visual param
-            values for our agent that can be fed to the Baker class</returns>
+        <member name="F:OpenMetaverse.LoginParams.Timeout">
+            <summary>The number of milliseconds to wait before a login is considered
+            failed due to timeout</summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.RequestAgentSetAppearance">
-            <summary>
-            Create an AgentSetAppearance packet from Wearables data and the 
-            Textures array and send it
-            </summary>
+        <member name="F:OpenMetaverse.LoginParams.MethodName">
+            <summary>The request method</summary>
+            <remarks>login_to_simulator is currently the only supported method</remarks>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.WearableTypeToAssetType(OpenMetaverse.WearableType)">
-            <summary>
-            Converts a WearableType to a bodypart or clothing WearableType
-            </summary>
-            <param name="type">A WearableType</param>
-            <returns>AssetType.Bodypart or AssetType.Clothing or AssetType.Unknown</returns>
+        <member name="F:OpenMetaverse.LoginParams.FirstName">
+            <summary>The Agents First name</summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.BakeTypeToAgentTextureIndex(OpenMetaverse.BakeType)">
-            <summary>
-            Converts a BakeType to the corresponding baked texture slot in AvatarTextureIndex
-            </summary>
-            <param name="index">A BakeType</param>
-            <returns>The AvatarTextureIndex slot that holds the given BakeType</returns>
+        <member name="F:OpenMetaverse.LoginParams.LastName">
+            <summary>The Agents Last name</summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.MorphLayerForBakeType(OpenMetaverse.BakeType)">
-            <summary>
-            Gives the layer number that is used for morph mask
-            </summary>
-            <param name="bakeType">>A BakeType</param>
-            <returns>Which layer number as defined in BakeTypeToTextures is used for morph mask</returns>
+        <member name="F:OpenMetaverse.LoginParams.Password">
+            <summary>A md5 hashed password</summary>
+            <remarks>plaintext password will be automatically hashed</remarks>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.BakeTypeToTextures(OpenMetaverse.BakeType)">
-            <summary>
-            Converts a BakeType to a list of the texture slots that make up that bake
-            </summary>
-            <param name="bakeType">A BakeType</param>
-            <returns>A list of texture slots that are inputs for the given bake</returns>
+        <member name="F:OpenMetaverse.LoginParams.Start">
+            <summary>The agents starting location once logged in</summary>
+            <remarks>Either "last", "home", or a string encoded URI
+            containing the simulator name and x/y/z coordinates e.g: uri:hooper&amp;128&amp;152&amp;17</remarks>
         </member>
-        <member name="E:OpenMetaverse.AppearanceManager.AgentWearablesReply">
-            <summary>Triggered when an AgentWearablesUpdate packet is received,
-            telling us what our avatar is currently wearing
-            <see cref="M:OpenMetaverse.AppearanceManager.RequestAgentWearables"/> request.</summary>
+        <member name="F:OpenMetaverse.LoginParams.Channel">
+            <summary>A string containing the client software channel information</summary>
+            <example>Second Life Release</example>
         </member>
-        <member name="E:OpenMetaverse.AppearanceManager.CachedBakesReply">
-            <summary>Raised when an AgentCachedTextureResponse packet is
-            received, giving a list of cached bakes that were found on the
-            simulator
-            <seealso cref="M:OpenMetaverse.AppearanceManager.RequestCachedBakes"/> request.</summary>
+        <member name="F:OpenMetaverse.LoginParams.Version">
+            <summary>The client software version information</summary>
+            <remarks>The official viewer uses: Second Life Release n.n.n.n
+            where n is replaced with the current version of the viewer</remarks>
         </member>
-        <member name="E:OpenMetaverse.AppearanceManager.AppearanceSet">
-            <summary>
-            Raised when appearance data is sent to the simulator, also indicates
-            the main appearance thread is finished.
-            </summary>
-            <seealso cref="M:OpenMetaverse.AppearanceManager.RequestAgentSetAppearance"/> request.
+        <member name="F:OpenMetaverse.LoginParams.Platform">
+            <summary>A string containing the platform information the agent is running on</summary>
         </member>
-        <member name="E:OpenMetaverse.AppearanceManager.RebakeAvatarRequested">
-            <summary>
-            Triggered when the simulator requests the agent rebake its appearance.
-            </summary>
-            <seealso cref="!:RebakeAvatarRequest"/>
+        <member name="F:OpenMetaverse.LoginParams.MAC">
+            <summary>A string hash of the network cards Mac Address</summary>
         </member>
-        <member name="P:OpenMetaverse.AppearanceManager.ManagerBusy">
-            <summary>
-            Returns true if AppearanceManager is busy and trying to set or change appearance will fail
-            </summary>
+        <member name="F:OpenMetaverse.LoginParams.ViewerDigest">
+            <summary>Unknown or deprecated</summary>
         </member>
-        <member name="T:OpenMetaverse.AppearanceManager.WearableData">
-            <summary>
-            Contains information about a wearable inventory item
-            </summary>
+        <member name="F:OpenMetaverse.LoginParams.ID0">
+            <summary>A string hash of the first disk drives ID used to identify this clients uniqueness</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WearableData.ItemID">
-            <summary>Inventory ItemID of the wearable</summary>
+        <member name="F:OpenMetaverse.LoginParams.UserAgent">
+            <summary>A string containing the viewers Software, this is not directly sent to the login server but
+            instead is used to generate the Version string</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WearableData.AssetID">
-            <summary>AssetID of the wearable asset</summary>
+        <member name="F:OpenMetaverse.LoginParams.Author">
+            <summary>A string representing the software creator. This is not directly sent to the login server but
+            is used by the library to generate the Version information</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WearableData.WearableType">
-            <summary>WearableType of the wearable</summary>
+        <member name="F:OpenMetaverse.LoginParams.AgreeToTos">
+            <summary>If true, this agent agrees to the Terms of Service of the grid its connecting to</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WearableData.AssetType">
-            <summary>AssetType of the wearable</summary>
+        <member name="F:OpenMetaverse.LoginParams.ReadCritical">
+            <summary>Unknown</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WearableData.Asset">
-            <summary>Asset data for the wearable</summary>
+        <member name="F:OpenMetaverse.LoginParams.Options">
+            <summary>An array of string sent to the login server to enable various options</summary>
         </member>
-        <member name="T:OpenMetaverse.AppearanceManager.ColorParamInfo">
-            <summary>
-            Data collected from visual params for each wearable
-            needed for the calculation of the color
-            </summary>
+        <member name="F:OpenMetaverse.LoginParams.LoginID">
+            <summary>A randomly generated ID to distinguish between login attempts. This value is only used
+            internally in the library and is never sent over the wire</summary>
         </member>
-        <member name="T:OpenMetaverse.AppearanceManager.TextureData">
+        <member name="T:OpenMetaverse.LoginResponseData">
             <summary>
-            Holds a texture assetID and the data needed to bake this layer into
-            an outfit texture. Used to keep track of currently worn textures
-            and baking data
+            The decoded data returned from the login server after a successful login
             </summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.TextureData.TextureID">
-            <summary>A texture AssetID</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.TextureData.Texture">
-            <summary>Asset data for the texture</summary>
-        </member>
-        <member name="F:OpenMetaverse.AppearanceManager.TextureData.AlphaMasks">
-            <summary>Collection of alpha masks that needs applying</summary>
+        <member name="F:OpenMetaverse.LoginResponseData.Login">
+            <summary>true, false, indeterminate</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.TextureData.Color">
-            <summary>Tint that should be applied to the texture</summary>
+        <member name="F:OpenMetaverse.LoginResponseData.Message">
+            <summary>Login message of the day</summary>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.TextureData.TextureIndex">
-            <summary>Where on avatar does this texture belong</summary>
+        <member name="F:OpenMetaverse.LoginResponseData.AgentAccess">
+            <summary>M or PG, also agent_region_access and agent_access_max</summary>
         </member>
-        <member name="T:OpenMetaverse.AgentWearablesReplyEventArgs">
-            <summary>Contains the Event data returned from the data server from an AgentWearablesRequest</summary>
+        <member name="M:OpenMetaverse.LoginResponseData.Parse(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Parse LLSD Login Reply Data
+            </summary>
+            <param name="reply">An <seealso cref="T:OpenMetaverse.StructuredData.OSDMap" />
+            contaning the login response data</param>
+            <remarks>XML-RPC logins do not require this as XML-RPC.NET
+            automatically populates the struct properly using attributes</remarks>
         </member>
-        <member name="M:OpenMetaverse.AgentWearablesReplyEventArgs.#ctor">
-            <summary>Construct a new instance of the AgentWearablesReplyEventArgs class</summary>
+        <member name="T:OpenMetaverse.NetworkManager">
+            <summary>
+            Login Routines
+            </summary>
+            <summary>
+            NetworkManager is responsible for managing the network layer of
+            OpenMetaverse. It tracks all the server connections, serializes
+            outgoing traffic and deserializes incoming traffic, and provides
+            instances of delegates for network-related events.
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.AgentCachedBakesReplyEventArgs">
-            <summary>Contains the Event data returned from the data server from an AgentCachedTextureResponse</summary>
+        <member name="M:OpenMetaverse.NetworkManager.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Default constructor
+            </summary>
+            <param name="client">Reference to the GridClient object</param>
         </member>
-        <member name="M:OpenMetaverse.AgentCachedBakesReplyEventArgs.#ctor">
-            <summary>Construct a new instance of the AgentCachedBakesReplyEventArgs class</summary>
+        <member name="T:OpenMetaverse.NetworkManager.DisconnectType">
+            <summary>
+            Explains why a simulator or the grid disconnected from us
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.AppearanceSetEventArgs">
-            <summary>Contains the Event data returned from an AppearanceSetRequest</summary>
+        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.ClientInitiated">
+            <summary>The client requested the logout or simulator disconnect</summary>
         </member>
-        <member name="M:OpenMetaverse.AppearanceSetEventArgs.#ctor(System.Boolean)">
-            <summary>
-            Triggered when appearance data is sent to the sim and
-            the main appearance thread is done.</summary>
-            <param name="success">Indicates whether appearance setting was successful</param>
+        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.ServerInitiated">
+            <summary>The server notified us that it is disconnecting</summary>
         </member>
-        <member name="P:OpenMetaverse.AppearanceSetEventArgs.Success">
-            <summary>Indicates whether appearance setting was successful</summary>
+        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.NetworkTimeout">
+            <summary>Either a socket was closed or network traffic timed out</summary>
         </member>
-        <member name="T:OpenMetaverse.RebakeAvatarTexturesEventArgs">
-            <summary>Contains the Event data returned from the data server from an RebakeAvatarTextures</summary>
+        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.SimShutdown">
+            <summary>The last active simulator shut down</summary>
         </member>
-        <member name="M:OpenMetaverse.RebakeAvatarTexturesEventArgs.#ctor(OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.NetworkManager.IncomingPacket">
             <summary>
-            Triggered when the simulator sends a request for this agent to rebake
-            its appearance
+            Holds a simulator reference and a decoded packet, these structs are put in
+            the packet inbox for event handling
             </summary>
-            <param name="textureID">The ID of the Texture Layer to bake</param>
         </member>
-        <member name="P:OpenMetaverse.RebakeAvatarTexturesEventArgs.TextureID">
-            <summary>The ID of the Texture Layer to bake</summary>
+        <member name="F:OpenMetaverse.NetworkManager.IncomingPacket.Simulator">
+            <summary>Reference to the simulator that this packet came from</summary>
         </member>
-        <member name="T:OpenMetaverse.TextureRequestState">
+        <member name="F:OpenMetaverse.NetworkManager.IncomingPacket.Packet">
+            <summary>Packet that needs to be processed</summary>
+        </member>
+        <member name="T:OpenMetaverse.NetworkManager.OutgoingPacket">
             <summary>
-            The current status of a texture request as it moves through the pipeline or final result of a texture request. 
+            Holds a simulator reference and a serialized packet, these structs are put in
+            the packet outbox for sending
             </summary>
         </member>
-        <member name="F:OpenMetaverse.TextureRequestState.Pending">
-            <summary>The initial state given to a request. Requests in this state
-            are waiting for an available slot in the pipeline</summary>
-        </member>
-        <member name="F:OpenMetaverse.TextureRequestState.Started">
-            <summary>A request that has been added to the pipeline and the request packet
-            has been sent to the simulator</summary>
-        </member>
-        <member name="F:OpenMetaverse.TextureRequestState.Progress">
-            <summary>A request that has received one or more packets back from the simulator</summary>
+        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.Simulator">
+            <summary>Reference to the simulator this packet is destined for</summary>
         </member>
-        <member name="F:OpenMetaverse.TextureRequestState.Finished">
-            <summary>A request that has received all packets back from the simulator</summary>
+        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.Buffer">
+            <summary>Packet that needs to be sent</summary>
         </member>
-        <member name="F:OpenMetaverse.TextureRequestState.Timeout">
-            <summary>A request that has taken longer than <seealso cref="F:OpenMetaverse.Settings.PIPELINE_REQUEST_TIMEOUT"/>
-            to download OR the initial packet containing the packet information was never received</summary>
+        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.SequenceNumber">
+            <summary>Sequence number of the wrapped packet</summary>
         </member>
-        <member name="F:OpenMetaverse.TextureRequestState.Aborted">
-            <summary>The texture request was aborted by request of the agent</summary>
+        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.ResendCount">
+            <summary>Number of times this packet has been resent</summary>
         </member>
-        <member name="F:OpenMetaverse.TextureRequestState.NotFound">
-            <summary>The simulator replied to the request that it was not able to find the requested texture</summary>
+        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.TickCount">
+            <summary>Environment.TickCount when this packet was last sent over the wire</summary>
         </member>
-        <member name="T:OpenMetaverse.TextureDownloadCallback">
-            <summary>
-            A callback fired to indicate the status or final state of the requested texture. For progressive 
-            downloads this will fire each time new asset data is returned from the simulator.
-            </summary>
-            <param name="state">The <see cref="T:OpenMetaverse.TextureRequestState"/> indicating either Progress for textures not fully downloaded,
-            or the final result of the request after it has been processed through the TexturePipeline</param>
-            <param name="assetTexture">The <see cref="T:OpenMetaverse.Assets.AssetTexture"/> object containing the Assets ID, raw data
-            and other information. For progressive rendering the <see cref="F:OpenMetaverse.Assets.Asset.AssetData"/> will contain
-            the data from the beginning of the file. For failed, aborted and timed out requests it will contain
-            an empty byte array.</param>
+        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.Type">
+            <summary>Type of the packet</summary>
         </member>
-        <member name="T:OpenMetaverse.TexturePipeline">
+        <member name="T:OpenMetaverse.NetworkManager.LoginResponseCallback">
             <summary>
-            Texture request download handler, allows a configurable number of download slots which manage multiple
-            concurrent texture downloads from the <seealso cref="T:OpenMetaverse.Simulator"/>
             </summary>
-            <remarks>This class makes full use of the internal <seealso cref="!:TextureCache"/> 
-            system for full texture downloads.</remarks>
-        </member>
-        <member name="F:OpenMetaverse.TexturePipeline._Transfers">
-            <summary>A dictionary containing all pending and in-process transfer requests where the Key is both the RequestID
-            and also the Asset Texture ID, and the value is an object containing the current state of the request and also
-            the asset data as it is being re-assembled</summary>
+            <param name="loginSuccess">
+            </param>
+            <param name="redirect">
+            </param>
+            <param name="replyData">
+            </param>
+            <param name="message">
+            </param>
+            <param name="reason">
+            </param>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline._Client">
-            <summary>Holds the reference to the <see cref="T:OpenMetaverse.GridClient"/> client object</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_LoginProgress">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.maxTextureRequests">
-            <summary>Maximum concurrent texture requests allowed at a time</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_LoginProgressLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.resetEvents">
-            <summary>An array of <see cref="T:System.Threading.AutoResetEvent"/> objects used to manage worker request threads</summary>
+        <member name="F:OpenMetaverse.NetworkManager.LoginSeedCapability">
+            <summary>Seed CAPS URL returned from the login server</summary>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.threadpoolSlots">
-            <summary>An array of worker slots which shows the availablity status of the slot</summary>
+        <member name="F:OpenMetaverse.NetworkManager.MaxAgentGroups">
+            <summary>Maximum number of groups an agent can belong to, -1 for unlimited</summary>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.downloadMaster">
-            <summary>The primary thread which manages the requests.</summary>
+        <member name="F:OpenMetaverse.NetworkManager.XMPPHost">
+            <summary>XMPP server to connect to for Group chat and IM services</summary>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline._Running">
-            <summary>true if the TexturePipeline is currently running</summary>
+        <member name="F:OpenMetaverse.NetworkManager.UDPBlacklist">
+            <summary>A list of packets obtained during the login process which
+            networkmanager will log but not process</summary>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.lockerObject">
-            <summary>A synchronization object used by the primary thread</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_PacketSent">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.RefreshDownloadsTimer">
-            <summary>A refresh timer used to increase the priority of stalled requests</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_PacketSentLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.TexturePipeline.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Default constructor, Instantiates a new copy of the TexturePipeline class
-            </summary>
-            <param name="client">Reference to the instantiated <see cref="T:OpenMetaverse.GridClient"/> object</param>
+        <member name="F:OpenMetaverse.NetworkManager.m_LoggedOut">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.TexturePipeline.Startup">
-            <summary>
-            Initialize callbacks required for the TexturePipeline to operate
-            </summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_LoggedOutLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.TexturePipeline.Shutdown">
-            <summary>
-            Shutdown the TexturePipeline and cleanup any callbacks or transfers
-            </summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimConnecting">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.TexturePipeline.RequestTexture(OpenMetaverse.UUID,OpenMetaverse.ImageType,System.Single,System.Int32,System.UInt32,OpenMetaverse.TextureDownloadCallback,System.Boolean)">
-            <summary>
-            Request a texture asset from the simulator using the <see cref="T:OpenMetaverse.TexturePipeline"/> system to 
-            manage the requests and re-assemble the image from the packets received from the simulator
-            </summary>
-            <param name="textureID">The <see cref="T:OpenMetaverse.UUID"/> of the texture asset to download</param>
-            <param name="imageType">The <see cref="T:OpenMetaverse.ImageType"/> of the texture asset. 
-            Use <see cref="F:OpenMetaverse.ImageType.Normal"/> for most textures, or <see cref="F:OpenMetaverse.ImageType.Baked"/> for baked layer texture assets</param>
-            <param name="priority">A float indicating the requested priority for the transfer. Higher priority values tell the simulator
-            to prioritize the request before lower valued requests. An image already being transferred using the <see cref="T:OpenMetaverse.TexturePipeline"/> can have
-            its priority changed by resending the request with the new priority value</param>
-            <param name="discardLevel">Number of quality layers to discard.
-            This controls the end marker of the data sent</param>
-            <param name="packetStart">The packet number to begin the request at. A value of 0 begins the request
-            from the start of the asset texture</param>
-            <param name="callback">The <see cref="T:OpenMetaverse.TextureDownloadCallback"/> callback to fire when the image is retrieved. The callback
-            will contain the result of the request and the texture asset data</param>
-            <param name="progressive">If true, the callback will be fired for each chunk of the downloaded image. 
-            The callback asset parameter will contain all previously received chunks of the texture asset starting 
-            from the beginning of the request</param>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimConnectingLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.TexturePipeline.RequestImage(OpenMetaverse.UUID,OpenMetaverse.ImageType,System.Single,System.Int32,System.UInt32)">
-            <summary>
-            Sends the actual request packet to the simulator
-            </summary>
-            <param name="imageID">The image to download</param>
-            <param name="type">Type of the image to download, either a baked
-            avatar texture or a normal texture</param>
-            <param name="priority">Priority level of the download. Default is
-            <c>1,013,000.0f</c></param>
-            <param name="discardLevel">Number of quality layers to discard.
-            This controls the end marker of the data sent</param>
-            <param name="packetNum">Packet number to start the download at.
-            This controls the start marker of the data sent</param>
-            <remarks>Sending a priority of 0 and a discardlevel of -1 aborts
-            download</remarks>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimConnected">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.TexturePipeline.AbortTextureRequest(OpenMetaverse.UUID)">
-            <summary>
-            Cancel a pending or in process texture request
-            </summary>
-            <param name="textureID">The texture assets unique ID</param>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimConnectedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.TexturePipeline.DownloadThread">
-            <summary>
-            Master Download Thread, Queues up downloads in the threadpool
-            </summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimDisconnected">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.TexturePipeline.TextureRequestDoWork(System.Object)">
-            <summary>
-            The worker thread that sends the request and handles timeouts
-            </summary>
-            <param name="threadContext">A <see cref="T:OpenMetaverse.TexturePipeline.TaskInfo"/> object containing the request details</param>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimDisconnectedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.TexturePipeline.ImageNotInDatabaseHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>
-            Handle responses from the simulator that tell us a texture we have requested is unable to be located
-            or no longer exists. This will remove the request from the pipeline and free up a slot if one is in use
-            </summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.NetworkManager.m_Disconnected">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.TexturePipeline.ImagePacketHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>
-            Handles the remaining Image data that did not fit in the initial ImageData packet
-            </summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.NetworkManager.m_DisconnectedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.TexturePipeline.ImageDataHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>
-            Handle the initial ImageDataPacket sent from the simulator
-            </summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimChanged">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="P:OpenMetaverse.TexturePipeline.TransferCount">
-            <summary>Current number of pending and in-process transfers</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimChangedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.TexturePipeline.TaskInfo">
-            <summary>
-            A request task containing information and status of a request as it is processed through the <see cref="T:OpenMetaverse.TexturePipeline"/>
-            </summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_EventQueueRunning">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.State">
-            <summary>The current <seealso cref="T:OpenMetaverse.TextureRequestState"/> which identifies the current status of the request</summary>
+        <member name="F:OpenMetaverse.NetworkManager.m_EventQueueRunningLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.RequestID">
-            <summary>The Unique Request ID, This is also the Asset ID of the texture being requested</summary>
+        <member name="F:OpenMetaverse.NetworkManager.Simulators">
+            <summary>All of the simulators we are currently connected to</summary>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.RequestSlot">
-            <summary>The slot this request is occupying in the threadpoolSlots array</summary>
+        <member name="F:OpenMetaverse.NetworkManager.CapsEvents">
+            <summary>Handlers for incoming capability events</summary>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.Type">
-            <summary>The ImageType of the request.</summary>
+        <member name="F:OpenMetaverse.NetworkManager.PacketEvents">
+            <summary>Handlers for incoming packets</summary>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.Callbacks">
-            <summary>The callback to fire when the request is complete, will include 
-            the <seealso cref="T:OpenMetaverse.TextureRequestState"/> and the <see cref="T:OpenMetaverse.Assets.AssetTexture"/> 
-            object containing the result data</summary>
+        <member name="F:OpenMetaverse.NetworkManager.PacketInbox">
+            <summary>Incoming packets that are awaiting handling</summary>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.ReportProgress">
-            <summary>If true, indicates the callback will be fired whenever new data is returned from the simulator.
-            This is used to progressively render textures as portions of the texture are received.</summary>
+        <member name="F:OpenMetaverse.NetworkManager.PacketOutbox">
+            <summary>Outgoing packets that are awaiting handling</summary>
         </member>
-        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.Transfer">
-            <summary>An object that maintains the data of an request thats in-process.</summary>
+        <member name="E:OpenMetaverse.NetworkManager.LoginProgress">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="T:OpenMetaverse.BitPack">
-            <summary>
-            Wrapper around a byte array that allows bit to be packed and unpacked
-            one at a time or by a variable amount. Useful for very tightly packed
-            data like LayerData packets
-            </summary>
+        <member name="E:OpenMetaverse.NetworkManager.OnLoginResponse">
+            <summary>Called when a reply is received from the login server, the
+            login sequence will block until this event returns</summary>
         </member>
-        <member name="F:OpenMetaverse.BitPack.Data">
-            <summary></summary>
+        <member name="E:OpenMetaverse.NetworkManager.PacketSent">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.#ctor(System.Byte[],System.Int32)">
-            <summary>
-            Default constructor, initialize the bit packer / bit unpacker
-            with a byte array and starting position
-            </summary>
-            <param name="data">Byte array to pack bits in to or unpack from</param>
-            <param name="pos">Starting position in the byte array</param>
+        <member name="E:OpenMetaverse.NetworkManager.LoggedOut">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.PackFloat(System.Single)">
-            <summary>
-            Pack a floating point value in to the data
-            </summary>
-            <param name="data">Floating point value to pack</param>
+        <member name="E:OpenMetaverse.NetworkManager.SimConnecting">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.PackBits(System.Int32,System.Int32)">
-            <summary>
-            Pack part or all of an integer in to the data
-            </summary>
-            <param name="data">Integer containing the data to pack</param>
-            <param name="totalCount">Number of bits of the integer to pack</param>
+        <member name="E:OpenMetaverse.NetworkManager.SimConnected">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.PackBits(System.UInt32,System.Int32)">
-            <summary>
-            Pack part or all of an unsigned integer in to the data
-            </summary>
-            <param name="data">Unsigned integer containing the data to pack</param>
-            <param name="totalCount">Number of bits of the integer to pack</param>
+        <member name="E:OpenMetaverse.NetworkManager.SimDisconnected">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.PackBit(System.Boolean)">
-            <summary>
-            Pack a single bit in to the data
-            </summary>
-            <param name="bit">Bit to pack</param>
+        <member name="E:OpenMetaverse.NetworkManager.Disconnected">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.PackFixed(System.Single,System.Boolean,System.Int32,System.Int32)">
-            <summary>
-            
-            </summary>
-            <param name="data"></param>
-            <param name="isSigned"></param>
-            <param name="intBits"></param>
-            <param name="fracBits"></param>
+        <member name="E:OpenMetaverse.NetworkManager.SimChanged">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.PackUUID(OpenMetaverse.UUID)">
-            <summary>
-            
-            </summary>
-            <param name="data"></param>
+        <member name="E:OpenMetaverse.NetworkManager.EventQueueRunning">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.PackColor(OpenMetaverse.Color4)">
-            <summary>
-            
-            </summary>
-            <param name="data"></param>
+        <member name="P:OpenMetaverse.NetworkManager.LoginStatusCode">
+            <summary>Current state of logging in</summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.UnpackFloat">
-            <summary>
-            Unpacking a floating point value from the data
-            </summary>
-            <returns>Unpacked floating point value</returns>
+        <member name="P:OpenMetaverse.NetworkManager.LoginErrorKey">
+            <summary>Upon login failure, contains a short string key for the
+            type of login error that occurred</summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.UnpackBits(System.Int32)">
-            <summary>
-            Unpack a variable number of bits from the data in to integer format
-            </summary>
-            <param name="totalCount">Number of bits to unpack</param>
-            <returns>An integer containing the unpacked bits</returns>
-            <remarks>This function is only useful up to 32 bits</remarks>
+        <member name="P:OpenMetaverse.NetworkManager.RawLoginReply">
+            <summary>The raw XML-RPC reply from the login server, exactly as it
+            was received (minus the HTTP header)</summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.UnpackUBits(System.Int32)">
-            <summary>
-            Unpack a variable number of bits from the data in to unsigned 
-            integer format
-            </summary>
-            <param name="totalCount">Number of bits to unpack</param>
-            <returns>An unsigned integer containing the unpacked bits</returns>
-            <remarks>This function is only useful up to 32 bits</remarks>
+        <member name="P:OpenMetaverse.NetworkManager.LoginMessage">
+            <summary>During login this contains a descriptive version of
+            LoginStatusCode. After a successful login this will contain the
+            message of the day, and after a failed login a descriptive error
+            message will be returned</summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.UnpackShort">
-            <summary>
-            Unpack a 16-bit signed integer
-            </summary>
-            <returns>16-bit signed integer</returns>
+        <member name="P:OpenMetaverse.NetworkManager.CircuitCode">
+            <summary>Unique identifier associated with our connections to
+            simulators</summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.UnpackUShort">
-            <summary>
-            Unpack a 16-bit unsigned integer
-            </summary>
-            <returns>16-bit unsigned integer</returns>
+        <member name="P:OpenMetaverse.NetworkManager.CurrentSim">
+            <summary>The simulator that the logged in avatar is currently
+            occupying</summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.UnpackInt">
-            <summary>
-            Unpack a 32-bit signed integer
-            </summary>
-            <returns>32-bit signed integer</returns>
+        <member name="P:OpenMetaverse.NetworkManager.Connected">
+            <summary>Shows whether the network layer is logged in to the
+            grid or not</summary>
         </member>
-        <member name="M:OpenMetaverse.BitPack.UnpackUInt">
-            <summary>
-            Unpack a 32-bit unsigned integer
-            </summary>
-            <returns>32-bit unsigned integer</returns>
+        <member name="P:OpenMetaverse.NetworkManager.InboxCount">
+            <summary>Number of packets in the incoming queue</summary>
         </member>
-        <member name="P:OpenMetaverse.BitPack.BytePos">
-            <summary></summary>
+        <member name="P:OpenMetaverse.NetworkManager.OutboxCount">
+            <summary>Number of packets in the outgoing queue</summary>
         </member>
-        <member name="P:OpenMetaverse.BitPack.BitPos">
-            <summary></summary>
+        <member name="M:OpenMetaverse.NetworkManager.OnLoginProgress(OpenMetaverse.LoginProgressEventArgs)">
+            <summary>Raises the LoginProgress Event</summary>
+            <param name="e">A LoginProgressEventArgs object containing
+            the data sent from the simulator</param>
         </member>
-        <member name="T:OpenMetaverse.AssetCache">
+        <member name="M:OpenMetaverse.NetworkManager.DefaultLoginParams(System.String,System.String,System.String,System.String,System.String)">
             <summary>
-            Class that handles the local asset cache
+            Generate sane default values for a login request
             </summary>
+            <param name="firstName">Account first name</param>
+            <param name="lastName">Account last name</param>
+            <param name="password">Account password</param>
+            <param name="userAgent">Client application name</param>
+            <param name="userVersion">Client application version</param>
+            <returns>A populated <seealso cref="T:OpenMetaverse.LoginParams" /> struct containing
+            sane defaults</returns>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.#ctor(OpenMetaverse.GridClient)">
+        <member name="M:OpenMetaverse.NetworkManager.Login(System.String,System.String,System.String,System.String,System.String)">
             <summary>
-            Default constructor
+            Simplified login that takes the most common and required fields
             </summary>
-            <param name="client">A reference to the GridClient object</param>
+            <param name="firstName">Account first name</param>
+            <param name="lastName">Account last name</param>
+            <param name="password">Account password</param>
+            <param name="userAgent">Client application name</param>
+            <param name="userVersion">Client application version</param>
+            <returns>Whether the login was successful or not. On failure the
+            LoginErrorKey string will contain the error code and LoginMessage
+            will contain a description of the error</returns>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.DestroyTimer">
+        <member name="M:OpenMetaverse.NetworkManager.Login(System.String,System.String,System.String,System.String,System.String,System.String)">
             <summary>
-            Disposes cleanup timer
+            Simplified login that takes the most common fields along with a
+            starting location URI, and can accept an MD5 string instead of a
+            plaintext password
             </summary>
+            <param name="firstName">Account first name</param>
+            <param name="lastName">Account last name</param>
+            <param name="password">Account password or MD5 hash of the password
+            such as $1$1682a1e45e9f957dcdf0bb56eb43319c</param>
+            <param name="userAgent">Client application name</param>
+            <param name="start">Starting location URI that can be built with
+            StartLocation()</param>
+            <param name="userVersion">Client application version</param>
+            <returns>Whether the login was successful or not. On failure the
+            LoginErrorKey string will contain the error code and LoginMessage
+            will contain a description of the error</returns>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.SetupTimer">
+        <member name="M:OpenMetaverse.NetworkManager.Login(OpenMetaverse.LoginParams)">
             <summary>
-            Only create timer when needed
+            Login that takes a struct of all the values that will be passed to
+            the login server
             </summary>
+            <param name="loginParams">The values that will be passed to the login
+            server, all fields must be set even if they are String.Empty</param>
+            <returns>Whether the login was successful or not. On failure the
+            LoginErrorKey string will contain the error code and LoginMessage
+            will contain a description of the error</returns>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.GetCachedAssetBytes(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.NetworkManager.StartLocation(System.String,System.Int32,System.Int32,System.Int32)">
             <summary>
-            Return bytes read from the local asset cache, null if it does not exist
+            Build a start location URI for passing to the Login function
             </summary>
-            <param name="assetID">UUID of the asset we want to get</param>
-            <returns>Raw bytes of the asset, or null on failure</returns>
+            <param name="sim">Name of the simulator to start in</param>
+            <param name="x">X coordinate to start at</param>
+            <param name="y">Y coordinate to start at</param>
+            <param name="z">Z coordinate to start at</param>
+            <returns>String with a URI that can be used to login to a specified
+            location</returns>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.GetCachedImage(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.NetworkManager.RemoteLoginHandler(OpenMetaverse.LoginResponseData,OpenMetaverse.LoginParams)">
             <summary>
-            Returns ImageDownload object of the
-            image from the local image cache, null if it does not exist
+            LoginParams and the initial login XmlRpcRequest were made on a remote machine.
+            This method now initializes libomv with the results.
             </summary>
-            <param name="imageID">UUID of the image we want to get</param>
-            <returns>ImageDownload object containing the image, or null on failure</returns>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.FileName(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.NetworkManager.LoginReplyXmlRpcHandler(Nwc.XmlRpc.XmlRpcResponse,OpenMetaverse.LoginParams)">
             <summary>
-            Constructs a file name of the cached asset
+            Handles response from XML-RPC login replies
             </summary>
-            <param name="assetID">UUID of the asset</param>
-            <returns>String with the file name of the cahced asset</returns>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.SaveAssetToCache(OpenMetaverse.UUID,System.Byte[])">
+        <member name="M:OpenMetaverse.NetworkManager.LoginReplyXmlRpcHandler(OpenMetaverse.LoginResponseData,OpenMetaverse.LoginParams)">
             <summary>
-            Saves an asset to the local cache
+            Handles response from XML-RPC login replies with already parsed LoginResponseData
             </summary>
-            <param name="assetID">UUID of the asset</param>
-            <param name="assetData">Raw bytes the asset consists of</param>
-            <returns>Weather the operation was successfull</returns>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.AssetFileName(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.NetworkManager.LoginReplyLLSDHandler(OpenMetaverse.Http.CapsClient,OpenMetaverse.StructuredData.OSD,System.Exception)">
             <summary>
-            Get the file name of the asset stored with gived UUID
+            Handle response from LLSD login replies
             </summary>
-            <param name="assetID">UUID of the asset</param>
-            <returns>Null if we don't have that UUID cached on disk, file name if found in the cache folder</returns>
+            <param name="client">
+            </param>
+            <param name="result">
+            </param>
+            <param name="error">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.HasAsset(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.NetworkManager.GetPlatform">
             <summary>
-            Checks if the asset exists in the local cache
+            Get current OS
             </summary>
-            <param name="assetID">UUID of the asset</param>
-            <returns>True is the asset is stored in the cache, otherwise false</returns>
+            <returns>Either "Win" or "Linux"</returns>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.Clear">
+        <member name="M:OpenMetaverse.NetworkManager.GetMAC">
             <summary>
-            Wipes out entire cache
+            Get clients default Mac Address
             </summary>
+            <returns>A string containing the first found Mac Address</returns>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.Prune">
-            <summary>
-            Brings cache size to the 90% of the max size
-            </summary>
+        <member name="M:OpenMetaverse.NetworkManager.OnPacketSent(OpenMetaverse.PacketSentEventArgs)">
+            <summary>Raises the PacketSent Event</summary>
+            <param name="e">A PacketSentEventArgs object containing
+            the data sent from the simulator</param>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.BeginPrune">
-            <summary>
-            Asynchronously brings cache size to the 90% of the max size
-            </summary>
+        <member name="M:OpenMetaverse.NetworkManager.OnLoggedOut(OpenMetaverse.LoggedOutEventArgs)">
+            <summary>Raises the LoggedOut Event</summary>
+            <param name="e">A LoggedOutEventArgs object containing
+            the data sent from the simulator</param>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.GetFileSize(System.IO.FileInfo[])">
-            <summary>
-            Adds up file sizes passes in a FileInfo array
-            </summary>
+        <member name="M:OpenMetaverse.NetworkManager.OnSimConnecting(OpenMetaverse.SimConnectingEventArgs)">
+            <summary>Raises the SimConnecting Event</summary>
+            <param name="e">A SimConnectingEventArgs object containing
+            the data sent from the simulator</param>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.Operational">
-            <summary>
-            Checks whether caching is enabled
-            </summary>
+        <member name="M:OpenMetaverse.NetworkManager.OnSimConnected(OpenMetaverse.SimConnectedEventArgs)">
+            <summary>Raises the SimConnected Event</summary>
+            <param name="e">A SimConnectedEventArgs object containing
+            the data sent from the simulator</param>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.cleanerTimer_Elapsed(System.Object,System.Timers.ElapsedEventArgs)">
-            <summary>
-            Periodically prune the cache
-            </summary>
+        <member name="M:OpenMetaverse.NetworkManager.OnSimDisconnected(OpenMetaverse.SimDisconnectedEventArgs)">
+            <summary>Raises the SimDisconnected Event</summary>
+            <param name="e">A SimDisconnectedEventArgs object containing
+            the data sent from the simulator</param>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.NiceFileSize(System.Int64)">
-            <summary>
-            Nicely formats file sizes
-            </summary>
-            <param name="byteCount">Byte size we want to output</param>
-            <returns>String with humanly readable file size</returns>
+        <member name="M:OpenMetaverse.NetworkManager.OnDisconnected(OpenMetaverse.DisconnectedEventArgs)">
+            <summary>Raises the Disconnected Event</summary>
+            <param name="e">A DisconnectedEventArgs object containing
+            the data sent from the simulator</param>
         </member>
-        <member name="P:OpenMetaverse.AssetCache.AutoPruneEnabled">
-            <summary>
-            Allows setting weather to periodicale prune the cache if it grows too big
-            Default is enabled, when caching is enabled
-            </summary>
+        <member name="M:OpenMetaverse.NetworkManager.OnSimChanged(OpenMetaverse.SimChangedEventArgs)">
+            <summary>Raises the SimChanged Event</summary>
+            <param name="e">A SimChangedEventArgs object containing
+            the data sent from the simulator</param>
         </member>
-        <member name="P:OpenMetaverse.AssetCache.AutoPruneInterval">
-            <summary>
-            How long (in ms) between cache checks (default is 5 min.) 
-            </summary>
+        <member name="M:OpenMetaverse.NetworkManager.OnEventQueueRunning(OpenMetaverse.EventQueueRunningEventArgs)">
+            <summary>Raises the EventQueueRunning Event</summary>
+            <param name="e">A EventQueueRunningEventArgs object containing
+            the data sent from the simulator</param>
         </member>
-        <member name="T:OpenMetaverse.AssetCache.SortFilesByAccesTimeHelper">
+        <member name="M:OpenMetaverse.NetworkManager.RegisterCallback(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs})">
             <summary>
-            Helper class for sorting files by their last accessed time
+            Register an event handler for a packet. This is a low level event
+            interface and should only be used if you are doing something not
+            supported in the library
             </summary>
+            <param name="type">Packet type to trigger events for</param>
+            <param name="callback">Callback to fire when a packet of this type
+            is received</param>
         </member>
-        <member name="T:OpenMetaverse.Imaging.LoadTGAClass">
+        <member name="M:OpenMetaverse.NetworkManager.RegisterCallback(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs},System.Boolean)">
             <summary>
-            Capability to load TGAs to Bitmap 
+            Register an event handler for a packet. This is a low level event
+            interface and should only be used if you are doing something not
+            supported in the library
             </summary>
+            <param name="type">Packet type to trigger events for</param>
+            <param name="callback">Callback to fire when a packet of this type
+            is received</param>
+            <param name="isAsync">True if the callback should be ran
+            asynchronously. Only set this to false (synchronous for callbacks
+            that will always complete quickly)</param>
+            <remarks>If any callback for a packet type is marked as
+            asynchronous, all callbacks for that packet type will be fired
+            asynchronously</remarks>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetSound">
+        <member name="M:OpenMetaverse.NetworkManager.UnregisterCallback(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs})">
             <summary>
-            Represents a Sound Asset
+            Unregister an event handler for a packet. This is a low level event
+            interface and should only be used if you are doing something not
+            supported in the library
             </summary>
+            <param name="type">Packet type this callback is registered with</param>
+            <param name="callback">Callback to stop firing events for</param>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetSound.#ctor">
-            <summary>Initializes a new instance of an AssetSound object</summary>
-        </member>
-        <member name="M:OpenMetaverse.Assets.AssetSound.#ctor(OpenMetaverse.UUID,System.Byte[])">
-            <summary>Initializes a new instance of an AssetSound object with parameters</summary>
-            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
-            <param name="assetData">A byte array containing the raw asset data</param>
-        </member>
-        <member name="M:OpenMetaverse.Assets.AssetSound.Encode">
+        <member name="M:OpenMetaverse.NetworkManager.RegisterEventCallback(System.String,OpenMetaverse.Caps.EventQueueCallback)">
             <summary>
-            TODO: Encodes a sound file
+            Register a CAPS event handler. This is a low level event interface
+            and should only be used if you are doing something not supported in
+            the library
             </summary>
+            <param name="capsEvent">Name of the CAPS event to register a handler for</param>
+            <param name="callback">Callback to fire when a CAPS event is received</param>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetSound.Decode">
+        <member name="M:OpenMetaverse.NetworkManager.UnregisterEventCallback(System.String,OpenMetaverse.Caps.EventQueueCallback)">
             <summary>
-            TODO: Decode a sound file
+            Unregister a CAPS event handler. This is a low level event interface
+            and should only be used if you are doing something not supported in
+            the library
             </summary>
-            <returns>true</returns>
-        </member>
-        <member name="P:OpenMetaverse.Assets.AssetSound.AssetType">
-            <summary>Override the base classes AssetType</summary>
+            <param name="capsEvent">Name of the CAPS event this callback is
+            registered with</param>
+            <param name="callback">Callback to stop firing events for</param>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetScriptText">
+        <member name="M:OpenMetaverse.NetworkManager.SendPacket(OpenMetaverse.Packets.Packet)">
             <summary>
-            Represents an LSL Text object containing a string of UTF encoded characters
+            Send a packet to the simulator the avatar is currently occupying
             </summary>
+            <param name="packet">Packet to send</param>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetScriptText.Source">
-            <summary>A string of characters represting the script contents</summary>
-        </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptText.#ctor">
-            <summary>Initializes a new AssetScriptText object</summary>
-        </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptText.#ctor(OpenMetaverse.UUID,System.Byte[])">
+        <member name="M:OpenMetaverse.NetworkManager.SendPacket(OpenMetaverse.Packets.Packet,OpenMetaverse.Simulator)">
             <summary>
-            Initializes a new AssetScriptText object with parameters
+            Send a packet to a specified simulator
             </summary>
-            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
-            <param name="assetData">A byte array containing the raw asset data</param>
+            <param name="packet">Packet to send</param>
+            <param name="simulator">Simulator to send the packet to</param>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptText.Encode">
+        <member name="M:OpenMetaverse.NetworkManager.Connect(System.Net.IPAddress,System.UInt16,System.UInt64,System.Boolean,System.String)">
             <summary>
-            Encode a string containing the scripts contents into byte encoded AssetData
+            Connect to a simulator
             </summary>
+            <param name="ip">IP address to connect to</param>
+            <param name="port">Port to connect to</param>
+            <param name="handle">Handle for this simulator, to identify its
+            location in the grid</param>
+            <param name="setDefault">Whether to set CurrentSim to this new
+            connection, use this if the avatar is moving in to this simulator</param>
+            <param name="seedcaps">URL of the capabilities server to use for
+            this sim connection</param>
+            <returns>A Simulator object on success, otherwise null</returns>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptText.Decode">
+        <member name="M:OpenMetaverse.NetworkManager.Connect(System.Net.IPEndPoint,System.UInt64,System.Boolean,System.String)">
             <summary>
-            Decode a byte array containing the scripts contents into a string
+            Connect to a simulator
             </summary>
-            <returns>true if decoding is successful</returns>
-        </member>
-        <member name="P:OpenMetaverse.Assets.AssetScriptText.AssetType">
-            <summary>Override the base classes AssetType</summary>
+            <param name="endPoint">IP address and port to connect to</param>
+            <param name="handle">Handle for this simulator, to identify its
+            location in the grid</param>
+            <param name="setDefault">Whether to set CurrentSim to this new
+            connection, use this if the avatar is moving in to this simulator</param>
+            <param name="seedcaps">URL of the capabilities server to use for
+            this sim connection</param>
+            <returns>A Simulator object on success, otherwise null</returns>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetLandmark">
+        <member name="M:OpenMetaverse.NetworkManager.Logout">
             <summary>
-            Represents a Landmark with RegionID and Position vector
+            Initiate a blocking logout request. This will return when the logout
+            handshake has completed or when <code>Settings.LOGOUT_TIMEOUT</code>
+            has expired and the network layer is manually shut down
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetLandmark.RegionID">
-            <summary>UUID of the Landmark target region</summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.AssetLandmark.Position">
-            <summary> Local position of the target </summary>
-        </member>
-        <member name="M:OpenMetaverse.Assets.AssetLandmark.#ctor">
-            <summary>Construct an Asset of type Landmark</summary>
-        </member>
-        <member name="M:OpenMetaverse.Assets.AssetLandmark.#ctor(OpenMetaverse.UUID,System.Byte[])">
+        <member name="M:OpenMetaverse.NetworkManager.RequestLogout">
             <summary>
-            Construct an Asset object of type Landmark
+            Initiate the logout process. Check if logout succeeded with the
+            <code>OnLogoutReply</code> event, and if this does not fire the
+            <code>Shutdown()</code> function needs to be manually called
             </summary>
-            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
-            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetLandmark.Encode">
+        <member name="M:OpenMetaverse.NetworkManager.DisconnectSim(OpenMetaverse.Simulator,System.Boolean)">
             <summary>
-            Encode the raw contents of a string with the specific Landmark format
+            Close a connection to the given simulator
             </summary>
+            <param name="simulator">
+            </param>
+            <param name="sendCloseCircuit">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetLandmark.Decode">
+        <member name="M:OpenMetaverse.NetworkManager.Shutdown(OpenMetaverse.NetworkManager.DisconnectType)">
             <summary>
-            Decode the raw asset data, populating the RegionID and Position
-            </summary>
-            <returns>true if the AssetData was successfully decoded to a UUID and Vector</returns>
+            Shutdown will disconnect all the sims except for the current sim
+            first, and then kill the connection to CurrentSim. This should only
+            be called if the logout process times out on <code>RequestLogout</code></summary>
+            <param name="type">Type of shutdown</param>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetLandmark.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="M:OpenMetaverse.NetworkManager.Shutdown(OpenMetaverse.NetworkManager.DisconnectType,System.String)">
+            <summary>
+            Shutdown will disconnect all the sims except for the current sim
+            first, and then kill the connection to CurrentSim. This should only
+            be called if the logout process times out on <code>RequestLogout</code></summary>
+            <param name="type">Type of shutdown</param>
+            <param name="message">Shutdown message</param>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetClothing">
+        <member name="M:OpenMetaverse.NetworkManager.FindSimulator(System.Net.IPEndPoint)">
             <summary>
-            Represents an <seealso cref="T:OpenMetaverse.Assets.AssetWearable"/> that can be worn on an avatar
-            such as a Shirt, Pants, etc.
+            Searches through the list of currently connected simulators to find
+            one attached to the given IPEndPoint
             </summary>
+            <param name="endPoint">IPEndPoint of the Simulator to search for</param>
+            <returns>A Simulator reference on success, otherwise null</returns>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetClothing.#ctor">
-            <summary>Initializes a new instance of an AssetScriptBinary object</summary>
-        </member>
-        <member name="M:OpenMetaverse.Assets.AssetClothing.#ctor(OpenMetaverse.UUID,System.Byte[])">
-            <summary>Initializes a new instance of an AssetScriptBinary object with parameters</summary>
-            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
-            <param name="assetData">A byte array containing the raw asset data</param>
-        </member>
-        <member name="P:OpenMetaverse.Assets.AssetClothing.AssetType">
-            <summary>Override the base classes AssetType</summary>
-        </member>
-        <member name="T:OpenMetaverse.GridClient">
+        <member name="M:OpenMetaverse.NetworkManager.RaiseConnectedEvent(OpenMetaverse.Simulator)">
             <summary>
-            Main class to expose grid functionality to clients. All of the
-            classes needed for sending and receiving data are accessible through 
-            this class.
+            Fire an event when an event queue connects for capabilities
             </summary>
-            <example>
-            <code>
-            // Example minimum code required to instantiate class and 
-            // connect to a simulator.
-            using System;
-            using System.Collections.Generic;
-            using System.Text;
-            using OpenMetaverse;
-            
-            namespace FirstBot
-            {
-                class Bot
-                {
-                    public static GridClient Client;
-                    static void Main(string[] args)
-                    {
-                        Client = new GridClient(); // instantiates the GridClient class
-                                                   // to the global Client object
-                        // Login to Simulator
-                        Client.Network.Login("FirstName", "LastName", "Password", "FirstBot", "1.0");
-                        // Wait for a Keypress
-                        Console.ReadLine();
-                        // Logout of simulator
-                        Client.Network.Logout();
-                    }
-                }
-            }
-            </code>
-            </example>
-        </member>
-        <member name="F:OpenMetaverse.GridClient.Network">
-            <summary>Networking subsystem</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridClient.Settings">
-            <summary>Settings class including constant values and changeable
-            parameters for everything</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridClient.Parcels">
-            <summary>Parcel (subdivided simulator lots) subsystem</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridClient.Self">
-            <summary>Our own avatars subsystem</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridClient.Avatars">
-            <summary>Other avatars subsystem</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridClient.Estate">
-            <summary>Estate subsystem</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridClient.Friends">
-            <summary>Friends list subsystem</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridClient.Grid">
-            <summary>Grid (aka simulator group) subsystem</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridClient.Objects">
-            <summary>Object subsystem</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridClient.Groups">
-            <summary>Group subsystem</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridClient.Assets">
-            <summary>Asset subsystem</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridClient.Appearance">
-            <summary>Appearance subsystem</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridClient.Inventory">
-            <summary>Inventory subsystem</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridClient.Directory">
-            <summary>Directory searches including classifieds, people, land 
-            sales, etc</summary>
+            <param name="simulator">Simulator the event queue is attached to</param>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Terrain">
-            <summary>Handles land, wind, and cloud heightmaps</summary>
+        <member name="M:OpenMetaverse.NetworkManager.LogoutReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Sound">
-            <summary>Handles sound-related networking</summary>
+        <member name="M:OpenMetaverse.NetworkManager.StartPingCheckHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.GridClient.Throttle">
-            <summary>Throttling total bandwidth usage, or allocating bandwidth
-            for specific data stream types</summary>
+        <member name="M:OpenMetaverse.NetworkManager.CompletePingCheckHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.GridClient.#ctor">
-            <summary>
-            Default constructor
-            </summary>
+        <member name="M:OpenMetaverse.NetworkManager.SimStatsHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.GridClient.ToString">
-            <summary>
-            Return the full name of this instance
-            </summary>
-            <returns>Client avatars full name</returns>
+        <member name="M:OpenMetaverse.NetworkManager.RegionHandshakeHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.Packets.Packet.BuildPacket(System.String,OpenMetaverse.StructuredData.OSDMap)">
-            <summary>
-            Attempts to convert an LLSD structure to a known Packet type
-            </summary>
-            <param name="capsEventName">Event name, this must match an actual
-            packet name for a Packet to be successfully built</param>
-            <param name="body">LLSD to convert to a Packet</param>
-            <returns>A Packet on success, otherwise null</returns>
+        <member name="M:OpenMetaverse.NetworkManager.DisableSimulatorHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Width">
-            <summary>
-            Image width
-            </summary>
+        <member name="M:OpenMetaverse.NetworkManager.KickUserHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Height">
+        <member name="T:OpenMetaverse.NameValue">
             <summary>
-            Image height
+            A Name Value pair with additional settings, used in the protocol
+            primarily to transmit avatar names and active group in object packets
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Channels">
+        <member name="M:OpenMetaverse.NameValue.#ctor(System.String,OpenMetaverse.NameValue.ValueType,OpenMetaverse.NameValue.ClassType,OpenMetaverse.NameValue.SendtoType,System.Object)">
             <summary>
-            Image channel flags
+            Constructor that takes all the fields as parameters
             </summary>
+            <param name="name">
+            </param>
+            <param name="valueType">
+            </param>
+            <param name="classType">
+            </param>
+            <param name="sendtoType">
+            </param>
+            <param name="value">
+            </param>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Red">
+        <member name="M:OpenMetaverse.NameValue.#ctor(System.String)">
             <summary>
-            Red channel data
+            Constructor that takes a single line from a NameValue field
             </summary>
+            <param name="data">
+            </param>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Green">
-            <summary>
-            Green channel data
-            </summary>
+        <member name="T:OpenMetaverse.NameValue.ValueType">
+            <summary>Type of the value</summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Blue">
-            <summary>
-            Blue channel data
-            </summary>
+        <member name="F:OpenMetaverse.NameValue.ValueType.Unknown">
+            <summary>Unknown</summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Alpha">
-            <summary>
-            Alpha channel data
-            </summary>
+        <member name="F:OpenMetaverse.NameValue.ValueType.String">
+            <summary>String value</summary>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Bump">
+        <member name="F:OpenMetaverse.NameValue.ValueType.F32">
             <summary>
-            Bump channel data
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Imaging.ManagedImage.#ctor(System.Int32,System.Int32,OpenMetaverse.Imaging.ManagedImage.ImageChannels)">
+        <member name="F:OpenMetaverse.NameValue.ValueType.S32">
             <summary>
-            Create a new blank image
             </summary>
-            <param name="width">width</param>
-            <param name="height">height</param>
-            <param name="channels">channel flags</param>
         </member>
-        <member name="M:OpenMetaverse.Imaging.ManagedImage.#ctor(System.Drawing.Bitmap)">
+        <member name="F:OpenMetaverse.NameValue.ValueType.VEC3">
             <summary>
-            
             </summary>
-            <param name="bitmap"></param>
         </member>
-        <member name="M:OpenMetaverse.Imaging.ManagedImage.ConvertChannels(OpenMetaverse.Imaging.ManagedImage.ImageChannels)">
+        <member name="F:OpenMetaverse.NameValue.ValueType.U32">
             <summary>
-            Convert the channels in the image. Channels are created or destroyed as required.
             </summary>
-            <param name="channels">new channel flags</param>
         </member>
-        <member name="M:OpenMetaverse.Imaging.ManagedImage.ResizeNearestNeighbor(System.Int32,System.Int32)">
-            <summary>
-            Resize or stretch the image using nearest neighbor (ugly) resampling
-            </summary>
-            <param name="width">new width</param>
-            <param name="height">new height</param>
+        <member name="F:OpenMetaverse.NameValue.ValueType.CAMERA">
+            <summary>Deprecated</summary>
         </member>
-        <member name="M:OpenMetaverse.Imaging.ManagedImage.ExportRaw">
-            <summary>
-            Create a byte array containing 32-bit RGBA data with a bottom-left
-            origin, suitable for feeding directly into OpenGL
-            </summary>
-            <returns>A byte array containing raw texture data</returns>
+        <member name="F:OpenMetaverse.NameValue.ValueType.Asset">
+            <summary>String value, but designated as an asset</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetTexture">
+        <member name="F:OpenMetaverse.NameValue.ValueType.U64">
             <summary>
-            Represents a texture
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetTexture.Image">
-            <summary>A <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object containing image data</summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.AssetTexture.LayerInfo">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Assets.AssetTexture.Components">
-            <summary></summary>
-        </member>
-        <member name="M:OpenMetaverse.Assets.AssetTexture.#ctor">
-            <summary>Initializes a new instance of an AssetTexture object</summary>
-        </member>
-        <member name="M:OpenMetaverse.Assets.AssetTexture.#ctor(OpenMetaverse.UUID,System.Byte[])">
+        <member name="T:OpenMetaverse.NameValue.ClassType">
             <summary>
-            Initializes a new instance of an AssetTexture object
             </summary>
-            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
-            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetTexture.#ctor(OpenMetaverse.Imaging.ManagedImage)">
+        <member name="F:OpenMetaverse.NameValue.ClassType.Unknown">
             <summary>
-            Initializes a new instance of an AssetTexture object
             </summary>
-            <param name="image">A <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object containing texture data</param>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetTexture.Encode">
+        <member name="F:OpenMetaverse.NameValue.ClassType.ReadOnly">
             <summary>
-            Populates the <seealso cref="!:AssetData"/> byte array with a JPEG2000
-            encoded image created from the data in <seealso cref="F:OpenMetaverse.Assets.AssetTexture.Image"/>
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetTexture.Decode">
+        <member name="F:OpenMetaverse.NameValue.ClassType.ReadWrite">
             <summary>
-            Decodes the JPEG2000 data in <code>AssetData</code> to the
-            <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object <seealso cref="F:OpenMetaverse.Assets.AssetTexture.Image"/>
             </summary>
-            <returns>True if the decoding was successful, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetTexture.DecodeLayerBoundaries">
+        <member name="F:OpenMetaverse.NameValue.ClassType.Callback">
             <summary>
-            Decodes the begin and end byte positions for each quality layer in
-            the image
             </summary>
-            <returns></returns>
-        </member>
-        <member name="P:OpenMetaverse.Assets.AssetTexture.AssetType">
-            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.TarArchiveReader">
+        <member name="T:OpenMetaverse.NameValue.SendtoType">
             <summary>
-            Temporary code to do the bare minimum required to read a tar archive for our purposes
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.TarArchiveReader.m_br">
+        <member name="F:OpenMetaverse.NameValue.SendtoType.Unknown">
             <summary>
-            Binary reader for the underlying stream
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.TarArchiveReader.m_nullCharArray">
+        <member name="F:OpenMetaverse.NameValue.SendtoType.Sim">
             <summary>
-            Used to trim off null chars
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.TarArchiveReader.m_spaceCharArray">
+        <member name="F:OpenMetaverse.NameValue.SendtoType.DataSim">
             <summary>
-            Used to trim off space chars
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveReader.#ctor(System.IO.Stream)">
+        <member name="F:OpenMetaverse.NameValue.SendtoType.SimViewer">
             <summary>
-            Generate a tar reader which reads from the given stream.
             </summary>
-            <param name="s"></param>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ReadEntry(System.String@,OpenMetaverse.Assets.TarArchiveReader.TarEntryType@)">
+        <member name="F:OpenMetaverse.NameValue.SendtoType.DataSimViewer">
             <summary>
-            Read the next entry in the tar file.
             </summary>
-            <param name="filePath"></param>
-            <param name="entryType"></param>
-            <returns>the data for the entry.  Returns null if there are no more entries</returns>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ReadHeader">
+        <member name="F:OpenMetaverse.NameValue.Name">
             <summary>
-            Read the next 512 byte chunk of data as a tar header.
             </summary>
-            <returns>A tar header struct.  null if we have reached the end of the archive.</returns>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ReadData(System.Int32)">
+        <member name="F:OpenMetaverse.NameValue.Type">
             <summary>
-            Read data following a header
             </summary>
-            <param name="fileSize"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ConvertOctalBytesToDecimal(System.Byte[],System.Int32,System.Int32)">
+        <member name="F:OpenMetaverse.NameValue.Class">
             <summary>
-            Convert octal bytes to a decimal representation
             </summary>
-            <param name="bytes"></param>
-            <param name="count"></param>
-            <param name="startIndex"></param>
-            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.TerrainPatch.X">
-            <summary>X position of this patch</summary>
-        </member>
-        <member name="F:OpenMetaverse.TerrainPatch.Y">
-            <summary>Y position of this patch</summary>
-        </member>
-        <member name="F:OpenMetaverse.TerrainPatch.Data">
-            <summary>A 16x16 array of floats holding decompressed layer data</summary>
-        </member>
-        <member name="M:OpenMetaverse.TerrainCompressor.CreateLandPacket(System.Single[],System.Int32[])">
+        <member name="F:OpenMetaverse.NameValue.Sendto">
             <summary>
-            Creates a LayerData packet for compressed land data given a full
-            simulator heightmap and an array of indices of patches to compress
             </summary>
-            <param name="heightmap">A 256 * 256 array of floating point values
-            specifying the height at each meter in the simulator</param>
-            <param name="patches">Array of indexes in the 16x16 grid of patches
-            for this simulator. For example if 1 and 17 are specified, patches
-            x=1,y=0 and x=1,y=1 are sent</param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.TerrainCompressor.CreatePatchFromHeightmap(OpenMetaverse.BitPack,System.Single[],System.Int32,System.Int32)">
+        <member name="F:OpenMetaverse.NameValue.Value">
             <summary>
-            Add a patch of terrain to a BitPacker
             </summary>
-            <param name="output">BitPacker to write the patch to</param>
-            <param name="heightmap">Heightmap of the simulator, must be a 256 *
-            256 float array</param>
-            <param name="x">X offset of the patch to create, valid values are
-            from 0 to 15</param>
-            <param name="y">Y offset of the patch to create, valid values are
-            from 0 to 15</param>
         </member>
         <member name="T:OpenMetaverse.ReportType">
             <summary>
-            
             </summary>
         </member>
         <member name="F:OpenMetaverse.ReportType.None">
@@ -14906,7 +12936,7 @@
         </member>
         <member name="T:OpenMetaverse.CompressedFlags">
             <summary>
-            Bitflag field for ObjectUpdateCompressed data blocks, describing 
+            Bitflag field for ObjectUpdateCompressed data blocks, describing
             which options are present for each object
             </summary>
         </member>
@@ -14982,46 +13012,70 @@
         </member>
         <member name="T:OpenMetaverse.ObjectMovementUpdate">
             <summary>
-            Contains the variables sent in an object update packet for objects. 
+            Contains the variables sent in an object update packet for objects.
             Used to track position and movement of prims and avatars
             </summary>
         </member>
         <member name="F:OpenMetaverse.ObjectMovementUpdate.Avatar">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.ObjectMovementUpdate.CollisionPlane">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.ObjectMovementUpdate.State">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.ObjectMovementUpdate.LocalID">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.ObjectMovementUpdate.Position">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.ObjectMovementUpdate.Velocity">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.ObjectMovementUpdate.Acceleration">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.ObjectMovementUpdate.Rotation">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.ObjectMovementUpdate.AngularVelocity">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.ObjectMovementUpdate.Textures">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="T:OpenMetaverse.ObjectManager">
             <summary>
-            Handles all network traffic related to prims and avatar positions and 
+            Handles all network traffic related to prims and avatar positions and
             movement.
             </summary>
         </member>
+        <member name="M:OpenMetaverse.ObjectManager.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Construct a new instance of the ObjectManager class
+            </summary>
+            <param name="client">A reference to the <see cref="T:OpenMetaverse.GridClient" /> instance</param>
+        </member>
+        <member name="T:OpenMetaverse.ObjectManager.ObjectMediaCallback">
+            <summary>
+            Callback for getting object media data via CAP
+            </summary>
+            <param name="success">Indicates if the operation was succesfull</param>
+            <param name="version">Object media version string</param>
+            <param name="faceMedia">Array indexed on prim face of media entry data</param>
+        </member>
         <member name="F:OpenMetaverse.ObjectManager.m_ObjectUpdate">
             <summary>The event subscribers, null of no subscribers</summary>
         </member>
@@ -15031,44 +13085,24 @@
         <member name="F:OpenMetaverse.ObjectManager.m_ObjectProperties">
             <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.OnObjectProperties(OpenMetaverse.ObjectPropertiesEventArgs)">
-            <summary>Raises the ObjectProperties Event</summary>
-             <param name="e">A ObjectPropertiesEventArgs object containing
-             the data sent from the simulator</param>
-        </member>
         <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesUpdated">
             <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.OnObjectPropertiesUpdated(OpenMetaverse.ObjectPropertiesUpdatedEventArgs)">
-            <summary>Raises the ObjectPropertiesUpdated Event</summary>
-             <param name="e">A ObjectPropertiesUpdatedEventArgs object containing
-             the data sent from the simulator</param>
-        </member>
         <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesUpdatedLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesFamily">
             <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.OnObjectPropertiesFamily(OpenMetaverse.ObjectPropertiesFamilyEventArgs)">
-            <summary>Raises the ObjectPropertiesFamily Event</summary>
-             <param name="e">A ObjectPropertiesFamilyEventArgs object containing
-             the data sent from the simulator</param>
-        </member>
         <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesFamilyLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.ObjectManager.m_AvatarUpdate">
             <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.OnAvatarUpdate(OpenMetaverse.AvatarUpdateEventArgs)">
-            <summary>Raises the AvatarUpdate Event</summary>
-             <param name="e">A AvatarUpdateEventArgs object containing
-             the data sent from the simulator</param>
-        </member>
         <member name="F:OpenMetaverse.ObjectManager.m_AvatarUpdateLock">
             <summary>Thread sync lock object</summary>
         </member>
@@ -15081,47 +13115,33 @@
         <member name="F:OpenMetaverse.ObjectManager.m_ObjectDataBlockUpdate">
             <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.OnObjectDataBlockUpdate(OpenMetaverse.ObjectDataBlockUpdateEventArgs)">
-            <summary>Raises the ObjectDataBlockUpdate Event</summary>
-             <param name="e">A ObjectDataBlockUpdateEventArgs object containing
-             the data sent from the simulator</param>
-        </member>
         <member name="F:OpenMetaverse.ObjectManager.m_ObjectDataBlockUpdateLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.ObjectManager.m_KillObject">
             <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.OnKillObject(OpenMetaverse.KillObjectEventArgs)">
-            <summary>Raises the KillObject Event</summary>
-             <param name="e">A KillObjectEventArgs object containing
-             the data sent from the simulator</param>
-        </member>
         <member name="F:OpenMetaverse.ObjectManager.m_KillObjectLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.ObjectManager.m_AvatarSitChanged">
             <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.OnAvatarSitChanged(OpenMetaverse.AvatarSitChangedEventArgs)">
-            <summary>Raises the AvatarSitChanged Event</summary>
-             <param name="e">A AvatarSitChangedEventArgs object containing
-             the data sent from the simulator</param>
-        </member>
         <member name="F:OpenMetaverse.ObjectManager.m_AvatarSitChangedLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.ObjectManager.m_PayPriceReply">
             <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.OnPayPriceReply(OpenMetaverse.PayPriceReplyEventArgs)">
-            <summary>Raises the PayPriceReply Event</summary>
-             <param name="e">A PayPriceReplyEventArgs object containing
-             the data sent from the simulator</param>
-        </member>
         <member name="F:OpenMetaverse.ObjectManager.m_PayPriceReplyLock">
             <summary>Thread sync lock object</summary>
         </member>
+        <member name="F:OpenMetaverse.ObjectManager.m_PhysicsProperties">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.ObjectManager.m_PhysicsPropertiesLock">
+            <summary>Thread sync lock object</summary>
+        </member>
         <member name="F:OpenMetaverse.ObjectManager.Client">
             <summary>Reference to the GridClient object</summary>
         </member>
@@ -15129,18 +13149,108 @@
             <summary>Does periodic dead reckoning calculation to convert
             velocity and acceleration to new positions for objects</summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Construct a new instance of the ObjectManager class
-            </summary>
-            <param name="client">A reference to the <see cref="T:OpenMetaverse.GridClient"/> instance</param>
+        <member name="E:OpenMetaverse.ObjectManager.ObjectUpdate">
+            <summary>Raised when the simulator sends us data containing
+            A <see cref="T:OpenMetaverse.Primitive" />, Foliage or Attachment</summary>
+            <seealso cref="M:OpenMetaverse.ObjectManager.RequestObject(OpenMetaverse.Simulator,System.UInt32)" />
+            <seealso cref="M:OpenMetaverse.ObjectManager.RequestObjects(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32})" />
+        </member>
+        <member name="E:OpenMetaverse.ObjectManager.ObjectProperties">
+            <summary>Raised when the simulator sends us data containing
+            additional <seea cref="Primitive" /> information</summary>
+            <seealso cref="M:OpenMetaverse.ObjectManager.SelectObject(OpenMetaverse.Simulator,System.UInt32,System.Boolean)" />
+            <seealso cref="M:OpenMetaverse.ObjectManager.SelectObjects(OpenMetaverse.Simulator,System.UInt32[])" />
+        </member>
+        <member name="E:OpenMetaverse.ObjectManager.ObjectPropertiesUpdated">
+            <summary>Raised when the simulator sends us data containing
+            Primitive.ObjectProperties for an object we are currently tracking</summary>
+        </member>
+        <member name="E:OpenMetaverse.ObjectManager.ObjectPropertiesFamily">
+            <summary>Raised when the simulator sends us data containing
+            additional <seea cref="Primitive" /> and <see cref="T:OpenMetaverse.Avatar" /> details</summary>
+            <seealso cref="M:OpenMetaverse.ObjectManager.RequestObjectPropertiesFamily(OpenMetaverse.Simulator,OpenMetaverse.UUID,System.Boolean)" />
+        </member>
+        <member name="E:OpenMetaverse.ObjectManager.AvatarUpdate">
+            <summary>Raised when the simulator sends us data containing
+            updated information for an <see cref="T:OpenMetaverse.Avatar" /></summary>
+        </member>
+        <member name="E:OpenMetaverse.ObjectManager.TerseObjectUpdate">
+            <summary>Raised when the simulator sends us data containing
+            <see cref="T:OpenMetaverse.Primitive" /> and <see cref="T:OpenMetaverse.Avatar" /> movement changes</summary>
+        </member>
+        <member name="E:OpenMetaverse.ObjectManager.ObjectDataBlockUpdate">
+            <summary>Raised when the simulator sends us data containing
+            updates to an Objects DataBlock</summary>
+        </member>
+        <member name="E:OpenMetaverse.ObjectManager.KillObject">
+            <summary>Raised when the simulator informs us an <see cref="T:OpenMetaverse.Primitive" />
+            or <see cref="T:OpenMetaverse.Avatar" /> is no longer within view</summary>
+        </member>
+        <member name="E:OpenMetaverse.ObjectManager.AvatarSitChanged">
+            <summary>Raised when the simulator sends us data containing
+            updated sit information for our <see cref="T:OpenMetaverse.Avatar" /></summary>
+        </member>
+        <member name="E:OpenMetaverse.ObjectManager.PayPriceReply">
+            <summary>Raised when the simulator sends us data containing
+            purchase price information for a <see cref="T:OpenMetaverse.Primitive" /></summary>
+        </member>
+        <member name="E:OpenMetaverse.ObjectManager.PhysicsProperties">
+            <summary>Raised when the simulator sends us data containing
+            additional <seea cref="Primitive" /> information</summary>
+            <seealso cref="M:OpenMetaverse.ObjectManager.SelectObject(OpenMetaverse.Simulator,System.UInt32,System.Boolean)" />
+            <seealso cref="M:OpenMetaverse.ObjectManager.SelectObjects(OpenMetaverse.Simulator,System.UInt32[])" />
+        </member>
+        <member name="M:OpenMetaverse.ObjectManager.OnObjectProperties(OpenMetaverse.ObjectPropertiesEventArgs)">
+            <summary>Raises the ObjectProperties Event</summary>
+            <param name="e">A ObjectPropertiesEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.ObjectManager.OnObjectPropertiesUpdated(OpenMetaverse.ObjectPropertiesUpdatedEventArgs)">
+            <summary>Raises the ObjectPropertiesUpdated Event</summary>
+            <param name="e">A ObjectPropertiesUpdatedEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.ObjectManager.OnObjectPropertiesFamily(OpenMetaverse.ObjectPropertiesFamilyEventArgs)">
+            <summary>Raises the ObjectPropertiesFamily Event</summary>
+            <param name="e">A ObjectPropertiesFamilyEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.ObjectManager.OnAvatarUpdate(OpenMetaverse.AvatarUpdateEventArgs)">
+            <summary>Raises the AvatarUpdate Event</summary>
+            <param name="e">A AvatarUpdateEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.ObjectManager.OnObjectDataBlockUpdate(OpenMetaverse.ObjectDataBlockUpdateEventArgs)">
+            <summary>Raises the ObjectDataBlockUpdate Event</summary>
+            <param name="e">A ObjectDataBlockUpdateEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.ObjectManager.OnKillObject(OpenMetaverse.KillObjectEventArgs)">
+            <summary>Raises the KillObject Event</summary>
+            <param name="e">A KillObjectEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.ObjectManager.OnAvatarSitChanged(OpenMetaverse.AvatarSitChangedEventArgs)">
+            <summary>Raises the AvatarSitChanged Event</summary>
+            <param name="e">A AvatarSitChangedEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.ObjectManager.OnPayPriceReply(OpenMetaverse.PayPriceReplyEventArgs)">
+            <summary>Raises the PayPriceReply Event</summary>
+            <param name="e">A PayPriceReplyEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.ObjectManager.OnPhysicsProperties(OpenMetaverse.PhysicsPropertiesEventArgs)">
+            <summary>Raises the PhysicsProperties Event</summary>
+            <param name="e">A PhysicsPropertiesEventArgs object containing
+            the data sent from the simulator</param>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.RequestObject(OpenMetaverse.Simulator,System.UInt32)">
             <summary>
-            Request information for a single object from a <see cref="T:OpenMetaverse.Simulator"/> 
+            Request information for a single object from a <see cref="T:OpenMetaverse.Simulator" />
             you are currently connected to
             </summary>
-            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> the object is located</param>
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator" /> the object is located</param>
             <param name="localID">The Local ID of the object</param>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.RequestObjects(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32})">
@@ -15148,31 +13258,31 @@
             Request information for multiple objects contained in
             the same simulator
             </summary>
-            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> the objects are located</param>
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator" /> the objects are located</param>
             <param name="localIDs">An array containing the Local IDs of the objects</param>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.BuyObject(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.SaleType,System.Int32,OpenMetaverse.UUID,OpenMetaverse.UUID)">
-             <summary>
-             Attempt to purchase an original object, a copy, or the contents of
-             an object
-             </summary>
-             <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> the object is located</param>        
-             <param name="localID">The Local ID of the object</param>
-             <param name="saleType">Whether the original, a copy, or the object
-             contents are on sale. This is used for verification, if the this
-             sale type is not valid for the object the purchase will fail</param>
-             <param name="price">Price of the object. This is used for 
-             verification, if it does not match the actual price the purchase
-             will fail</param>
-             <param name="groupID">Group ID that will be associated with the new
-             purchase</param>
-             <param name="categoryID">Inventory folder UUID where the object or objects 
-             purchased should be placed</param>
-             <example>
-             <code>
-                 BuyObject(Client.Network.CurrentSim, 500, SaleType.Copy, 
-                     100, UUID.Zero, Client.Self.InventoryRootFolderUUID);
-             </code> 
+            <summary>
+            Attempt to purchase an original object, a copy, or the contents of
+            an object
+            </summary>
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator" /> the object is located</param>
+            <param name="localID">The Local ID of the object</param>
+            <param name="saleType">Whether the original, a copy, or the object
+            contents are on sale. This is used for verification, if the this
+            sale type is not valid for the object the purchase will fail</param>
+            <param name="price">Price of the object. This is used for
+            verification, if it does not match the actual price the purchase
+            will fail</param>
+            <param name="groupID">Group ID that will be associated with the new
+            purchase</param>
+            <param name="categoryID">Inventory folder UUID where the object or objects
+            purchased should be placed</param>
+            <example>
+                <code>
+            BuyObject(Client.Network.CurrentSim, 500, SaleType.Copy,
+            100, UUID.Zero, Client.Self.InventoryRootFolderUUID);
+            </code>
             </example>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.RequestPayPrice(OpenMetaverse.Simulator,OpenMetaverse.UUID)">
@@ -15180,104 +13290,120 @@
             Request prices that should be displayed in pay dialog. This will triggger the simulator
             to send us back a PayPriceReply which can be handled by OnPayPriceReply event
             </summary>
-            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> the object is located</param>
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator" /> the object is located</param>
             <param name="objectID">The ID of the object</param>
-            <remarks>The result is raised in the <see cref="E:OpenMetaverse.ObjectManager.PayPriceReply"/> event</remarks>
+            <remarks>The result is raised in the <see cref="E:OpenMetaverse.ObjectManager.PayPriceReply" /> event</remarks>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.SelectObject(OpenMetaverse.Simulator,System.UInt32)">
             <summary>
-            Select a single object. This will cause the <see cref="T:OpenMetaverse.Simulator"/> to send us 
-            an <see cref="T:OpenMetaverse.Packets.ObjectPropertiesPacket"/> which will raise the <see cref="E:OpenMetaverse.ObjectManager.ObjectProperties"/> event
+            Select a single object. This will cause the <see cref="T:OpenMetaverse.Simulator" /> to send us
+            an <see cref="T:OpenMetaverse.Packets.ObjectPropertiesPacket" /> which will raise the <see cref="E:OpenMetaverse.ObjectManager.ObjectProperties" /> event
             </summary>
-            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> the object is located</param>        
-            <param name="localID">The Local ID of the object</param>        
-            <seealso cref="T:OpenMetaverse.ObjectPropertiesFamilyEventArgs"/>
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator" /> the object is located</param>
+            <param name="localID">The Local ID of the object</param>
+            <seealso cref="T:OpenMetaverse.ObjectPropertiesFamilyEventArgs" />
         </member>
         <member name="M:OpenMetaverse.ObjectManager.SelectObject(OpenMetaverse.Simulator,System.UInt32,System.Boolean)">
             <summary>
-            Select a single object. This will cause the <see cref="T:OpenMetaverse.Simulator"/> to send us 
-            an <see cref="T:OpenMetaverse.Packets.ObjectPropertiesPacket"/> which will raise the <see cref="E:OpenMetaverse.ObjectManager.ObjectProperties"/> event
+            Select a single object. This will cause the <see cref="T:OpenMetaverse.Simulator" /> to send us
+            an <see cref="T:OpenMetaverse.Packets.ObjectPropertiesPacket" /> which will raise the <see cref="E:OpenMetaverse.ObjectManager.ObjectProperties" /> event
             </summary>
-            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> the object is located</param>
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator" /> the object is located</param>
             <param name="localID">The Local ID of the object</param>
-            <param name="automaticDeselect">if true, a call to <see cref="M:OpenMetaverse.ObjectManager.DeselectObject(OpenMetaverse.Simulator,System.UInt32)"/> is
+            <param name="automaticDeselect">if true, a call to <see cref="M:OpenMetaverse.ObjectManager.DeselectObject(OpenMetaverse.Simulator,System.UInt32)" /> is
             made immediately following the request</param>
-            <seealso cref="T:OpenMetaverse.ObjectPropertiesFamilyEventArgs"/>
+            <seealso cref="T:OpenMetaverse.ObjectPropertiesFamilyEventArgs" />
         </member>
         <member name="M:OpenMetaverse.ObjectManager.SelectObjects(OpenMetaverse.Simulator,System.UInt32[],System.Boolean)">
             <summary>
-            Select multiple objects. This will cause the <see cref="T:OpenMetaverse.Simulator"/> to send us 
-            an <see cref="T:OpenMetaverse.Packets.ObjectPropertiesPacket"/> which will raise the <see cref="E:OpenMetaverse.ObjectManager.ObjectProperties"/> event
-            </summary>        
-            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> the objects are located</param> 
+            Select multiple objects. This will cause the <see cref="T:OpenMetaverse.Simulator" /> to send us
+            an <see cref="T:OpenMetaverse.Packets.ObjectPropertiesPacket" /> which will raise the <see cref="E:OpenMetaverse.ObjectManager.ObjectProperties" /> event
+            </summary>
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator" /> the objects are located</param>
             <param name="localIDs">An array containing the Local IDs of the objects</param>
             <param name="automaticDeselect">Should objects be deselected immediately after selection</param>
-            <seealso cref="T:OpenMetaverse.ObjectPropertiesFamilyEventArgs"/>
+            <seealso cref="T:OpenMetaverse.ObjectPropertiesFamilyEventArgs" />
         </member>
         <member name="M:OpenMetaverse.ObjectManager.SelectObjects(OpenMetaverse.Simulator,System.UInt32[])">
             <summary>
-            Select multiple objects. This will cause the <see cref="T:OpenMetaverse.Simulator"/> to send us 
-            an <see cref="T:OpenMetaverse.Packets.ObjectPropertiesPacket"/> which will raise the <see cref="E:OpenMetaverse.ObjectManager.ObjectProperties"/> event
-            </summary>        
-            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> the objects are located</param> 
+            Select multiple objects. This will cause the <see cref="T:OpenMetaverse.Simulator" /> to send us
+            an <see cref="T:OpenMetaverse.Packets.ObjectPropertiesPacket" /> which will raise the <see cref="E:OpenMetaverse.ObjectManager.ObjectProperties" /> event
+            </summary>
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator" /> the objects are located</param>
             <param name="localIDs">An array containing the Local IDs of the objects</param>
-            <seealso cref="T:OpenMetaverse.ObjectPropertiesFamilyEventArgs"/>
+            <seealso cref="T:OpenMetaverse.ObjectPropertiesFamilyEventArgs" />
         </member>
         <member name="M:OpenMetaverse.ObjectManager.SetFlags(OpenMetaverse.Simulator,System.UInt32,System.Boolean,System.Boolean,System.Boolean,System.Boolean)">
             <summary>
             Update the properties of an object
             </summary>
-            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> the object is located</param>        
-            <param name="localID">The Local ID of the object</param>        
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator" /> the object is located</param>
+            <param name="localID">The Local ID of the object</param>
+            <param name="physical">true to turn the objects physical property on</param>
+            <param name="temporary">true to turn the objects temporary property on</param>
+            <param name="phantom">true to turn the objects phantom property on</param>
+            <param name="castsShadow">true to turn the objects cast shadows property on</param>
+        </member>
+        <member name="M:OpenMetaverse.ObjectManager.SetFlags(OpenMetaverse.Simulator,System.UInt32,System.Boolean,System.Boolean,System.Boolean,System.Boolean,OpenMetaverse.PhysicsShapeType,System.Single,System.Single,System.Single,System.Single)">
+            <summary>
+            Update the properties of an object
+            </summary>
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator" /> the object is located</param>
+            <param name="localID">The Local ID of the object</param>
             <param name="physical">true to turn the objects physical property on</param>
             <param name="temporary">true to turn the objects temporary property on</param>
             <param name="phantom">true to turn the objects phantom property on</param>
             <param name="castsShadow">true to turn the objects cast shadows property on</param>
+            <param name="physicsType">Type of the represetnation prim will have in the physics engine</param>
+            <param name="density">Density - normal value 1000</param>
+            <param name="friction">Friction - normal value 0.6</param>
+            <param name="restitution">Restitution - standard value 0.5</param>
+            <param name="gravityMultiplier">Gravity multiplier - standar value 1.0</param>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.SetSaleInfo(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.SaleType,System.Int32)">
             <summary>
             Sets the sale properties of a single object
             </summary>
-            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> the object is located</param>        
-            <param name="localID">The Local ID of the object</param>        
-            <param name="saleType">One of the options from the <see cref="T:OpenMetaverse.SaleType"/> enum</param>
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator" /> the object is located</param>
+            <param name="localID">The Local ID of the object</param>
+            <param name="saleType">One of the options from the <see cref="T:OpenMetaverse.SaleType" /> enum</param>
             <param name="price">The price of the object</param>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.SetSaleInfo(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32},OpenMetaverse.SaleType,System.Int32)">
             <summary>
             Sets the sale properties of multiple objects
-            </summary>        
-            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> the objects are located</param> 
+            </summary>
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator" /> the objects are located</param>
             <param name="localIDs">An array containing the Local IDs of the objects</param>
-            <param name="saleType">One of the options from the <see cref="T:OpenMetaverse.SaleType"/> enum</param>
+            <param name="saleType">One of the options from the <see cref="T:OpenMetaverse.SaleType" /> enum</param>
             <param name="price">The price of the object</param>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.DeselectObject(OpenMetaverse.Simulator,System.UInt32)">
             <summary>
             Deselect a single object
             </summary>
-            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> the object is located</param>        
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator" /> the object is located</param>
             <param name="localID">The Local ID of the object</param>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.DeselectObjects(OpenMetaverse.Simulator,System.UInt32[])">
             <summary>
             Deselect multiple objects.
             </summary>
-            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> the objects are located</param> 
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator" /> the objects are located</param>
             <param name="localIDs">An array containing the Local IDs of the objects</param>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.ClickObject(OpenMetaverse.Simulator,System.UInt32)">
             <summary>
             Perform a click action on an object
             </summary>
-            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> the object is located</param>        
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator" /> the object is located</param>
             <param name="localID">The Local ID of the object</param>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.ClickObject(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Vector3,OpenMetaverse.Vector3,System.Int32,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
             <summary>
             Perform a click action (Grab) on a single object
             </summary>
-            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> the object is located</param>        
+            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator" /> the object is located</param>
             <param name="localID">The Local ID of the object</param>
             <param name="uvCoord">The texture coordinates to touch</param>
             <param name="stCoord">The surface coordinates to touch</param>
@@ -15291,7 +13417,7 @@
             <summary>
             Create (rez) a new prim object in a simulator
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object to place the object in</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object to place the object in</param>
             <param name="prim">Data describing the prim object to rez</param>
             <param name="groupID">Group ID that this prim will be set to, or UUID.Zero if you
             do not want the object to be associated with a specific group</param>
@@ -15300,40 +13426,40 @@
             <param name="rotation">Rotation quaternion to rotate this prim</param>
             <remarks>Due to the way client prim rezzing is done on the server,
             the requested position for an object is only close to where the prim
-            actually ends up. If you desire exact placement you'll need to 
+            actually ends up. If you desire exact placement you'll need to
             follow up by moving the object after it has been created. This
-            function will not set textures, light and flexible data, or other 
+            function will not set textures, light and flexible data, or other
             extended primitive properties</remarks>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.AddPrim(OpenMetaverse.Simulator,OpenMetaverse.Primitive.ConstructionData,OpenMetaverse.UUID,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Quaternion,OpenMetaverse.PrimFlags)">
             <summary>
             Create (rez) a new prim object in a simulator
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object to place the object in</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object to place the object in</param>
             <param name="prim">Data describing the prim object to rez</param>
             <param name="groupID">Group ID that this prim will be set to, or UUID.Zero if you
             do not want the object to be associated with a specific group</param>
             <param name="position">An approximation of the position at which to rez the prim</param>
             <param name="scale">Scale vector to size this prim</param>
             <param name="rotation">Rotation quaternion to rotate this prim</param>
-            <param name="createFlags">Specify the <seealso cref="T:OpenMetaverse.PrimFlags"/></param>
+            <param name="createFlags">Specify the <seealso cref="T:OpenMetaverse.PrimFlags" /></param>
             <remarks>Due to the way client prim rezzing is done on the server,
             the requested position for an object is only close to where the prim
-            actually ends up. If you desire exact placement you'll need to 
+            actually ends up. If you desire exact placement you'll need to
             follow up by moving the object after it has been created. This
-            function will not set textures, light and flexible data, or other 
+            function will not set textures, light and flexible data, or other
             extended primitive properties</remarks>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.AddTree(OpenMetaverse.Simulator,OpenMetaverse.Vector3,OpenMetaverse.Quaternion,OpenMetaverse.Vector3,OpenMetaverse.Tree,OpenMetaverse.UUID,System.Boolean)">
             <summary>
             Rez a Linden tree
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the object resides</param>
             <param name="scale">The size of the tree</param>
             <param name="rotation">The rotation of the tree</param>
             <param name="position">The position of the tree</param>
             <param name="treeType">The Type of tree</param>
-            <param name="groupOwner">The <seealso cref="T:OpenMetaverse.UUID"/> of the group to set the tree to, 
+            <param name="groupOwner">The <seealso cref="T:OpenMetaverse.UUID" /> of the group to set the tree to,
             or UUID.Zero if no group is to be set</param>
             <param name="newTree">true to use the "new" Linden trees, false to use the old</param>
         </member>
@@ -15341,19 +13467,19 @@
             <summary>
             Rez grass and ground cover
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the object resides</param>
             <param name="scale">The size of the grass</param>
             <param name="rotation">The rotation of the grass</param>
             <param name="position">The position of the grass</param>
-            <param name="grassType">The type of grass from the <seealso cref="T:OpenMetaverse.Grass"/> enum</param>
-            <param name="groupOwner">The <seealso cref="T:OpenMetaverse.UUID"/> of the group to set the tree to, 
+            <param name="grassType">The type of grass from the <seealso cref="T:OpenMetaverse.Grass" /> enum</param>
+            <param name="groupOwner">The <seealso cref="T:OpenMetaverse.UUID" /> of the group to set the tree to,
             or UUID.Zero if no group is to be set</param>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.SetTextures(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Primitive.TextureEntry)">
             <summary>
             Set the textures to apply to the faces of an object
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the object resides</param>
             <param name="localID">The objects ID which is local to the simulator the object is in</param>
             <param name="textures">The texture data to apply</param>
         </member>
@@ -15361,7 +13487,7 @@
             <summary>
             Set the textures to apply to the faces of an object
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the object resides</param>
             <param name="localID">The objects ID which is local to the simulator the object is in</param>
             <param name="textures">The texture data to apply</param>
             <param name="mediaUrl">A media URL (not used)</param>
@@ -15370,31 +13496,31 @@
             <summary>
             Set the Light data on an object
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the object resides</param>
             <param name="localID">The objects ID which is local to the simulator the object is in</param>
-            <param name="light">A <seealso cref="T:OpenMetaverse.Primitive.LightData"/> object containing the data to set</param>
+            <param name="light">A <seealso cref="T:OpenMetaverse.Primitive.LightData" /> object containing the data to set</param>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.SetFlexible(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Primitive.FlexibleData)">
             <summary>
             Set the flexible data on an object
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the object resides</param>
             <param name="localID">The objects ID which is local to the simulator the object is in</param>
-            <param name="flexible">A <seealso cref="T:OpenMetaverse.Primitive.FlexibleData"/> object containing the data to set</param>
+            <param name="flexible">A <seealso cref="T:OpenMetaverse.Primitive.FlexibleData" /> object containing the data to set</param>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.SetSculpt(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Primitive.SculptData)">
             <summary>
             Set the sculptie texture and data on an object
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the object resides</param>
             <param name="localID">The objects ID which is local to the simulator the object is in</param>
-            <param name="sculpt">A <seealso cref="T:OpenMetaverse.Primitive.SculptData"/> object containing the data to set</param>
+            <param name="sculpt">A <seealso cref="T:OpenMetaverse.Primitive.SculptData" /> object containing the data to set</param>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.SetExtraParamOff(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.ExtraParamType)">
             <summary>
             Unset additional primitive parameters on an object
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the object resides</param>
             <param name="localID">The objects ID which is local to the simulator the object is in</param>
             <param name="type">The extra parameters to set</param>
         </member>
@@ -15402,7 +13528,7 @@
             <summary>
             Link multiple prims into a linkset
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the objects reside</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the objects reside</param>
             <param name="localIDs">An array which contains the IDs of the objects to link</param>
             <remarks>The last object in the array will be the root object of the linkset TODO: Is this true?</remarks>
         </member>
@@ -15410,14 +13536,14 @@
             <summary>
             Delink/Unlink multiple prims from a linkset
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the objects reside</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the objects reside</param>
             <param name="localIDs">An array which contains the IDs of the objects to delink</param>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.SetRotation(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Quaternion)">
             <summary>
             Change the rotation of an object
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the object resides</param>
             <param name="localID">The objects ID which is local to the simulator the object is in</param>
             <param name="rotation">The new rotation of the object</param>
         </member>
@@ -15425,7 +13551,7 @@
             <summary>
             Set the name of an object
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the object resides</param>
             <param name="localID">The objects ID which is local to the simulator the object is in</param>
             <param name="name">A string containing the new name of the object</param>
         </member>
@@ -15433,7 +13559,7 @@
             <summary>
             Set the name of multiple objects
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the objects reside</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the objects reside</param>
             <param name="localIDs">An array which contains the IDs of the objects to change the name of</param>
             <param name="names">An array which contains the new names of the objects</param>
         </member>
@@ -15441,7 +13567,7 @@
             <summary>
             Set the description of an object
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the object resides</param>
             <param name="localID">The objects ID which is local to the simulator the object is in</param>
             <param name="description">A string containing the new description of the object</param>
         </member>
@@ -15449,7 +13575,7 @@
             <summary>
             Set the descriptions of multiple objects
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the objects reside</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the objects reside</param>
             <param name="localIDs">An array which contains the IDs of the objects to change the description of</param>
             <param name="descriptions">An array which contains the new descriptions of the objects</param>
         </member>
@@ -15457,7 +13583,7 @@
             <summary>
             Attach an object to this avatar
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the object resides</param>
             <param name="localID">The objects ID which is local to the simulator the object is in</param>
             <param name="attachPoint">The point on the avatar the object will be attached</param>
             <param name="rotation">The rotation of the attached object</param>
@@ -15466,7 +13592,7 @@
             <summary>
             Drop an attached object from this avatar
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" />
             object where the objects reside. This will always be the simulator the avatar is currently in
             </param>
             <param name="localID">The object's ID which is local to the simulator the object is in</param>
@@ -15475,9 +13601,8 @@
             <summary>
             Detach an object from yourself
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> 
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" />
             object where the objects reside
-            
             This will always be the simulator the avatar is currently in
             </param>
             <param name="localIDs">An array which contains the IDs of the objects to detach</param>
@@ -15486,7 +13611,7 @@
             <summary>
             Change the position of an object, Will change position of entire linkset
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the object resides</param>
             <param name="localID">The objects ID which is local to the simulator the object is in</param>
             <param name="position">The new position of the object</param>
         </member>
@@ -15494,7 +13619,7 @@
             <summary>
             Change the position of an object
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the object resides</param>
             <param name="localID">The objects ID which is local to the simulator the object is in</param>
             <param name="position">The new position of the object</param>
             <param name="childOnly">if true, will change position of (this) child prim only, not entire linkset</param>
@@ -15503,7 +13628,7 @@
             <summary>
             Change the Scale (size) of an object
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the object resides</param>
             <param name="localID">The objects ID which is local to the simulator the object is in</param>
             <param name="scale">The new scale of the object</param>
             <param name="childOnly">If true, will change scale of this prim only, not entire linkset</param>
@@ -15513,7 +13638,7 @@
             <summary>
             Change the Rotation of an object that is either a child or a whole linkset
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the object resides</param>
             <param name="localID">The objects ID which is local to the simulator the object is in</param>
             <param name="quat">The new scale of the object</param>
             <param name="childOnly">If true, will change rotation of this prim only, not entire linkset</param>
@@ -15522,51 +13647,52 @@
             <summary>
             Send a Multiple Object Update packet to change the size, scale or rotation of a primitive
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the object resides</param>
             <param name="localID">The objects ID which is local to the simulator the object is in</param>
             <param name="data">The new rotation, size, or position of the target object</param>
-            <param name="type">The flags from the <seealso cref="T:OpenMetaverse.UpdateType"/> Enum</param>
+            <param name="type">The flags from the <seealso cref="T:OpenMetaverse.UpdateType" /> Enum</param>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.DeedObject(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.UUID)">
             <summary>
             Deed an object (prim) to a group, Object must be shared with group which
             can be accomplished with SetPermissions()
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the object resides</param>
             <param name="localID">The objects ID which is local to the simulator the object is in</param>
-            <param name="groupOwner">The <seealso cref="T:OpenMetaverse.UUID"/> of the group to deed the object to</param>
+            <param name="groupOwner">The <seealso cref="T:OpenMetaverse.UUID" /> of the group to deed the object to</param>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.DeedObjects(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32},OpenMetaverse.UUID)">
             <summary>
             Deed multiple objects (prims) to a group, Objects must be shared with group which
             can be accomplished with SetPermissions()
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the object resides</param>
             <param name="localIDs">An array which contains the IDs of the objects to deed</param>
-            <param name="groupOwner">The <seealso cref="T:OpenMetaverse.UUID"/> of the group to deed the object to</param>
+            <param name="groupOwner">The <seealso cref="T:OpenMetaverse.UUID" /> of the group to deed the object to</param>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.SetPermissions(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32},OpenMetaverse.PermissionWho,OpenMetaverse.PermissionMask,System.Boolean)">
             <summary>
             Set the permissions on multiple objects
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the objects reside</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the objects reside</param>
             <param name="localIDs">An array which contains the IDs of the objects to set the permissions on</param>
             <param name="who">The new Who mask to set</param>
-            <param name="permissions">The new Permissions mark to set</param>
-            <param name="set">TODO: What does this do?</param>
+            <param name="permissions">Which permission to modify</param>
+            <param name="set">The new state of permission</param>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.RequestObjectPropertiesFamily(OpenMetaverse.Simulator,OpenMetaverse.UUID)">
             <summary>
             Request additional properties for an object
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
-            <param name="objectID"></param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the object resides</param>
+            <param name="objectID">
+            </param>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.RequestObjectPropertiesFamily(OpenMetaverse.Simulator,OpenMetaverse.UUID,System.Boolean)">
             <summary>
             Request additional properties for an object
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the object resides</param>
             <param name="objectID">Absolute UUID of the object</param>
             <param name="reliable">Whether to require server acknowledgement of this request</param>
         </member>
@@ -15574,7 +13700,7 @@
             <summary>
             Set the ownership of a list of objects to the specified group
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the objects reside</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the objects reside</param>
             <param name="localIds">An array which contains the IDs of the objects to set the group id on</param>
             <param name="groupID">The Groups ID</param>
         </member>
@@ -15593,7 +13719,7 @@
             </summary>
             <param name="primID">UUID of the prim</param>
             <param name="faceMedia">Array the length of prims number of faces. Null on face indexes where there is
-            no media, <seealso cref="T:OpenMetaverse.MediaEntry"/> on faces which contain the media</param>
+            no media, <seealso cref="T:OpenMetaverse.MediaEntry" /> on faces which contain the media</param>
             <param name="sim">Simulatior in which prim is located</param>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.RequestObjectMedia(OpenMetaverse.UUID,OpenMetaverse.Simulator,OpenMetaverse.ObjectManager.ObjectMediaCallback)">
@@ -15648,34 +13774,48 @@
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
         </member>
+        <member name="M:OpenMetaverse.ObjectManager.ObjectPhysicsPropertiesHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
+            <summary>
+            </summary>
+            <param name="capsKey">
+            </param>
+            <param name="message">
+            </param>
+            <param name="simulator">
+            </param>
+        </member>
         <member name="M:OpenMetaverse.ObjectManager.BuildBasicShape(OpenMetaverse.PrimType)">
             <summary>
             Setup construction data for a basic primitive shape
             </summary>
             <param name="type">Primitive shape to construct</param>
-            <returns>Construction data that can be plugged into a <seealso cref="T:OpenMetaverse.Primitive"/></returns>
+            <returns>Construction data that can be plugged into a <seealso cref="T:OpenMetaverse.Primitive" /></returns>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.SetAvatarSittingOn(OpenMetaverse.Simulator,OpenMetaverse.Avatar,System.UInt32,System.UInt32)">
             <summary>
-            
             </summary>
-            <param name="sim"></param>
-            <param name="av"></param>
-            <param name="localid"></param>
-            <param name="oldSeatID"></param>
+            <param name="sim">
+            </param>
+            <param name="av">
+            </param>
+            <param name="localid">
+            </param>
+            <param name="oldSeatID">
+            </param>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.UpdateDilation(OpenMetaverse.Simulator,System.UInt32)">
             <summary>
-            
             </summary>
-            <param name="s"></param>
-            <param name="dilation"></param>
+            <param name="s">
+            </param>
+            <param name="dilation">
+            </param>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.SetShape(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Primitive.ConstructionData)">
             <summary>
             Set the Shape data of an object
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the object resides</param>
             <param name="localID">The objects ID which is local to the simulator the object is in</param>
             <param name="prim">Data describing the prim shape</param>
         </member>
@@ -15683,107 +13823,58 @@
             <summary>
             Set the Material data of an object
             </summary>
-            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator"/> object where the object resides</param>
+            <param name="simulator">A reference to the <seealso cref="T:OpenMetaverse.Simulator" /> object where the object resides</param>
             <param name="localID">The objects ID which is local to the simulator the object is in</param>
             <param name="material">The new material of the object</param>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.GetPrimitive(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.UUID)">
             <summary>
-            
             </summary>
-            <param name="simulator"></param>
-            <param name="localID"></param>
-            <param name="fullID"></param>
-            <returns></returns>
+            <param name="simulator">
+            </param>
+            <param name="localID">
+            </param>
+            <param name="fullID">
+            </param>
+            <returns>
+            </returns>
         </member>
         <member name="M:OpenMetaverse.ObjectManager.GetAvatar(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.UUID)">
             <summary>
-            
-            </summary>
-            <param name="simulator"></param>
-            <param name="localID"></param>
-            <param name="fullID"></param>
-            <returns></returns>
-        </member>
-        <member name="E:OpenMetaverse.ObjectManager.ObjectUpdate">
-            <summary>Raised when the simulator sends us data containing
-            A <see cref="T:OpenMetaverse.Primitive"/>, Foliage or Attachment</summary>
-            <seealso cref="M:OpenMetaverse.ObjectManager.RequestObject(OpenMetaverse.Simulator,System.UInt32)"/>
-            <seealso cref="M:OpenMetaverse.ObjectManager.RequestObjects(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32})"/>
-        </member>
-        <member name="E:OpenMetaverse.ObjectManager.ObjectProperties">
-            <summary>Raised when the simulator sends us data containing
-            additional <seea cref="T:OpenMetaverse.Primitive"/> information</summary>
-            <seealso cref="M:OpenMetaverse.ObjectManager.SelectObject(OpenMetaverse.Simulator,System.UInt32)"/>
-            <seealso cref="M:OpenMetaverse.ObjectManager.SelectObjects(OpenMetaverse.Simulator,System.UInt32[],System.Boolean)"/>
-        </member>
-        <member name="E:OpenMetaverse.ObjectManager.ObjectPropertiesUpdated">
-            <summary>Raised when the simulator sends us data containing
-            Primitive.ObjectProperties for an object we are currently tracking</summary>
-        </member>
-        <member name="E:OpenMetaverse.ObjectManager.ObjectPropertiesFamily">
-            <summary>Raised when the simulator sends us data containing
-            additional <seea cref="T:OpenMetaverse.Primitive"/> and <see cref="T:OpenMetaverse.Avatar"/> details</summary>
-            <seealso cref="M:OpenMetaverse.ObjectManager.RequestObjectPropertiesFamily(OpenMetaverse.Simulator,OpenMetaverse.UUID)"/>
-        </member>
-        <member name="E:OpenMetaverse.ObjectManager.AvatarUpdate">
-            <summary>Raised when the simulator sends us data containing
-            updated information for an <see cref="T:OpenMetaverse.Avatar"/></summary>
-        </member>
-        <member name="E:OpenMetaverse.ObjectManager.TerseObjectUpdate">
-            <summary>Raised when the simulator sends us data containing
-            <see cref="T:OpenMetaverse.Primitive"/> and <see cref="T:OpenMetaverse.Avatar"/> movement changes</summary>
-        </member>
-        <member name="E:OpenMetaverse.ObjectManager.ObjectDataBlockUpdate">
-            <summary>Raised when the simulator sends us data containing
-            updates to an Objects DataBlock</summary>
-        </member>
-        <member name="E:OpenMetaverse.ObjectManager.KillObject">
-            <summary>Raised when the simulator informs us an <see cref="T:OpenMetaverse.Primitive"/>
-            or <see cref="T:OpenMetaverse.Avatar"/> is no longer within view</summary>
-        </member>
-        <member name="E:OpenMetaverse.ObjectManager.AvatarSitChanged">
-            <summary>Raised when the simulator sends us data containing
-            updated sit information for our <see cref="T:OpenMetaverse.Avatar"/></summary>
-        </member>
-        <member name="E:OpenMetaverse.ObjectManager.PayPriceReply">
-            <summary>Raised when the simulator sends us data containing
-            purchase price information for a <see cref="T:OpenMetaverse.Primitive"/></summary>
-        </member>
-        <member name="T:OpenMetaverse.ObjectManager.ObjectMediaCallback">
-            <summary>
-            Callback for getting object media data via CAP
             </summary>
-            <param name="success">Indicates if the operation was succesfull</param>
-            <param name="version">Object media version string</param>
-            <param name="faceMedia">Array indexed on prim face of media entry data</param>
+            <param name="simulator">
+            </param>
+            <param name="localID">
+            </param>
+            <param name="fullID">
+            </param>
+            <returns>
+            </returns>
         </member>
         <member name="T:OpenMetaverse.PrimEventArgs">
-             <summary>Provides data for the <see cref="E:OpenMetaverse.ObjectManager.ObjectUpdate"/> event</summary>
-             <remarks><para>The <see cref="E:OpenMetaverse.ObjectManager.ObjectUpdate"/> event occurs when the simulator sends
-             an <see cref="T:OpenMetaverse.Packets.ObjectUpdatePacket"/> containing a Primitive, Foliage or Attachment data</para>
-             <para>Note 1: The <see cref="E:OpenMetaverse.ObjectManager.ObjectUpdate"/> event will not be raised when the object is an Avatar</para>
-             <para>Note 2: It is possible for the <see cref="E:OpenMetaverse.ObjectManager.ObjectUpdate"/> to be 
-             raised twice for the same object if for example the primitive moved to a new simulator, then returned to the current simulator or
-             if an Avatar crosses the border into a new simulator and returns to the current simulator</para>
-             </remarks>
-             <example>
-             The following code example uses the <see cref="P:OpenMetaverse.PrimEventArgs.Prim"/>, <see cref="P:OpenMetaverse.PrimEventArgs.Simulator"/>, and <see cref="P:OpenMetaverse.PrimEventArgs.IsAttachment"/>
-             properties to display new Primitives and Attachments on the <see cref="T:System.Console"/> window.
-             <code>
-                 // Subscribe to the event that gives us prim and foliage information
-                 Client.Objects.ObjectUpdate += Objects_ObjectUpdate;
-                 
-            
-                 private void Objects_ObjectUpdate(object sender, PrimEventArgs e)
-                 {
-                     Console.WriteLine("Primitive {0} {1} in {2} is an attachment {3}", e.Prim.ID, e.Prim.LocalID, e.Simulator.Name, e.IsAttachment);
-                 }
-             </code>
-             </example>
-             <seealso cref="E:OpenMetaverse.ObjectManager.ObjectUpdate"/>
-             <seealso cref="E:OpenMetaverse.ObjectManager.AvatarUpdate"/>
-             <seealso cref="T:OpenMetaverse.AvatarUpdateEventArgs"/>
+            <summary>Provides data for the <see cref="E:OpenMetaverse.ObjectManager.ObjectUpdate" /> event</summary>
+            <remarks>
+                <para>The <see cref="E:OpenMetaverse.ObjectManager.ObjectUpdate" /> event occurs when the simulator sends
+            an <see cref="T:OpenMetaverse.Packets.ObjectUpdatePacket" /> containing a Primitive, Foliage or Attachment data</para>
+                <para>Note 1: The <see cref="E:OpenMetaverse.ObjectManager.ObjectUpdate" /> event will not be raised when the object is an Avatar</para>
+                <para>Note 2: It is possible for the <see cref="E:OpenMetaverse.ObjectManager.ObjectUpdate" /> to be
+            raised twice for the same object if for example the primitive moved to a new simulator, then returned to the current simulator or
+            if an Avatar crosses the border into a new simulator and returns to the current simulator</para>
+            </remarks>
+            <example>
+            The following code example uses the <see cref="P:OpenMetaverse.PrimEventArgs.Prim" />, <see cref="P:OpenMetaverse.PrimEventArgs.Simulator" />, and <see cref="P:OpenMetaverse.PrimEventArgs.IsAttachment" />
+            properties to display new Primitives and Attachments on the <see cref="T:System.Console" /> window.
+            <code>
+            // Subscribe to the event that gives us prim and foliage information
+            Client.Objects.ObjectUpdate += Objects_ObjectUpdate;
+            private void Objects_ObjectUpdate(object sender, PrimEventArgs e)
+            {
+            Console.WriteLine("Primitive {0} {1} in {2} is an attachment {3}", e.Prim.ID, e.Prim.LocalID, e.Simulator.Name, e.IsAttachment);
+            }
+            </code></example>
+            <seealso cref="E:OpenMetaverse.ObjectManager.ObjectUpdate" />
+            <seealso cref="E:OpenMetaverse.ObjectManager.AvatarUpdate" />
+            <seealso cref="T:OpenMetaverse.AvatarUpdateEventArgs" />
         </member>
         <member name="M:OpenMetaverse.PrimEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Primitive,System.UInt16,System.Boolean,System.Boolean)">
             <summary>
@@ -15796,72 +13887,70 @@
             <param name="isAttachment">true if the primitive represents an attachment to an agent</param>
         </member>
         <member name="P:OpenMetaverse.PrimEventArgs.Simulator">
-            <summary>Get the simulator the <see cref="T:OpenMetaverse.Primitive"/> originated from</summary>
+            <summary>Get the simulator the <see cref="T:OpenMetaverse.Primitive" /> originated from</summary>
         </member>
         <member name="P:OpenMetaverse.PrimEventArgs.Prim">
-            <summary>Get the <see cref="T:OpenMetaverse.Primitive"/> details</summary>
+            <summary>Get the <see cref="T:OpenMetaverse.Primitive" /> details</summary>
         </member>
         <member name="P:OpenMetaverse.PrimEventArgs.IsNew">
-            <summary>true if the <see cref="T:OpenMetaverse.Primitive"/> did not exist in the dictionary before this update (always true if object tracking has been disabled)</summary>
+            <summary>true if the <see cref="T:OpenMetaverse.Primitive" /> did not exist in the dictionary before this update (always true if object tracking has been disabled)</summary>
         </member>
         <member name="P:OpenMetaverse.PrimEventArgs.IsAttachment">
-            <summary>true if the <see cref="T:OpenMetaverse.Primitive"/> is attached to an <see cref="T:OpenMetaverse.Avatar"/></summary>
+            <summary>true if the <see cref="T:OpenMetaverse.Primitive" /> is attached to an <see cref="T:OpenMetaverse.Avatar" /></summary>
         </member>
         <member name="P:OpenMetaverse.PrimEventArgs.TimeDilation">
             <summary>Get the simulator Time Dilation</summary>
         </member>
         <member name="T:OpenMetaverse.AvatarUpdateEventArgs">
-             <summary>Provides data for the <see cref="E:OpenMetaverse.ObjectManager.AvatarUpdate"/> event</summary>
-             <remarks><para>The <see cref="E:OpenMetaverse.ObjectManager.AvatarUpdate"/> event occurs when the simulator sends
-             an <see cref="T:OpenMetaverse.Packets.ObjectUpdatePacket"/> containing Avatar data</para>    
-             <para>Note 1: The <see cref="E:OpenMetaverse.ObjectManager.AvatarUpdate"/> event will not be raised when the object is an Avatar</para>
-             <para>Note 2: It is possible for the <see cref="E:OpenMetaverse.ObjectManager.AvatarUpdate"/> to be 
-             raised twice for the same avatar if for example the avatar moved to a new simulator, then returned to the current simulator</para>
-             </remarks>
-             <example>
-             The following code example uses the <see cref="P:OpenMetaverse.AvatarUpdateEventArgs.Avatar"/> property to make a request for the top picks
-             using the <see cref="M:OpenMetaverse.AvatarManager.RequestAvatarPicks(OpenMetaverse.UUID)"/> method in the <see cref="T:OpenMetaverse.AvatarManager"/> class to display the names
-             of our own agents picks listings on the <see cref="T:System.Console"/> window.
-             <code>
-                 // subscribe to the AvatarUpdate event to get our information
-                 Client.Objects.AvatarUpdate += Objects_AvatarUpdate;
-                 Client.Avatars.AvatarPicksReply += Avatars_AvatarPicksReply;
-                 
-                 private void Objects_AvatarUpdate(object sender, AvatarUpdateEventArgs e)
-                 {
-                     // we only want our own data
-                     if (e.Avatar.LocalID == Client.Self.LocalID)
-                     {    
-                         // Unsubscribe from the avatar update event to prevent a loop
-                         // where we continually request the picks every time we get an update for ourselves
-                         Client.Objects.AvatarUpdate -= Objects_AvatarUpdate;
-                         // make the top picks request through AvatarManager
-                         Client.Avatars.RequestAvatarPicks(e.Avatar.ID);
-                     }
-                 }
-            
-                 private void Avatars_AvatarPicksReply(object sender, AvatarPicksReplyEventArgs e)
-                 {
-                     // we'll unsubscribe from the AvatarPicksReply event since we now have the data 
-                     // we were looking for
-                     Client.Avatars.AvatarPicksReply -= Avatars_AvatarPicksReply;
-                     // loop through the dictionary and extract the names of the top picks from our profile
-                     foreach (var pickName in e.Picks.Values)
-                     {
-                         Console.WriteLine(pickName);
-                     }
-                 }
-             </code>
-             </example>
-             <seealso cref="E:OpenMetaverse.ObjectManager.ObjectUpdate"/>
-             <seealso cref="T:OpenMetaverse.PrimEventArgs"/>
+            <summary>Provides data for the <see cref="E:OpenMetaverse.ObjectManager.AvatarUpdate" /> event</summary>
+            <remarks>
+                <para>The <see cref="E:OpenMetaverse.ObjectManager.AvatarUpdate" /> event occurs when the simulator sends
+            an <see cref="T:OpenMetaverse.Packets.ObjectUpdatePacket" /> containing Avatar data</para>
+                <para>Note 1: The <see cref="E:OpenMetaverse.ObjectManager.AvatarUpdate" /> event will not be raised when the object is an Avatar</para>
+                <para>Note 2: It is possible for the <see cref="E:OpenMetaverse.ObjectManager.AvatarUpdate" /> to be
+            raised twice for the same avatar if for example the avatar moved to a new simulator, then returned to the current simulator</para>
+            </remarks>
+            <example>
+            The following code example uses the <see cref="P:OpenMetaverse.AvatarUpdateEventArgs.Avatar" /> property to make a request for the top picks
+            using the <see cref="M:OpenMetaverse.AvatarManager.RequestAvatarPicks(OpenMetaverse.UUID)" /> method in the <see cref="T:OpenMetaverse.AvatarManager" /> class to display the names
+            of our own agents picks listings on the <see cref="T:System.Console" /> window.
+            <code>
+            // subscribe to the AvatarUpdate event to get our information
+            Client.Objects.AvatarUpdate += Objects_AvatarUpdate;
+            Client.Avatars.AvatarPicksReply += Avatars_AvatarPicksReply;
+            private void Objects_AvatarUpdate(object sender, AvatarUpdateEventArgs e)
+            {
+            // we only want our own data
+            if (e.Avatar.LocalID == Client.Self.LocalID)
+            {
+            // Unsubscribe from the avatar update event to prevent a loop
+            // where we continually request the picks every time we get an update for ourselves
+            Client.Objects.AvatarUpdate -= Objects_AvatarUpdate;
+            // make the top picks request through AvatarManager
+            Client.Avatars.RequestAvatarPicks(e.Avatar.ID);
+            }
+            }
+            private void Avatars_AvatarPicksReply(object sender, AvatarPicksReplyEventArgs e)
+            {
+            // we'll unsubscribe from the AvatarPicksReply event since we now have the data
+            // we were looking for
+            Client.Avatars.AvatarPicksReply -= Avatars_AvatarPicksReply;
+            // loop through the dictionary and extract the names of the top picks from our profile
+            foreach (var pickName in e.Picks.Values)
+            {
+            Console.WriteLine(pickName);
+            }
+            }
+            </code></example>
+            <seealso cref="E:OpenMetaverse.ObjectManager.ObjectUpdate" />
+            <seealso cref="T:OpenMetaverse.PrimEventArgs" />
         </member>
         <member name="M:OpenMetaverse.AvatarUpdateEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Avatar,System.UInt16,System.Boolean)">
             <summary>
             Construct a new instance of the AvatarUpdateEventArgs class
             </summary>
             <param name="simulator">The simulator the packet originated from</param>
-            <param name="avatar">The <see cref="P:OpenMetaverse.AvatarUpdateEventArgs.Avatar"/> data</param>
+            <param name="avatar">The <see cref="T:OpenMetaverse.Avatar" /> data</param>
             <param name="timeDilation">The simulator time dilation</param>
             <param name="isNew">The avatar was not in the dictionary before this update</param>
         </member>
@@ -15869,37 +13958,36 @@
             <summary>Get the simulator the object originated from</summary>
         </member>
         <member name="P:OpenMetaverse.AvatarUpdateEventArgs.Avatar">
-            <summary>Get the <see cref="P:OpenMetaverse.AvatarUpdateEventArgs.Avatar"/> data</summary>
+            <summary>Get the <see cref="T:OpenMetaverse.Avatar" /> data</summary>
         </member>
         <member name="P:OpenMetaverse.AvatarUpdateEventArgs.TimeDilation">
             <summary>Get the simulator time dilation</summary>
         </member>
         <member name="P:OpenMetaverse.AvatarUpdateEventArgs.IsNew">
-            <summary>true if the <see cref="P:OpenMetaverse.AvatarUpdateEventArgs.Avatar"/> did not exist in the dictionary before this update (always true if avatar tracking has been disabled)</summary>
+            <summary>true if the <see cref="T:OpenMetaverse.Avatar" /> did not exist in the dictionary before this update (always true if avatar tracking has been disabled)</summary>
         </member>
         <member name="T:OpenMetaverse.ObjectPropertiesEventArgs">
-            <summary>Provides additional primitive data for the <see cref="E:OpenMetaverse.ObjectManager.ObjectProperties"/> event</summary>
-            <remarks><para>The <see cref="E:OpenMetaverse.ObjectManager.ObjectProperties"/> event occurs when the simulator sends
-            an <see cref="T:OpenMetaverse.Packets.ObjectPropertiesPacket"/> containing additional details for a Primitive, Foliage data or Attachment data</para>
-            <para>The <see cref="E:OpenMetaverse.ObjectManager.ObjectProperties"/> event is also raised when a <see cref="M:OpenMetaverse.ObjectManager.SelectObject(OpenMetaverse.Simulator,System.UInt32)"/> request is
+            <summary>Provides additional primitive data for the <see cref="E:OpenMetaverse.ObjectManager.ObjectProperties" /> event</summary>
+            <remarks>
+                <para>The <see cref="E:OpenMetaverse.ObjectManager.ObjectProperties" /> event occurs when the simulator sends
+            an <see cref="T:OpenMetaverse.Packets.ObjectPropertiesPacket" /> containing additional details for a Primitive, Foliage data or Attachment data</para>
+                <para>The <see cref="E:OpenMetaverse.ObjectManager.ObjectProperties" /> event is also raised when a <see cref="M:OpenMetaverse.ObjectManager.SelectObject(OpenMetaverse.Simulator,System.UInt32,System.Boolean)" /> request is
             made.</para>
             </remarks>
             <example>
-            The following code example uses the <see cref="P:OpenMetaverse.PrimEventArgs.Prim"/>, <see cref="P:OpenMetaverse.PrimEventArgs.Simulator"/> and
-            <see cref="P:OpenMetaverse.ObjectPropertiesEventArgs.Properties"/>
+            The following code example uses the <see cref="P:OpenMetaverse.PrimEventArgs.Prim" />, <see cref="P:OpenMetaverse.PrimEventArgs.Simulator" /> and
+            <see cref="P:OpenMetaverse.ObjectPropertiesEventArgs.Properties" />
             properties to display new attachments and send a request for additional properties containing the name of the
-            attachment then display it on the <see cref="T:System.Console"/> window.
-            <code>    
-                // Subscribe to the event that provides additional primitive details
-                Client.Objects.ObjectProperties += Objects_ObjectProperties;
-                 
-                // handle the properties data that arrives
-                private void Objects_ObjectProperties(object sender, ObjectPropertiesEventArgs e)
-                {
-                    Console.WriteLine("Primitive Properties: {0} Name is {1}", e.Properties.ObjectID, e.Properties.Name);
-                }   
-            </code>
-            </example>
+            attachment then display it on the <see cref="T:System.Console" /> window.
+            <code>
+            // Subscribe to the event that provides additional primitive details
+            Client.Objects.ObjectProperties += Objects_ObjectProperties;
+            // handle the properties data that arrives
+            private void Objects_ObjectProperties(object sender, ObjectPropertiesEventArgs e)
+            {
+            Console.WriteLine("Primitive Properties: {0} Name is {1}", e.Properties.ObjectID, e.Properties.Name);
+            }
+            </code></example>
         </member>
         <member name="M:OpenMetaverse.ObjectPropertiesEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Primitive.ObjectProperties)">
             <summary>
@@ -15915,18 +14003,19 @@
             <summary>Get the primitive properties</summary>
         </member>
         <member name="T:OpenMetaverse.ObjectPropertiesUpdatedEventArgs">
-            <summary>Provides additional primitive data for the <see cref="E:OpenMetaverse.ObjectManager.ObjectPropertiesUpdated"/> event</summary>
-            <remarks><para>The <see cref="E:OpenMetaverse.ObjectManager.ObjectPropertiesUpdated"/> event occurs when the simulator sends
-            an <see cref="T:OpenMetaverse.Packets.ObjectPropertiesPacket"/> containing additional details for a Primitive or Foliage data that is currently
-            being tracked in the <see cref="!:Simulator.ObjectsPrimitives"/> dictionary</para>
-            <para>The <see cref="E:OpenMetaverse.ObjectManager.ObjectPropertiesUpdated"/> event is also raised when a <see cref="M:OpenMetaverse.ObjectManager.SelectObject(OpenMetaverse.Simulator,System.UInt32)"/> request is
-            made and <see cref="F:OpenMetaverse.Settings.OBJECT_TRACKING"/> is enabled</para>    
-            </remarks>    
+            <summary>Provides additional primitive data for the <see cref="E:OpenMetaverse.ObjectManager.ObjectPropertiesUpdated" /> event</summary>
+            <remarks>
+                <para>The <see cref="E:OpenMetaverse.ObjectManager.ObjectPropertiesUpdated" /> event occurs when the simulator sends
+            an <see cref="T:OpenMetaverse.Packets.ObjectPropertiesPacket" /> containing additional details for a Primitive or Foliage data that is currently
+            being tracked in the <see cref="F:OpenMetaverse.Simulator.ObjectsPrimitives" /> dictionary</para>
+                <para>The <see cref="E:OpenMetaverse.ObjectManager.ObjectPropertiesUpdated" /> event is also raised when a <see cref="M:OpenMetaverse.ObjectManager.SelectObject(OpenMetaverse.Simulator,System.UInt32,System.Boolean)" /> request is
+            made and <see cref="F:OpenMetaverse.Settings.OBJECT_TRACKING" /> is enabled</para>
+            </remarks>
         </member>
         <member name="M:OpenMetaverse.ObjectPropertiesUpdatedEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Primitive,OpenMetaverse.Primitive.ObjectProperties)">
             <summary>
             Construct a new instance of the ObjectPropertiesUpdatedEvenrArgs class
-            </summary>                
+            </summary>
             <param name="simulator">The simulator the object is located</param>
             <param name="prim">The Primitive</param>
             <param name="props">The primitive Properties</param>
@@ -15941,26 +14030,30 @@
             <summary>Get the primitive properties</summary>
         </member>
         <member name="T:OpenMetaverse.ObjectPropertiesFamilyEventArgs">
-            <summary>Provides additional primitive data, permissions and sale info for the <see cref="E:OpenMetaverse.ObjectManager.ObjectPropertiesFamily"/> event</summary>
-            <remarks><para>The <see cref="E:OpenMetaverse.ObjectManager.ObjectPropertiesFamily"/> event occurs when the simulator sends
-            an <see cref="T:OpenMetaverse.Packets.ObjectPropertiesPacket"/> containing additional details for a Primitive, Foliage data or Attachment. This includes
+            <summary>Provides additional primitive data, permissions and sale info for the <see cref="E:OpenMetaverse.ObjectManager.ObjectPropertiesFamily" /> event</summary>
+            <remarks>
+                <para>The <see cref="E:OpenMetaverse.ObjectManager.ObjectPropertiesFamily" /> event occurs when the simulator sends
+            an <see cref="T:OpenMetaverse.Packets.ObjectPropertiesPacket" /> containing additional details for a Primitive, Foliage data or Attachment. This includes
             Permissions, Sale info, and other basic details on an object</para>
-            <para>The <see cref="E:OpenMetaverse.ObjectManager.ObjectProperties"/> event is also raised when a <see cref="M:OpenMetaverse.ObjectManager.RequestObjectPropertiesFamily(OpenMetaverse.Simulator,OpenMetaverse.UUID)"/> request is
+                <para>The <see cref="E:OpenMetaverse.ObjectManager.ObjectProperties" /> event is also raised when a <see cref="M:OpenMetaverse.ObjectManager.RequestObjectPropertiesFamily(OpenMetaverse.Simulator,OpenMetaverse.UUID,System.Boolean)" /> request is
             made, the viewer equivalent is hovering the mouse cursor over an object</para>
-            </remarks>    
+            </remarks>
         </member>
         <member name="P:OpenMetaverse.ObjectPropertiesFamilyEventArgs.Simulator">
             <summary>Get the simulator the object is located</summary>
         </member>
         <member name="P:OpenMetaverse.ObjectPropertiesFamilyEventArgs.Properties">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="P:OpenMetaverse.ObjectPropertiesFamilyEventArgs.Type">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="T:OpenMetaverse.TerseObjectUpdateEventArgs">
-            <summary>Provides primitive data containing updated location, velocity, rotation, textures for the <see cref="E:OpenMetaverse.ObjectManager.TerseObjectUpdate"/> event</summary>
-            <remarks><para>The <see cref="E:OpenMetaverse.ObjectManager.TerseObjectUpdate"/> event occurs when the simulator sends updated location, velocity, rotation, etc</para>        
+            <summary>Provides primitive data containing updated location, velocity, rotation, textures for the <see cref="E:OpenMetaverse.ObjectManager.TerseObjectUpdate" /> event</summary>
+            <remarks>
+                <para>The <see cref="E:OpenMetaverse.ObjectManager.TerseObjectUpdate" /> event occurs when the simulator sends updated location, velocity, rotation, etc</para>
             </remarks>
         </member>
         <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.Simulator">
@@ -15970,14 +14063,15 @@
             <summary>Get the primitive details</summary>
         </member>
         <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.Update">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.TimeDilation">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="T:OpenMetaverse.ObjectDataBlockUpdateEventArgs">
             <summary>
-            
             </summary>
         </member>
         <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Simulator">
@@ -15987,20 +14081,24 @@
             <summary>Get the primitive details</summary>
         </member>
         <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.ConstructionData">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Block">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Update">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.NameValues">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="T:OpenMetaverse.KillObjectEventArgs">
-            <summary>Provides notification when an Avatar, Object or Attachment is DeRezzed or moves out of the avatars view for the 
-            <see cref="E:OpenMetaverse.ObjectManager.KillObject"/> event</summary>
+            <summary>Provides notification when an Avatar, Object or Attachment is DeRezzed or moves out of the avatars view for the
+            <see cref="E:OpenMetaverse.ObjectManager.KillObject" /> event</summary>
         </member>
         <member name="P:OpenMetaverse.KillObjectEventArgs.Simulator">
             <summary>Get the simulator the object is located</summary>
@@ -16017,30 +14115,35 @@
             <summary>Get the simulator the object is located</summary>
         </member>
         <member name="P:OpenMetaverse.AvatarSitChangedEventArgs.Avatar">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="P:OpenMetaverse.AvatarSitChangedEventArgs.SittingOn">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="P:OpenMetaverse.AvatarSitChangedEventArgs.OldSeat">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="T:OpenMetaverse.PayPriceReplyEventArgs">
             <summary>
-            
             </summary>
         </member>
         <member name="P:OpenMetaverse.PayPriceReplyEventArgs.Simulator">
             <summary>Get the simulator the object is located</summary>
         </member>
         <member name="P:OpenMetaverse.PayPriceReplyEventArgs.ObjectID">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="P:OpenMetaverse.PayPriceReplyEventArgs.DefaultPrice">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="P:OpenMetaverse.PayPriceReplyEventArgs.ButtonPrices">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="P:OpenMetaverse.ObjectMediaEventArgs.Success">
             <summary>
@@ -16057,869 +14160,3781 @@
             Array of media entries indexed by face number
             </summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryNode.#ctor">
+        <member name="T:OpenMetaverse.PhysicsPropertiesEventArgs">
             <summary>
-            
+            Set when simulator sends us infomation on primitive's physical properties
             </summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryNode.#ctor(OpenMetaverse.InventoryBase)">
+        <member name="M:OpenMetaverse.PhysicsPropertiesEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Primitive.PhysicsProperties)">
             <summary>
-            
+            Constructor
             </summary>
-            <param name="data"></param>
+            <param name="sim">Simulator where the message originated</param>
+            <param name="props">Updated physical properties</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryNode.#ctor(OpenMetaverse.InventoryBase,OpenMetaverse.InventoryNode)">
+        <member name="F:OpenMetaverse.PhysicsPropertiesEventArgs.Simulator">
+            <summary>Simulator where the message originated</summary>
+        </member>
+        <member name="F:OpenMetaverse.PhysicsPropertiesEventArgs.PhysicsProperties">
+            <summary>Updated physical properties</summary>
+        </member>
+        <member name="M:OpenMetaverse.UDPPacketBuffer.#ctor">
             <summary>
-            De-serialization constructor for the InventoryNode Class
+            Create an allocated UDP packet buffer for receiving a packet
             </summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryNode.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="M:OpenMetaverse.UDPPacketBuffer.#ctor(System.Net.IPEndPoint)">
             <summary>
-            Serialization handler for the InventoryNode Class
+            Create an allocated UDP packet buffer for sending a packet
             </summary>
+            <param name="endPoint">EndPoint of the remote host</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="M:OpenMetaverse.UDPPacketBuffer.#ctor(System.Net.IPEndPoint,System.Int32)">
             <summary>
-            De-serialization handler for the InventoryNode Class
+            Create an allocated UDP packet buffer for sending a packet
             </summary>
+            <param name="endPoint">EndPoint of the remote host</param>
+            <param name="bufferSize">Size of the buffer to allocate for packet data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryNode.ToString">
+        <member name="F:OpenMetaverse.UDPPacketBuffer.BUFFER_SIZE">
+            <summary>Size of the byte array used to store raw packet data</summary>
+        </member>
+        <member name="F:OpenMetaverse.UDPPacketBuffer.Data">
+            <summary>Raw packet data buffer</summary>
+        </member>
+        <member name="F:OpenMetaverse.UDPPacketBuffer.DataLength">
+            <summary>Length of the data to transmit</summary>
+        </member>
+        <member name="F:OpenMetaverse.UDPPacketBuffer.RemoteEndPoint">
+            <summary>EndPoint of the remote host</summary>
+        </member>
+        <member name="T:OpenMetaverse.PacketBufferPool">
             <summary>
-            
+            Object pool for packet buffers. This is used to allocate memory for all
+            incoming and outgoing packets, and zerocoding buffers for those packets
             </summary>
-            <returns></returns>
         </member>
-        <member name="P:OpenMetaverse.InventoryNode.Data">
-            <summary></summary>
+        <member name="M:OpenMetaverse.PacketBufferPool.#ctor(System.Net.IPEndPoint,System.Int32,System.Int32)">
+            <summary>
+            Initialize the object pool in client mode
+            </summary>
+            <param name="endPoint">Server to connect to</param>
+            <param name="itemsPerSegment">
+            </param>
+            <param name="minSegments">
+            </param>
         </member>
-        <member name="P:OpenMetaverse.InventoryNode.Parent">
-            <summary></summary>
+        <member name="M:OpenMetaverse.PacketBufferPool.#ctor(System.Int32,System.Int32)">
+            <summary>
+            Initialize the object pool in server mode
+            </summary>
+            <param name="itemsPerSegment">
+            </param>
+            <param name="minSegments">
+            </param>
         </member>
-        <member name="P:OpenMetaverse.InventoryNode.ParentID">
-            <summary></summary>
+        <member name="M:OpenMetaverse.PacketBufferPool.GetObjectInstance">
+            <summary>
+            Returns a packet buffer with EndPoint set if the buffer is in
+            client mode, or with EndPoint set to null in server mode
+            </summary>
+            <returns>Initialized UDPPacketBuffer object</returns>
         </member>
-        <member name="P:OpenMetaverse.InventoryNode.Nodes">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Pool.#ctor">
+            <summary>
+            Default constructor
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryNode.NeedsUpdate">
+        <member name="M:OpenMetaverse.Pool.CheckOut">
             <summary>
-            For inventory folder nodes specifies weather the folder needs to be
-            refreshed from the server
+            Check a packet buffer out of the pool
             </summary>
+            <returns>A packet buffer object</returns>
         </member>
-        <member name="T:OpenMetaverse.FriendRights">
+        <member name="P:OpenMetaverse.WrappedObject`1.Instance">
             <summary>
-            
+            Returns an instance of the class that has been checked out of the Object Pool.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.FriendRights.None">
-            <summary>The avatar has no rights</summary>
+        <member name="M:OpenMetaverse.WrappedObject`1.Dispose">
+            <summary>
+            Checks the instance back into the object pool
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.FriendRights.CanSeeOnline">
-            <summary>The avatar can see the online status of the target avatar</summary>
+        <member name="M:OpenMetaverse.ObjectPoolBase`1.#ctor">
+            <summary>
+            Creates a new instance of the ObjectPoolBase class. Initialize MUST be called
+            after using this constructor.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.FriendRights.CanSeeOnMap">
-            <summary>The avatar can see the location of the target avatar on the map</summary>
+        <member name="M:OpenMetaverse.ObjectPoolBase`1.#ctor(System.Int32,System.Int32,System.Boolean,System.Int32)">
+            <summary>
+            Creates a new instance of the ObjectPool Base class.
+            </summary>
+            <param name="itemsPerSegment">The object pool is composed of segments, which
+            are allocated whenever the size of the pool is exceeded. The number of items
+            in a segment should be large enough that allocating a new segmeng is a rare
+            thing. For example, on a server that will have 10k people logged in at once,
+            the receive buffer object pool should have segment sizes of at least 1000
+            byte arrays per segment.
+            </param>
+            <param name="minimumSegmentCount">The minimun number of segments that may exist.</param>
+            <param name="gcOnPoolGrowth">Perform a full GC.Collect whenever a segment is allocated, and then again after allocation to compact the heap.</param>
+            <param name="cleanupFrequenceMS">The frequency which segments are checked to see if they're eligible for cleanup.</param>
         </member>
-        <member name="F:OpenMetaverse.FriendRights.CanModifyObjects">
-            <summary>The avatar can modify the ojects of the target avatar </summary>
+        <member name="P:OpenMetaverse.ObjectPoolBase`1.TotalSegments">
+            <summary>
+            The total number of segments created. Intended to be used by the Unit Tests.
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.FriendInfo">
+        <member name="P:OpenMetaverse.ObjectPoolBase`1.ItemsPerSegment">
             <summary>
-            This class holds information about an avatar in the friends list.  There are two ways 
-            to interface to this class.  The first is through the set of boolean properties.  This is the typical
-            way clients of this class will use it.  The second interface is through two bitflag properties,
-            TheirFriendsRights and MyFriendsRights
+            The number of items that are in a segment. Items in a segment
+            are all allocated at the same time, and are hopefully close to
+            each other in the managed heap.
             </summary>
         </member>
-        <member name="M:OpenMetaverse.FriendInfo.#ctor(OpenMetaverse.UUID,OpenMetaverse.FriendRights,OpenMetaverse.FriendRights)">
+        <member name="P:OpenMetaverse.ObjectPoolBase`1.MinimumSegmentCount">
             <summary>
-            Used internally when building the initial list of friends at login time
+            The minimum number of segments. When segments are reclaimed,
+            this number of segments will always be left alone. These
+            segments are allocated at startup.
             </summary>
-            <param name="id">System ID of the avatar being prepesented</param>
-            <param name="theirRights">Rights the friend has to see you online and to modify your objects</param>
-            <param name="myRights">Rights you have to see your friend online and to modify their objects</param>
         </member>
-        <member name="M:OpenMetaverse.FriendInfo.ToString">
+        <member name="P:OpenMetaverse.ObjectPoolBase`1.MinimumSegmentAgePriorToCleanup">
             <summary>
-            FriendInfo represented as a string
+            The age a segment must be before it's eligible for cleanup.
+            This  is used to prevent thrash, and typical values are in
+            the 5 minute range.
             </summary>
-            <returns>A string reprentation of both my rights and my friends rights</returns>
         </member>
-        <member name="P:OpenMetaverse.FriendInfo.UUID">
+        <member name="P:OpenMetaverse.ObjectPoolBase`1.CleanupFrequencyMilliseconds">
             <summary>
-            System ID of the avatar
+            The frequence which the cleanup thread runs. This is typically
+            expected to be in the 5 minute range.
             </summary>
         </member>
-        <member name="P:OpenMetaverse.FriendInfo.Name">
+        <member name="M:OpenMetaverse.ObjectPoolBase`1.ForceCleanup">
             <summary>
-            full name of the avatar
+            Forces the segment cleanup algorithm to be run. This method is intended
+            primarly for use from the Unit Test libraries.
             </summary>
         </member>
-        <member name="P:OpenMetaverse.FriendInfo.IsOnline">
+        <member name="M:OpenMetaverse.ObjectPoolBase`1.GetObjectInstance">
             <summary>
-            True if the avatar is online
+            Responsible for allocate 1 instance of an object that will be stored in a segment.
             </summary>
+            <returns>An instance of whatever objec the pool is pooling.</returns>
         </member>
-        <member name="P:OpenMetaverse.FriendInfo.CanSeeMeOnline">
+        <member name="M:OpenMetaverse.ObjectPoolBase`1.CheckIn(OpenMetaverse.ObjectPoolSegment{`0},`0)">
             <summary>
-            True if the friend can see if I am online
+            Checks in an instance of T owned by the object pool. This method is only intended to be called
+            by the <c>WrappedObject</c> class.
             </summary>
+            <param name="owningSegment">The segment from which the instance is checked out.</param>
+            <param name="instance">The instance of <c>T</c> to check back into the segment.</param>
         </member>
-        <member name="P:OpenMetaverse.FriendInfo.CanSeeMeOnMap">
+        <member name="M:OpenMetaverse.ObjectPoolBase`1.CheckOut">
             <summary>
-            True if the friend can see me on the map 
+            Checks an instance of <c>T</c> from the pool. If the pool is not sufficient to
+            allow the checkout, a new segment is created.
             </summary>
+            <returns>A <c>WrappedObject</c> around the instance of <c>T</c>. To check
+            the instance back into the segment, be sureto dispose the WrappedObject
+            when finished. </returns>
         </member>
-        <member name="P:OpenMetaverse.FriendInfo.CanModifyMyObjects">
+        <member name="T:OpenMetaverse.DictionaryEventAction">
             <summary>
-            True if the freind can modify my objects
             </summary>
         </member>
-        <member name="P:OpenMetaverse.FriendInfo.CanSeeThemOnline">
+        <member name="F:OpenMetaverse.DictionaryEventAction.Add">
             <summary>
-            True if I can see if my friend is online
             </summary>
         </member>
-        <member name="P:OpenMetaverse.FriendInfo.CanSeeThemOnMap">
+        <member name="F:OpenMetaverse.DictionaryEventAction.Remove">
             <summary>
-            True if I can see if my friend is on the map
             </summary>
         </member>
-        <member name="P:OpenMetaverse.FriendInfo.CanModifyTheirObjects">
+        <member name="F:OpenMetaverse.DictionaryEventAction.Change">
             <summary>
-            True if I can modify my friend's objects
             </summary>
         </member>
-        <member name="P:OpenMetaverse.FriendInfo.TheirFriendRights">
+        <member name="T:OpenMetaverse.ObservableDictionary`2">
             <summary>
-            My friend's rights represented as bitmapped flags
+            The ObservableDictionary class is used for storing key/value pairs. It has methods for firing
+            events to subscribers when items are added, removed, or changed.
             </summary>
+            <typeparam name="TKey">Key <see langword="Tkey" /></typeparam>
+            <typeparam name="TValue">Value <see langword="TValue" /></typeparam>
         </member>
-        <member name="P:OpenMetaverse.FriendInfo.MyFriendRights">
+        <member name="M:OpenMetaverse.ObservableDictionary`2.#ctor">
             <summary>
-            My rights represented as bitmapped flags
+            Initializes a new instance of the <seealso cref="T:ObservableDictionary" /> Class
+            with the specified key/value, has the default initial capacity.
             </summary>
+            <example>
+                <code>
+            // initialize a new ObservableDictionary named testDict with a string as the key and an int as the value.
+            public ObservableDictionary&lt;string, int&gt; testDict = new ObservableDictionary&lt;string, int&gt;();
+            </code>
+            </example>
         </member>
-        <member name="T:OpenMetaverse.FriendsManager">
+        <member name="M:OpenMetaverse.ObservableDictionary`2.#ctor(System.Int32)">
             <summary>
-            This class is used to add and remove avatars from your friends list and to manage their permission.  
+            Initializes a new instance of the <seealso cref="T:OpenMetaverse.ObservableDictionary" /> Class
+            with the specified key/value, With its initial capacity specified.
             </summary>
+            <param name="capacity">Initial size of dictionary</param>
+            <example>
+                <code>
+            // initialize a new ObservableDictionary named testDict with a string as the key and an int as the value,
+            // initially allocated room for 10 entries.
+            public ObservableDictionary&lt;string, int&gt; testDict = new ObservableDictionary&lt;string, int&gt;(10);
+            </code>
+            </example>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendOnline">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.ObservableDictionary`2.Delegates">
+            <summary>
+            A dictionary of callbacks to fire when specified action occurs
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OnFriendOnline(OpenMetaverse.FriendInfoEventArgs)">
-            <summary>Raises the FriendOnline event</summary>
-            <param name="e">A FriendInfoEventArgs object containing the
-            data returned from the data server</param>
+        <member name="F:OpenMetaverse.ObservableDictionary`2.Dictionary">
+            <summary>Internal dictionary that this class wraps around. Do not
+            modify or enumerate the contents of this dictionary without locking</summary>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendOnlineLock">
-            <summary>Thread sync lock object</summary>
+        <member name="P:OpenMetaverse.ObservableDictionary`2.Item(`0)">
+            <summary>
+            Indexer for the dictionary
+            </summary>
+            <param name="key">The key</param>
+            <returns>The value</returns>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendOffline">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="P:OpenMetaverse.ObservableDictionary`2.Count">
+            <summary>
+            Gets the number of Key/Value pairs contained in the <seealso cref="T:ObservableDictionary" /></summary>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OnFriendOffline(OpenMetaverse.FriendInfoEventArgs)">
-            <summary>Raises the FriendOffline event</summary>
-            <param name="e">A FriendInfoEventArgs object containing the
-            data returned from the data server</param>
+        <member name="M:OpenMetaverse.ObservableDictionary`2.AddDelegate(OpenMetaverse.DictionaryEventAction,OpenMetaverse.DictionaryChangeCallback)">
+            <summary>
+            Register a callback to be fired when an action occurs
+            </summary>
+            <param name="action">The action</param>
+            <param name="callback">The callback to fire</param>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendOfflineLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.ObservableDictionary`2.RemoveDelegate(OpenMetaverse.DictionaryEventAction,OpenMetaverse.DictionaryChangeCallback)">
+            <summary>
+            Unregister a callback
+            </summary>
+            <param name="action">The action</param>
+            <param name="callback">The callback to fire</param>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendRights">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.ObservableDictionary`2.FireChangeEvent(OpenMetaverse.DictionaryEventAction,System.Collections.DictionaryEntry)">
+            <summary>
+            </summary>
+            <param name="action">
+            </param>
+            <param name="entry">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OnFriendRights(OpenMetaverse.FriendInfoEventArgs)">
-            <summary>Raises the FriendRightsUpdate event</summary>
-            <param name="e">A FriendInfoEventArgs object containing the
-            data returned from the data server</param>
+        <member name="M:OpenMetaverse.ObservableDictionary`2.TryGetValue(`0,`1@)">
+            <summary>
+            Try to get entry from the <seealso cref="!:ObservableDictionary" /> with specified key
+            </summary>
+            <param name="key">Key to use for lookup</param>
+            <param name="value">Value returned</param>
+            <returns>
+                <see langword="true" /> if specified key exists,  <see langword="false" /> if not found</returns>
+            <example>
+                <code>
+            // find your avatar using the Simulator.ObjectsAvatars ObservableDictionary:
+            Avatar av;
+            if (Client.Network.CurrentSim.ObjectsAvatars.TryGetValue(Client.Self.AgentID, out av))
+            Console.WriteLine("Found Avatar {0}", av.Name);
+            </code>
+                <seealso cref="F:OpenMetaverse.Simulator.ObjectsAvatars" />
+            </example>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendRightsLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.ObservableDictionary`2.Find(System.Predicate{`1})">
+            <summary>
+            Finds the specified match.
+            </summary>
+            <param name="match">The match.</param>
+            <returns>Matched value</returns>
+            <example>
+                <code>
+            // use a delegate to find a prim in the ObjectsPrimitives ObservableDictionary
+            // with the ID 95683496
+            uint findID = 95683496;
+            Primitive findPrim = sim.ObjectsPrimitives.Find(
+            delegate(Primitive prim) { return prim.ID == findID; });
+            </code>
+            </example>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendNames">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.ObservableDictionary`2.FindAll(System.Predicate{`1})">
+            <summary>Find All items in an <seealso cref="T:ObservableDictionary" /></summary>
+            <param name="match">return matching items.</param>
+            <returns>a <seealso cref="T:System.Collections.Generic.List" /> containing found items.</returns>
+            <example>
+            Find All prims within 20 meters and store them in a List
+            <code>
+            int radius = 20;
+            List&lt;Primitive&gt; prims = Client.Network.CurrentSim.ObjectsPrimitives.FindAll(
+            delegate(Primitive prim) {
+            Vector3 pos = prim.Position;
+            return ((prim.ParentID == 0) &amp;&amp; (pos != Vector3.Zero) &amp;&amp; (Vector3.Distance(pos, location) &lt; radius));
+            }
+            );
+            </code></example>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OnFriendNames(OpenMetaverse.FriendNamesEventArgs)">
-            <summary>Raises the FriendNames event</summary>
-            <param name="e">A FriendNamesEventArgs object containing the
-            data returned from the data server</param>
+        <member name="M:OpenMetaverse.ObservableDictionary`2.FindAll(System.Predicate{`0})">
+            <summary>Find All items in an <seealso cref="T:ObservableDictionary" /></summary>
+            <param name="match">return matching keys.</param>
+            <returns>a <seealso cref="T:System.Collections.Generic.List" /> containing found keys.</returns>
+            <example>
+            Find All keys which also exist in another dictionary
+            <code>
+            List&lt;UUID&gt; matches = myDict.FindAll(
+            delegate(UUID id) {
+            return myOtherDict.ContainsKey(id);
+            }
+            );
+            </code></example>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendNamesLock">
+        <member name="M:OpenMetaverse.ObservableDictionary`2.ContainsKey(`0)">
+            <summary>Check if Key exists in Dictionary</summary>
+            <param name="key">Key to check for</param>
+            <returns>
+                <see langword="true" /> if found, <see langword="false" /> otherwise</returns>
+        </member>
+        <member name="M:OpenMetaverse.ObservableDictionary`2.ContainsValue(`1)">
+            <summary>Check if Value exists in Dictionary</summary>
+            <param name="value">Value to check for</param>
+            <returns>
+                <see langword="true" /> if found, <see langword="false" /> otherwise</returns>
+        </member>
+        <member name="M:OpenMetaverse.ObservableDictionary`2.Add(`0,`1)">
+            <summary>
+            Adds the specified key to the dictionary, dictionary locking is not performed,
+            <see cref="!:SafeAdd" /></summary>
+            <param name="key">The key</param>
+            <param name="value">The value</param>
+        </member>
+        <member name="M:OpenMetaverse.ObservableDictionary`2.Remove(`0)">
+            <summary>
+            Removes the specified key, dictionary locking is not performed
+            </summary>
+            <param name="key">The key.</param>
+            <returns>
+                <see langword="true" /> if successful, <see langword="false" /> otherwise</returns>
+        </member>
+        <member name="M:OpenMetaverse.ObservableDictionary`2.Clear">
+            <summary>
+            Clear the contents of the dictionary
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.ObservableDictionary`2.GetEnumerator">
+            <summary>
+            Enumerator for iterating dictionary entries
+            </summary>
+            <returns>
+            </returns>
+        </member>
+        <member name="T:OpenMetaverse.Packets.PacketDecoder.CustomPacketDecoder">
+            <summary>
+            A custom decoder callback
+            </summary>
+            <param name="fieldName">The key of the object</param>
+            <param name="fieldData">the data to decode</param>
+            <returns>A string represending the fieldData</returns>
+        </member>
+        <member name="M:OpenMetaverse.Packets.PacketDecoder.AddCallback(System.String,OpenMetaverse.Packets.PacketDecoder.CustomPacketDecoder)">
+            <summary>
+            Add a custom decoder callback
+            </summary>
+            <param name="key">The key of the field to decode</param>
+            <param name="customPacketHandler">The custom decode handler</param>
+        </member>
+        <member name="M:OpenMetaverse.Packets.PacketDecoder.RemoveCustomHandler(System.String,OpenMetaverse.Packets.PacketDecoder.CustomPacketDecoder)">
+            <summary>
+            Remove a custom decoder callback
+            </summary>
+            <param name="key">The key of the field to decode</param>
+            <param name="customPacketHandler">The custom decode handler</param>
+        </member>
+        <member name="M:OpenMetaverse.Packets.PacketDecoder.PacketToString(OpenMetaverse.Packets.Packet)">
+            <summary>
+            Creates a formatted string containing the values of a Packet
+            </summary>
+            <param name="packet">The Packet</param>
+            <returns>A formatted string of values of the nested items in the Packet object</returns>
+        </member>
+        <member name="M:OpenMetaverse.Packets.PacketDecoder.MessageToString(System.Object,System.Int32)">
+            <summary>
+            Decode an IMessage object into a beautifully formatted string
+            </summary>
+            <param name="message">The IMessage object</param>
+            <param name="recurseLevel">Recursion level (used for indenting)</param>
+            <returns>A formatted string containing the names and values of the source object</returns>
+        </member>
+        <member name="T:OpenMetaverse.ObjectReturnType">
+            <summary>
+            Type of return to use when returning objects from a parcel
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ObjectReturnType.None">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ObjectReturnType.Owner">
+            <summary>Return objects owned by parcel owner</summary>
+        </member>
+        <member name="F:OpenMetaverse.ObjectReturnType.Group">
+            <summary>Return objects set to group</summary>
+        </member>
+        <member name="F:OpenMetaverse.ObjectReturnType.Other">
+            <summary>Return objects not owned by parcel owner or set to group</summary>
+        </member>
+        <member name="F:OpenMetaverse.ObjectReturnType.List">
+            <summary>Return a specific list of objects on parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.ObjectReturnType.Sell">
+            <summary>Return objects that are marked for-sale</summary>
+        </member>
+        <member name="T:OpenMetaverse.ParcelAccessFlags">
+            <summary>
+            Blacklist/Whitelist flags used in parcels Access List
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelAccessFlags.NoAccess">
+            <summary>Agent is denied access</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelAccessFlags.Access">
+            <summary>Agent is granted access</summary>
+        </member>
+        <member name="T:OpenMetaverse.ParcelResult">
+            <summary>
+            The result of a request for parcel properties
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelResult.NoData">
+            <summary>No matches were found for the request</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelResult.Single">
+            <summary>Request matched a single parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelResult.Multiple">
+            <summary>Request matched multiple parcels</summary>
+        </member>
+        <member name="T:OpenMetaverse.AccessList">
+            <summary>
+            Flags used in the ParcelAccessListRequest packet to specify whether
+            we want the access list (whitelist), ban list (blacklist), or both
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.AccessList.Access">
+            <summary>Request the access list</summary>
+        </member>
+        <member name="F:OpenMetaverse.AccessList.Ban">
+            <summary>Request the ban list</summary>
+        </member>
+        <member name="F:OpenMetaverse.AccessList.Both">
+            <summary>Request both White and Black lists</summary>
+        </member>
+        <member name="T:OpenMetaverse.ParcelPropertiesStatus">
+            <summary>
+            Sequence ID in ParcelPropertiesReply packets (sent when avatar
+            tries to cross a parcel border)
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelPropertiesStatus.ParcelSelected">
+            <summary>Parcel is currently selected</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelPropertiesStatus.CollisionNotInGroup">
+            <summary>Parcel restricted to a group the avatar is not a
+            member of</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelPropertiesStatus.CollisionBanned">
+            <summary>Avatar is banned from the parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelPropertiesStatus.CollisionNotOnAccessList">
+            <summary>Parcel is restricted to an access list that the
+            avatar is not on</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelPropertiesStatus.HoveredOverParcel">
+            <summary>Response to hovering over a parcel</summary>
+        </member>
+        <member name="T:OpenMetaverse.TerraformAction">
+            <summary>
+            The tool to use when modifying terrain levels
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.TerraformAction.Level">
+            <summary>Level the terrain</summary>
+        </member>
+        <member name="F:OpenMetaverse.TerraformAction.Raise">
+            <summary>Raise the terrain</summary>
+        </member>
+        <member name="F:OpenMetaverse.TerraformAction.Lower">
+            <summary>Lower the terrain</summary>
+        </member>
+        <member name="F:OpenMetaverse.TerraformAction.Smooth">
+            <summary>Smooth the terrain</summary>
+        </member>
+        <member name="F:OpenMetaverse.TerraformAction.Noise">
+            <summary>Add random noise to the terrain</summary>
+        </member>
+        <member name="F:OpenMetaverse.TerraformAction.Revert">
+            <summary>Revert terrain to simulator default</summary>
+        </member>
+        <member name="T:OpenMetaverse.TerraformBrushSize">
+            <summary>
+            The tool size to use when changing terrain levels
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.TerraformBrushSize.Small">
+            <summary>Small</summary>
+        </member>
+        <member name="F:OpenMetaverse.TerraformBrushSize.Medium">
+            <summary>Medium</summary>
+        </member>
+        <member name="F:OpenMetaverse.TerraformBrushSize.Large">
+            <summary>Large</summary>
+        </member>
+        <member name="T:OpenMetaverse.AccessDeniedReason">
+            <summary>
+            Reasons agent is denied access to a parcel on the simulator
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.AccessDeniedReason.NotDenied">
+            <summary>Agent is not denied, access is granted</summary>
+        </member>
+        <member name="F:OpenMetaverse.AccessDeniedReason.NotInGroup">
+            <summary>Agent is not a member of the group set for the parcel, or which owns the parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.AccessDeniedReason.NotOnAllowList">
+            <summary>Agent is not on the parcels specific allow list</summary>
+        </member>
+        <member name="F:OpenMetaverse.AccessDeniedReason.BannedFromParcel">
+            <summary>Agent is on the parcels ban list</summary>
+        </member>
+        <member name="F:OpenMetaverse.AccessDeniedReason.NoAccess">
+            <summary>Unknown</summary>
+        </member>
+        <member name="F:OpenMetaverse.AccessDeniedReason.NotAgeVerified">
+            <summary>Agent is not age verified and parcel settings deny access to non age verified avatars</summary>
+        </member>
+        <member name="T:OpenMetaverse.ParcelOverlayType">
+            <summary>
+            Parcel overlay type. This is used primarily for highlighting and
+            coloring which is why it is a single integer instead of a set of
+            flags
+            </summary>
+            <remarks>These values seem to be poorly thought out. The first three
+            bits represent a single value, not flags. For example Auction (0x05) is
+            not a combination of OwnedByOther (0x01) and ForSale(0x04). However,
+            the BorderWest and BorderSouth values are bit flags that get attached
+            to the value stored in the first three bits. Bits four, five, and six
+            are unused</remarks>
+        </member>
+        <member name="F:OpenMetaverse.ParcelOverlayType.Public">
+            <summary>Public land</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelOverlayType.OwnedByOther">
+            <summary>Land is owned by another avatar</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelOverlayType.OwnedByGroup">
+            <summary>Land is owned by a group</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelOverlayType.OwnedBySelf">
+            <summary>Land is owned by the current avatar</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelOverlayType.ForSale">
+            <summary>Land is for sale</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelOverlayType.Auction">
+            <summary>Land is being auctioned</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelOverlayType.Private">
+            <summary>Land is private</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelOverlayType.BorderWest">
+            <summary>To the west of this area is a parcel border</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelOverlayType.BorderSouth">
+            <summary>To the south of this area is a parcel border</summary>
+        </member>
+        <member name="T:OpenMetaverse.ParcelFlags">
+            <summary>
+            Various parcel properties
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.None">
+            <summary>No flags set</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowFly">
+            <summary>Allow avatars to fly (a client-side only restriction)</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowOtherScripts">
+            <summary>Allow foreign scripts to run</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.ForSale">
+            <summary>This parcel is for sale</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowLandmark">
+            <summary>Allow avatars to create a landmark on this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowTerraform">
+            <summary>Allows all avatars to edit the terrain on this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowDamage">
+            <summary>Avatars have health and can take damage on this parcel.
+            If set, avatars can be killed and sent home here</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.CreateObjects">
+            <summary>Foreign avatars can create objects here</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.ForSaleObjects">
+            <summary>All objects on this parcel can be purchased</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.UseAccessGroup">
+            <summary>Access is restricted to a group</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.UseAccessList">
+            <summary>Access is restricted to a whitelist</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.UseBanList">
+            <summary>Ban blacklist is enabled</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.UsePassList">
+            <summary>Unknown</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.ShowDirectory">
+            <summary>List this parcel in the search directory</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowDeedToGroup">
+            <summary>Allow personally owned parcels to be deeded to group</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.ContributeWithDeed">
+            <summary>If Deeded, owner contributes required tier to group parcel is deeded to</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.SoundLocal">
+            <summary>Restrict sounds originating on this parcel to the
+            parcel boundaries</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.SellParcelObjects">
+            <summary>Objects on this parcel are sold when the land is
+            purchsaed</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowPublish">
+            <summary>Allow this parcel to be published on the web</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.MaturePublish">
+            <summary>The information for this parcel is mature content</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.UrlWebPage">
+            <summary>The media URL is an HTML page</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.UrlRawHtml">
+            <summary>The media URL is a raw HTML string</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.RestrictPushObject">
+            <summary>Restrict foreign object pushes</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.DenyAnonymous">
+            <summary>Ban all non identified/transacted avatars</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowGroupScripts">
+            <summary>Allow group-owned scripts to run</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.CreateGroupObjects">
+            <summary>Allow object creation by group members or group
+            objects</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowAPrimitiveEntry">
+            <summary>Allow all objects to enter this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowGroupObjectEntry">
+            <summary>Only allow group and owner objects to enter this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.AllowVoiceChat">
+            <summary>Voice Enabled on this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.UseEstateVoiceChan">
+            <summary>Use Estate Voice channel for Voice on this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelFlags.DenyAgeUnverified">
+            <summary>Deny Age Unverified Users</summary>
+        </member>
+        <member name="T:OpenMetaverse.ParcelStatus">
+            <summary>
+            Parcel ownership status
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelStatus.None">
+            <summary>Placeholder</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelStatus.Leased">
+            <summary>Parcel is leased (owned) by an avatar or group</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelStatus.LeasePending">
+            <summary>Parcel is in process of being leased (purchased) by an avatar or group</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelStatus.Abandoned">
+            <summary>Parcel has been abandoned back to Governor Linden</summary>
+        </member>
+        <member name="T:OpenMetaverse.ParcelCategory">
+            <summary>
+            Category parcel is listed in under search
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelCategory.None">
+            <summary>No assigned category</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelCategory.Linden">
+            <summary>Linden Infohub or public area</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelCategory.Adult">
+            <summary>Adult themed area</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelCategory.Arts">
+            <summary>Arts and Culture</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelCategory.Business">
+            <summary>Business</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelCategory.Educational">
+            <summary>Educational</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelCategory.Gaming">
+            <summary>Gaming</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelCategory.Hangout">
+            <summary>Hangout or Club</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelCategory.Newcomer">
+            <summary>Newcomer friendly</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelCategory.Park">
+            <summary>Parks and Nature</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelCategory.Residential">
+            <summary>Residential</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelCategory.Shopping">
+            <summary>Shopping</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelCategory.Stage">
+            <summary>Not Used?</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelCategory.Other">
+            <summary>Other</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelCategory.Any">
+            <summary>Not an actual category, only used for queries</summary>
+        </member>
+        <member name="T:OpenMetaverse.LandingType">
+            <summary>
+            Type of teleport landing for a parcel
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.LandingType.None">
+            <summary>Unset, simulator default</summary>
+        </member>
+        <member name="F:OpenMetaverse.LandingType.LandingPoint">
+            <summary>Specific landing point set for this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.LandingType.Direct">
+            <summary>No landing point set, direct teleports enabled for
+            this parcel</summary>
+        </member>
+        <member name="T:OpenMetaverse.ParcelMediaCommand">
+            <summary>
+            Parcel Media Command used in ParcelMediaCommandMessage
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.Stop">
+            <summary>Stop the media stream and go back to the first frame</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.Pause">
+            <summary>Pause the media stream (stop playing but stay on current frame)</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.Play">
+            <summary>Start the current media stream playing and stop when the end is reached</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.Loop">
+            <summary>Start the current media stream playing,
+            loop to the beginning when the end is reached and continue to play</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.Texture">
+            <summary>Specifies the texture to replace with video</summary>
+            <remarks>If passing the key of a texture, it must be explicitly typecast as a key,
+            not just passed within double quotes.</remarks>
+        </member>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.URL">
+            <summary>Specifies the movie URL (254 characters max)</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.Time">
+            <summary>Specifies the time index at which to begin playing</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.Agent">
+            <summary>Specifies a single agent to apply the media command to</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.Unload">
+            <summary>Unloads the stream. While the stop command sets the texture to the first frame of the movie,
+            unload resets it to the real texture that the movie was replacing.</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.AutoAlign">
+            <summary>Turn on/off the auto align feature, similar to the auto align checkbox in the parcel media properties
+            (NOT to be confused with the "align" function in the textures view of the editor!) Takes TRUE or FALSE as parameter.</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.Type">
+            <summary>Allows a Web page or image to be placed on a prim (1.19.1 RC0 and later only).
+            Use "text/html" for HTML.</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.Size">
+            <summary>Resizes a Web page to fit on x, y pixels (1.19.1 RC0 and later only).</summary>
+            <remarks>This might still not be working</remarks>
+        </member>
+        <member name="F:OpenMetaverse.ParcelMediaCommand.Desc">
+            <summary>Sets a description for the media being displayed (1.19.1 RC0 and later only).</summary>
+        </member>
+        <member name="T:OpenMetaverse.ParcelInfo">
+            <summary>
+            Some information about a parcel of land returned from a DirectoryManager search
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelInfo.ID">
+            <summary>Global Key of record</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelInfo.OwnerID">
+            <summary>Parcel Owners <seealso cref="T:OpenMetaverse.UUID" /></summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelInfo.Name">
+            <summary>Name field of parcel, limited to 128 characters</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelInfo.Description">
+            <summary>Description field of parcel, limited to 256 characters</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelInfo.ActualArea">
+            <summary>Total Square meters of parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelInfo.BillableArea">
+            <summary>Total area billable as Tier, for group owned land this will be 10% less than ActualArea</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelInfo.Mature">
+            <summary>True of parcel is in Mature simulator</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelInfo.GlobalX">
+            <summary>Grid global X position of parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelInfo.GlobalY">
+            <summary>Grid global Y position of parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelInfo.GlobalZ">
+            <summary>Grid global Z position of parcel (not used)</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelInfo.SimName">
+            <summary>Name of simulator parcel is located in</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelInfo.SnapshotID">
+            <summary>Texture <seealso cref="T:OpenMetaverse.UUID" /> of parcels display picture</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelInfo.Dwell">
+            <summary>Float representing calculated traffic based on time spent on parcel by avatars</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelInfo.SalePrice">
+            <summary>Sale price of parcel (not used)</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelInfo.AuctionID">
+            <summary>Auction ID of parcel</summary>
+        </member>
+        <member name="T:OpenMetaverse.ParcelMedia">
+            <summary>
+            Parcel Media Information
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelMedia.MediaAutoScale">
+            <summary>A byte, if 0x1 viewer should auto scale media to fit object</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelMedia.MediaLoop">
+            <summary>A boolean, if true the viewer should loop the media</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelMedia.MediaID">
+            <summary>The Asset UUID of the Texture which when applied to a
+            primitive will display the media</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelMedia.MediaURL">
+            <summary>A URL which points to any Quicktime supported media type</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelMedia.MediaDesc">
+            <summary>A description of the media</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelMedia.MediaHeight">
+            <summary>An Integer which represents the height of the media</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelMedia.MediaWidth">
+            <summary>An integer which represents the width of the media</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelMedia.MediaType">
+            <summary>A string which contains the mime type of the media</summary>
+        </member>
+        <member name="T:OpenMetaverse.Parcel">
+            <summary>
+            Parcel of land, a portion of virtual real estate in a simulator
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Parcel.#ctor(System.Int32)">
+            <summary>
+            Defalt constructor
+            </summary>
+            <param name="localID">Local ID of this parcel</param>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.SelfCount">
+            <summary>The total number of contiguous 4x4 meter blocks your agent owns within this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.OtherCount">
+            <summary>The total number of contiguous 4x4 meter blocks contained in this parcel owned by a group or agent other than your own</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.PublicCount">
+            <summary>Deprecated, Value appears to always be 0</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.LocalID">
+            <summary>Simulator-local ID of this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.OwnerID">
+            <summary>UUID of the owner of this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.IsGroupOwned">
+            <summary>Whether the land is deeded to a group or not</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.AuctionID">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.ClaimDate">
+            <summary>Date land was claimed</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.ClaimPrice">
+            <summary>Appears to always be zero</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.RentPrice">
+            <summary>This field is no longer used</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.AABBMin">
+            <summary>Minimum corner of the axis-aligned bounding box for this
+            parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.AABBMax">
+            <summary>Maximum corner of the axis-aligned bounding box for this
+            parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.Bitmap">
+            <summary>Bitmap describing land layout in 4x4m squares across the
+            entire region</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.Area">
+            <summary>Total parcel land area</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.Status">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.SimWideMaxPrims">
+            <summary>Maximum primitives across the entire simulator owned by the same agent or group that owns this parcel that can be used</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.SimWideTotalPrims">
+            <summary>Total primitives across the entire simulator calculated by combining the allowed prim counts for each parcel
+            owned by the agent or group that owns this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.MaxPrims">
+            <summary>Maximum number of primitives this parcel supports</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.TotalPrims">
+            <summary>Total number of primitives on this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.OwnerPrims">
+            <summary>For group-owned parcels this indicates the total number of prims deeded to the group,
+            for parcels owned by an individual this inicates the number of prims owned by the individual</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.GroupPrims">
+            <summary>Total number of primitives owned by the parcel group on
+            this parcel, or for parcels owned by an individual with a group set the
+            total number of prims set to that group.</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.OtherPrims">
+            <summary>Total number of prims owned by other avatars that are not set to group, or not the parcel owner</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.ParcelPrimBonus">
+            <summary>A bonus multiplier which allows parcel prim counts to go over times this amount, this does not affect
+            the max prims per simulator. e.g: 117 prim parcel limit x 1.5 bonus = 175 allowed</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.OtherCleanTime">
+            <summary>Autoreturn value in minutes for others' objects</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.Flags">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.SalePrice">
+            <summary>Sale price of the parcel, only useful if ForSale is set</summary>
+            <remarks>The SalePrice will remain the same after an ownership
+            transfer (sale), so it can be used to see the purchase price after
+            a sale if the new owner has not changed it</remarks>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.Name">
+            <summary>Parcel Name</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.Desc">
+            <summary>Parcel Description</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.MusicURL">
+            <summary>URL For Music Stream</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.GroupID">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.PassPrice">
+            <summary>Price for a temporary pass</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.PassHours">
+            <summary>How long is pass valid for</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.Category">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.AuthBuyerID">
+            <summary>Key of authorized buyer</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.SnapshotID">
+            <summary>Key of parcel snapshot</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.UserLocation">
+            <summary>The landing point location</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.UserLookAt">
+            <summary>The landing point LookAt</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.Landing">
+            <summary>The type of landing enforced from the <see cref="T:OpenMetaverse.LandingType" /> enum</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.Dwell">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.RegionDenyAnonymous">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.RegionPushOverride">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.AccessWhiteList">
+            <summary>Access list of who is whitelisted on this
+            parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.AccessBlackList">
+            <summary>Access list of who is blacklisted on this
+            parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.RegionDenyAgeUnverified">
+            <summary>TRUE of region denies access to age unverified users</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.ObscureMedia">
+            <summary>true to obscure (hide) media url</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.ObscureMusic">
+            <summary>true to obscure (hide) music url</summary>
+        </member>
+        <member name="F:OpenMetaverse.Parcel.Media">
+            <summary>A struct containing media details</summary>
+        </member>
+        <member name="M:OpenMetaverse.Parcel.ToString">
+            <summary>
+            Displays a parcel object in string format
+            </summary>
+            <returns>string containing key=value pairs of a parcel object</returns>
+        </member>
+        <member name="M:OpenMetaverse.Parcel.Update(OpenMetaverse.Simulator,System.Boolean)">
+            <summary>
+            Update the simulator with any local changes to this Parcel object
+            </summary>
+            <param name="simulator">Simulator to send updates to</param>
+            <param name="wantReply">Whether we want the simulator to confirm
+            the update with a reply packet or not</param>
+        </member>
+        <member name="M:OpenMetaverse.Parcel.UpdateOtherCleanTime(OpenMetaverse.Simulator)">
+            <summary>
+            Set Autoreturn time
+            </summary>
+            <param name="simulator">Simulator to send the update to</param>
+        </member>
+        <member name="T:OpenMetaverse.ParcelManager">
+            <summary>
+            Parcel (subdivided simulator lots) subsystem
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.ParcelManager.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Default constructor
+            </summary>
+            <param name="client">A reference to the GridClient object</param>
+        </member>
+        <member name="T:OpenMetaverse.ParcelManager.ParcelAccessEntry">
+            <summary>
+            Parcel Accesslist
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelManager.ParcelAccessEntry.AgentID">
+            <summary>Agents <seealso cref="T:OpenMetaverse.UUID" /></summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelManager.ParcelAccessEntry.Time">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelManager.ParcelAccessEntry.Flags">
+            <summary>Flags for specific entry in white/black lists</summary>
+        </member>
+        <member name="T:OpenMetaverse.ParcelManager.ParcelPrimOwners">
+            <summary>
+            Owners of primitives on parcel
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.OwnerID">
+            <summary>Prim Owners <seealso cref="T:OpenMetaverse.UUID" /></summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.IsGroupOwned">
+            <summary>True of owner is group</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.Count">
+            <summary>Total count of prims owned by OwnerID</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.OnlineStatus">
+            <summary>true of OwnerID is currently online and is not a group</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelManager.ParcelPrimOwners.NewestPrim">
+            <summary>The date of the most recent prim left by OwnerID</summary>
+        </member>
+        <member name="T:OpenMetaverse.ParcelManager.LandResourcesCallback">
+            <summary>
+            Called once parcel resource usage information has been collected
+            </summary>
+            <param name="success">Indicates if operation was successfull</param>
+            <param name="info">Parcel resource usage information</param>
+        </member>
+        <member name="F:OpenMetaverse.ParcelManager.m_DwellReply">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelManager.m_DwellReplyLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendshipOffered">
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelInfo">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OnFriendshipOffered(OpenMetaverse.FriendshipOfferedEventArgs)">
-            <summary>Raises the FriendshipOffered event</summary>
-            <param name="e">A FriendshipOfferedEventArgs object containing the
-            data returned from the data server</param>
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelInfoLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendshipOfferedLock">
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelProperties">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelPropertiesLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendshipResponse">
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelACL">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OnFriendshipResponse(OpenMetaverse.FriendshipResponseEventArgs)">
-            <summary>Raises the FriendshipResponse event</summary>
-            <param name="e">A FriendshipResponseEventArgs object containing the
-            data returned from the data server</param>
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelACLLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendshipResponseLock">
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelObjectOwnersReply">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelObjectOwnersLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendshipTerminated">
+        <member name="F:OpenMetaverse.ParcelManager.m_SimParcelsDownloaded">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OnFriendshipTerminated(OpenMetaverse.FriendshipTerminatedEventArgs)">
-            <summary>Raises the FriendshipTerminated event</summary>
-            <param name="e">A FriendshipTerminatedEventArgs object containing the
-            data returned from the data server</param>
+        <member name="F:OpenMetaverse.ParcelManager.m_SimParcelsDownloadedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendshipTerminatedLock">
+        <member name="F:OpenMetaverse.ParcelManager.m_ForceSelectObjects">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelManager.m_ForceSelectObjectsLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendFound">
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelMediaUpdateReply">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OnFriendFoundReply(OpenMetaverse.FriendFoundReplyEventArgs)">
-            <summary>Raises the FriendFoundReply event</summary>
-            <param name="e">A FriendFoundReplyEventArgs object containing the
-            data returned from the data server</param>
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelMediaUpdateReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.m_FriendFoundLock">
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelMediaCommand">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.ParcelManager.m_ParcelMediaCommandLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.FriendList">
+        <member name="E:OpenMetaverse.ParcelManager.ParcelDwellReply">
+            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.ParcelManager.RequestDwell(OpenMetaverse.Simulator,System.Int32)" /> request</summary>
+        </member>
+        <member name="E:OpenMetaverse.ParcelManager.ParcelInfoReply">
+            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.ParcelManager.RequestParcelInfo(OpenMetaverse.UUID)" /> request</summary>
+        </member>
+        <member name="E:OpenMetaverse.ParcelManager.ParcelProperties">
+            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.ParcelManager.RequestParcelProperties(OpenMetaverse.Simulator,System.Single,System.Single,System.Single,System.Single,System.Int32,System.Boolean)" /> request</summary>
+        </member>
+        <member name="E:OpenMetaverse.ParcelManager.ParcelAccessListReply">
+            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.ParcelManager.RequestParcelAccessList(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.AccessList,System.Int32)" /> request</summary>
+        </member>
+        <member name="E:OpenMetaverse.ParcelManager.ParcelObjectOwnersReply">
+            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.ParcelManager.RequestObjectOwners(OpenMetaverse.Simulator,System.Int32)" /> request</summary>
+        </member>
+        <member name="E:OpenMetaverse.ParcelManager.SimParcelsDownloaded">
+            <summary>Raised when the simulator responds to a <see cref="M:OpenMetaverse.ParcelManager.RequestAllSimParcels(OpenMetaverse.Simulator,System.Boolean,System.Int32)" /> request</summary>
+        </member>
+        <member name="E:OpenMetaverse.ParcelManager.ForceSelectObjectsReply">
+            <summary>Raised when the simulator responds to a <see cref="!:RequestForceSelectObjects" /> request</summary>
+        </member>
+        <member name="E:OpenMetaverse.ParcelManager.ParcelMediaUpdateReply">
+            <summary>Raised when the simulator responds to a Parcel Update request</summary>
+        </member>
+        <member name="E:OpenMetaverse.ParcelManager.ParcelMediaCommand">
+            <summary>Raised when the parcel your agent is located sends a ParcelMediaCommand</summary>
+        </member>
+        <member name="M:OpenMetaverse.ParcelManager.OnParcelDwellReply(OpenMetaverse.ParcelDwellReplyEventArgs)">
+            <summary>Raises the ParcelDwellReply event</summary>
+            <param name="e">A ParcelDwellReplyEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.ParcelManager.OnParcelInfoReply(OpenMetaverse.ParcelInfoReplyEventArgs)">
+            <summary>Raises the ParcelInfoReply event</summary>
+            <param name="e">A ParcelInfoReplyEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.ParcelManager.OnParcelProperties(OpenMetaverse.ParcelPropertiesEventArgs)">
+            <summary>Raises the ParcelProperties event</summary>
+            <param name="e">A ParcelPropertiesEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.ParcelManager.OnParcelAccessListReply(OpenMetaverse.ParcelAccessListReplyEventArgs)">
+            <summary>Raises the ParcelAccessListReply event</summary>
+            <param name="e">A ParcelAccessListReplyEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.ParcelManager.OnParcelObjectOwnersReply(OpenMetaverse.ParcelObjectOwnersReplyEventArgs)">
+            <summary>Raises the ParcelObjectOwnersReply event</summary>
+            <param name="e">A ParcelObjectOwnersReplyEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.ParcelManager.OnSimParcelsDownloaded(OpenMetaverse.SimParcelsDownloadedEventArgs)">
+            <summary>Raises the SimParcelsDownloaded event</summary>
+            <param name="e">A SimParcelsDownloadedEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.ParcelManager.OnForceSelectObjectsReply(OpenMetaverse.ForceSelectObjectsReplyEventArgs)">
+            <summary>Raises the ForceSelectObjectsReply event</summary>
+            <param name="e">A ForceSelectObjectsReplyEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.ParcelManager.OnParcelMediaUpdateReply(OpenMetaverse.ParcelMediaUpdateReplyEventArgs)">
+            <summary>Raises the ParcelMediaUpdateReply event</summary>
+            <param name="e">A ParcelMediaUpdateReplyEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.ParcelManager.OnParcelMediaCommand(OpenMetaverse.ParcelMediaCommandEventArgs)">
+            <summary>Raises the ParcelMediaCommand event</summary>
+            <param name="e">A ParcelMediaCommandEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.ParcelManager.RequestParcelInfo(OpenMetaverse.UUID)">
             <summary>
-            A dictionary of key/value pairs containing known friends of this avatar. 
-            
-            The Key is the <seealso cref="T:OpenMetaverse.UUID"/> of the friend, the value is a <seealso cref="T:OpenMetaverse.FriendInfo"/>
-            object that contains detailed information including permissions you have and have given to the friend
+            Request basic information for a single parcel
             </summary>
+            <param name="parcelID">Simulator-local ID of the parcel</param>
         </member>
-        <member name="F:OpenMetaverse.FriendsManager.FriendRequests">
+        <member name="M:OpenMetaverse.ParcelManager.RequestParcelProperties(OpenMetaverse.Simulator,System.Int32,System.Int32)">
             <summary>
-            A Dictionary of key/value pairs containing current pending frienship offers.
-            
-            The key is the <seealso cref="T:OpenMetaverse.UUID"/> of the avatar making the request, 
-            the value is the <seealso cref="T:OpenMetaverse.UUID"/> of the request which is used to accept
-            or decline the friendship offer
+            Request properties of a single parcel
             </summary>
+            <param name="simulator">Simulator containing the parcel</param>
+            <param name="localID">Simulator-local ID of the parcel</param>
+            <param name="sequenceID">An arbitrary integer that will be returned
+            with the ParcelProperties reply, useful for distinguishing between
+            multiple simultaneous requests</param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="M:OpenMetaverse.ParcelManager.RequestParcelAccessList(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.AccessList,System.Int32)">
             <summary>
-            Internal constructor
+            Request the access list for a single parcel
             </summary>
-            <param name="client">A reference to the GridClient Object</param>
+            <param name="simulator">Simulator containing the parcel</param>
+            <param name="localID">Simulator-local ID of the parcel</param>
+            <param name="sequenceID">An arbitrary integer that will be returned
+            with the ParcelAccessList reply, useful for distinguishing between
+            multiple simultaneous requests</param>
+            <param name="flags">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.AcceptFriendship(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.ParcelManager.RequestParcelProperties(OpenMetaverse.Simulator,System.Single,System.Single,System.Single,System.Single,System.Int32,System.Boolean)">
             <summary>
-            Accept a friendship request
+            Request properties of parcels using a bounding box selection
             </summary>
-            <param name="fromAgentID">agentID of avatatar to form friendship with</param>
-            <param name="imSessionID">imSessionID of the friendship request message</param>
+            <param name="simulator">Simulator containing the parcel</param>
+            <param name="north">Northern boundary of the parcel selection</param>
+            <param name="east">Eastern boundary of the parcel selection</param>
+            <param name="south">Southern boundary of the parcel selection</param>
+            <param name="west">Western boundary of the parcel selection</param>
+            <param name="sequenceID">An arbitrary integer that will be returned
+            with the ParcelProperties reply, useful for distinguishing between
+            different types of parcel property requests</param>
+            <param name="snapSelection">A boolean that is returned with the
+            ParcelProperties reply, useful for snapping focus to a single
+            parcel</param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.DeclineFriendship(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.ParcelManager.RequestAllSimParcels(OpenMetaverse.Simulator)">
             <summary>
-            Decline a friendship request
+            Request all simulator parcel properties (used for populating the <code>Simulator.Parcels</code>
+            dictionary)
             </summary>
-            <param name="fromAgentID"><seealso cref="T:OpenMetaverse.UUID"/> of friend</param>
-            <param name="imSessionID">imSessionID of the friendship request message</param>
+            <param name="simulator">Simulator to request parcels from (must be connected)</param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OfferFriendship(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.ParcelManager.RequestAllSimParcels(OpenMetaverse.Simulator,System.Boolean,System.Int32)">
             <summary>
-            Overload: Offer friendship to an avatar.
+            Request all simulator parcel properties (used for populating the <code>Simulator.Parcels</code>
+            dictionary)
             </summary>
-            <param name="agentID">System ID of the avatar you are offering friendship to</param>
+            <param name="simulator">Simulator to request parcels from (must be connected)</param>
+            <param name="refresh">If TRUE, will force a full refresh</param>
+            <param name="msDelay">Number of milliseconds to pause in between each request</param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OfferFriendship(OpenMetaverse.UUID,System.String)">
+        <member name="M:OpenMetaverse.ParcelManager.RequestDwell(OpenMetaverse.Simulator,System.Int32)">
             <summary>
-            Offer friendship to an avatar.
+            Request the dwell value for a parcel
             </summary>
-            <param name="agentID">System ID of the avatar you are offering friendship to</param>
-            <param name="message">A message to send with the request</param>
+            <param name="simulator">Simulator containing the parcel</param>
+            <param name="localID">Simulator-local ID of the parcel</param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.TerminateFriendship(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.ParcelManager.Buy(OpenMetaverse.Simulator,System.Int32,System.Boolean,OpenMetaverse.UUID,System.Boolean,System.Int32,System.Int32)">
             <summary>
-            Terminate a friendship with an avatar
+            Send a request to Purchase a parcel of land
             </summary>
-            <param name="agentID">System ID of the avatar you are terminating the friendship with</param>
+            <param name="simulator">The Simulator the parcel is located in</param>
+            <param name="localID">The parcels region specific local ID</param>
+            <param name="forGroup">true if this parcel is being purchased by a group</param>
+            <param name="groupID">The groups <seealso cref="T:OpenMetaverse.UUID" /></param>
+            <param name="removeContribution">true to remove tier contribution if purchase is successful</param>
+            <param name="parcelArea">The parcels size</param>
+            <param name="parcelPrice">The purchase price of the parcel</param>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.TerminateFriendshipHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.ParcelManager.Reclaim(OpenMetaverse.Simulator,System.Int32)">
+            <summary>
+            Reclaim a parcel of land
+            </summary>
+            <param name="simulator">The simulator the parcel is in</param>
+            <param name="localID">The parcels region specific local ID</param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.GrantRights(OpenMetaverse.UUID,OpenMetaverse.FriendRights)">
+        <member name="M:OpenMetaverse.ParcelManager.DeedToGroup(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.UUID)">
             <summary>
-            Change the rights of a friend avatar.
+            Deed a parcel to a group
             </summary>
-            <param name="friendID">the <seealso cref="T:OpenMetaverse.UUID"/> of the friend</param>
-            <param name="rights">the new rights to give the friend</param>
-            <remarks>This method will implicitly set the rights to those passed in the rights parameter.</remarks>
+            <param name="simulator">The simulator the parcel is in</param>
+            <param name="localID">The parcels region specific local ID</param>
+            <param name="groupID">The groups <seealso cref="T:OpenMetaverse.UUID" /></param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.MapFriend(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.ParcelManager.RequestObjectOwners(OpenMetaverse.Simulator,System.Int32)">
             <summary>
-            Use to map a friends location on the grid.
+            Request prim owners of a parcel of land.
             </summary>
-            <param name="friendID">Friends UUID to find</param>
-            <remarks><seealso cref="E:OnFriendFound"/></remarks>
+            <param name="simulator">Simulator parcel is in</param>
+            <param name="localID">The parcels region specific local ID</param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.TrackFriend(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.ParcelManager.ReturnObjects(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.ObjectReturnType,System.Collections.Generic.List{OpenMetaverse.UUID})">
             <summary>
-            Use to track a friends movement on the grid
+            Return objects from a parcel
             </summary>
-            <param name="friendID">Friends Key</param>
+            <param name="simulator">Simulator parcel is in</param>
+            <param name="localID">The parcels region specific local ID</param>
+            <param name="type">the type of objects to return, <seealso cref="T:OpenMetaverse.ObjectReturnType" /></param>
+            <param name="ownerIDs">A list containing object owners <seealso cref="T:OpenMetaverse.UUID" />s to return</param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.RequestOnlineNotification(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.ParcelManager.ParcelSubdivide(OpenMetaverse.Simulator,System.Single,System.Single,System.Single,System.Single)">
             <summary>
-            Ask for a notification of friend's online status
+            Subdivide (split) a parcel
             </summary>
-            <param name="friendID">Friend's UUID</param>
+            <param name="simulator">
+            </param>
+            <param name="west">
+            </param>
+            <param name="south">
+            </param>
+            <param name="east">
+            </param>
+            <param name="north">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.Avatars_OnAvatarNames(System.Object,OpenMetaverse.UUIDNameReplyEventArgs)">
+        <member name="M:OpenMetaverse.ParcelManager.ParcelJoin(OpenMetaverse.Simulator,System.Single,System.Single,System.Single,System.Single)">
             <summary>
-            This handles the asynchronous response of a RequestAvatarNames call.
+            Join two parcels of land creating a single parcel
             </summary>
-            <param name="sender"></param>
-            <param name="e">names cooresponding to the the list of IDs sent the the RequestAvatarNames call.</param>
+            <param name="simulator">
+            </param>
+            <param name="west">
+            </param>
+            <param name="south">
+            </param>
+            <param name="east">
+            </param>
+            <param name="north">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OnlineNotificationHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.ParcelManager.GetParcelLocalID(OpenMetaverse.Simulator,OpenMetaverse.Vector3)">
+            <summary>
+            Get a parcels LocalID
+            </summary>
+            <param name="simulator">Simulator parcel is in</param>
+            <param name="position">Vector3 position in simulator (Z not used)</param>
+            <returns>0 on failure, or parcel LocalID on success.</returns>
+            <remarks>A call to <code>Parcels.RequestAllSimParcels</code> is required to populate map and
+            dictionary.</remarks>
+        </member>
+        <member name="M:OpenMetaverse.ParcelManager.Terraform(OpenMetaverse.Simulator,System.Int32,OpenMetaverse.TerraformAction,OpenMetaverse.TerraformBrushSize)">
+            <summary>
+            Terraform (raise, lower, etc) an area or whole parcel of land
+            </summary>
+            <param name="simulator">Simulator land area is in.</param>
+            <param name="localID">LocalID of parcel, or -1 if using bounding box</param>
+            <param name="action">From Enum, Raise, Lower, Level, Smooth, Etc.</param>
+            <param name="brushSize">Size of area to modify</param>
+            <returns>true on successful request sent.</returns>
+            <remarks>Settings.STORE_LAND_PATCHES must be true,
+            Parcel information must be downloaded using <code>RequestAllSimParcels()</code></remarks>
+        </member>
+        <member name="M:OpenMetaverse.ParcelManager.Terraform(OpenMetaverse.Simulator,System.Single,System.Single,System.Single,System.Single,OpenMetaverse.TerraformAction,OpenMetaverse.TerraformBrushSize)">
+            <summary>
+            Terraform (raise, lower, etc) an area or whole parcel of land
+            </summary>
+            <param name="simulator">Simulator land area is in.</param>
+            <param name="west">west border of area to modify</param>
+            <param name="south">south border of area to modify</param>
+            <param name="east">east border of area to modify</param>
+            <param name="north">north border of area to modify</param>
+            <param name="action">From Enum, Raise, Lower, Level, Smooth, Etc.</param>
+            <param name="brushSize">Size of area to modify</param>
+            <returns>true on successful request sent.</returns>
+            <remarks>Settings.STORE_LAND_PATCHES must be true,
+            Parcel information must be downloaded using <code>RequestAllSimParcels()</code></remarks>
+        </member>
+        <member name="M:OpenMetaverse.ParcelManager.Terraform(OpenMetaverse.Simulator,System.Int32,System.Single,System.Single,System.Single,System.Single,OpenMetaverse.TerraformAction,OpenMetaverse.TerraformBrushSize,System.Int32)">
+            <summary>
+            Terraform (raise, lower, etc) an area or whole parcel of land
+            </summary>
+            <param name="simulator">Simulator land area is in.</param>
+            <param name="localID">LocalID of parcel, or -1 if using bounding box</param>
+            <param name="west">west border of area to modify</param>
+            <param name="south">south border of area to modify</param>
+            <param name="east">east border of area to modify</param>
+            <param name="north">north border of area to modify</param>
+            <param name="action">From Enum, Raise, Lower, Level, Smooth, Etc.</param>
+            <param name="brushSize">Size of area to modify</param>
+            <param name="seconds">How many meters + or - to lower, 1 = 1 meter</param>
+            <returns>true on successful request sent.</returns>
+            <remarks>Settings.STORE_LAND_PATCHES must be true,
+            Parcel information must be downloaded using <code>RequestAllSimParcels()</code></remarks>
+        </member>
+        <member name="M:OpenMetaverse.ParcelManager.Terraform(OpenMetaverse.Simulator,System.Int32,System.Single,System.Single,System.Single,System.Single,OpenMetaverse.TerraformAction,OpenMetaverse.TerraformBrushSize,System.Int32,System.Single)">
+            <summary>
+            Terraform (raise, lower, etc) an area or whole parcel of land
+            </summary>
+            <param name="simulator">Simulator land area is in.</param>
+            <param name="localID">LocalID of parcel, or -1 if using bounding box</param>
+            <param name="west">west border of area to modify</param>
+            <param name="south">south border of area to modify</param>
+            <param name="east">east border of area to modify</param>
+            <param name="north">north border of area to modify</param>
+            <param name="action">From Enum, Raise, Lower, Level, Smooth, Etc.</param>
+            <param name="brushSize">Size of area to modify</param>
+            <param name="seconds">How many meters + or - to lower, 1 = 1 meter</param>
+            <param name="height">Height at which the terraform operation is acting at</param>
+        </member>
+        <member name="M:OpenMetaverse.ParcelManager.RequestSelectObjects(System.Int32,OpenMetaverse.ObjectReturnType,OpenMetaverse.UUID)">
+            <summary>
+            Sends a request to the simulator to return a list of objects owned by specific owners
+            </summary>
+            <param name="localID">Simulator local ID of parcel</param>
+            <param name="selectType">Owners, Others, Etc</param>
+            <param name="ownerID">List containing keys of avatars objects to select;
+            if List is null will return Objects of type <c>selectType</c></param>
+            <remarks>Response data is returned in the event <seealso cref="E:ForceSelectObjectsReply" /></remarks>
+        </member>
+        <member name="M:OpenMetaverse.ParcelManager.EjectUser(OpenMetaverse.UUID,System.Boolean)">
+            <summary>
+            Eject and optionally ban a user from a parcel
+            </summary>
+            <param name="targetID">target key of avatar to eject</param>
+            <param name="ban">true to also ban target</param>
+        </member>
+        <member name="M:OpenMetaverse.ParcelManager.FreezeUser(OpenMetaverse.UUID,System.Boolean)">
+            <summary>
+            Freeze or unfreeze an avatar over your land
+            </summary>
+            <param name="targetID">target key to freeze</param>
+            <param name="freeze">true to freeze, false to unfreeze</param>
+        </member>
+        <member name="M:OpenMetaverse.ParcelManager.ReleaseParcel(OpenMetaverse.Simulator,System.Int32)">
+            <summary>
+            Abandon a parcel of land
+            </summary>
+            <param name="simulator">Simulator parcel is in</param>
+            <param name="localID">Simulator local ID of parcel</param>
+        </member>
+        <member name="M:OpenMetaverse.ParcelManager.RequestRemoteParcelID(OpenMetaverse.Vector3,System.UInt64,OpenMetaverse.UUID)">
+            <summary>
+            Requests the UUID of the parcel in a remote region at a specified location
+            </summary>
+            <param name="location">Location of the parcel in the remote region</param>
+            <param name="regionHandle">Remote region handle</param>
+            <param name="regionID">Remote region UUID</param>
+            <returns>If successful UUID of the remote parcel, UUID.Zero otherwise</returns>
+        </member>
+        <member name="M:OpenMetaverse.ParcelManager.GetParcelResouces(OpenMetaverse.UUID,System.Boolean,OpenMetaverse.ParcelManager.LandResourcesCallback)">
+            <summary>
+            Retrieves information on resources used by the parcel
+            </summary>
+            <param name="parcelID">UUID of the parcel</param>
+            <param name="getDetails">Should per object resource usage be requested</param>
+            <param name="callback">Callback invoked when the request is complete</param>
+        </member>
+        <member name="M:OpenMetaverse.ParcelManager.ParcelDwellReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>Process an incoming packet and raise the appropriate events</summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
+            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelDwellReply" /> event</remarks>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OfflineNotificationHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.ParcelManager.ParcelInfoReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>Process an incoming packet and raise the appropriate events</summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
+            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelInfoReply" /> event</remarks>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.ChangeUserRightsHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.ParcelManager.ParcelAccessListReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>Process an incoming packet and raise the appropriate events</summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
+            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelAccessListReply" /> event</remarks>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.OnFindAgentReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.ParcelManager.SelectParcelObjectsReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>Process an incoming packet and raise the appropriate events</summary>
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
+            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ForceSelectObjectsReply" /> event</remarks>
         </member>
-        <member name="M:OpenMetaverse.FriendsManager.Network_OnLoginResponse(System.Boolean,System.Boolean,System.String,System.String,OpenMetaverse.LoginResponseData)">
+        <member name="M:OpenMetaverse.ParcelManager.ParcelMediaUpdateHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelMediaUpdateReply" /> event</remarks>
+        </member>
+        <member name="M:OpenMetaverse.ParcelManager.ParcelOverlayHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="M:OpenMetaverse.ParcelManager.ParcelMediaCommandMessagePacketHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+            <remarks>Raises the <see cref="T:OpenMetaverse.ParcelMediaCommand" /> event</remarks>
+        </member>
+        <member name="T:OpenMetaverse.ParcelDwellReplyEventArgs">
+            <summary>Contains a parcels dwell data returned from the simulator in response to an <see cref="!:RequestParcelDwell" /></summary>
+        </member>
+        <member name="M:OpenMetaverse.ParcelDwellReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Int32,System.Single)">
             <summary>
-            Populate FriendList <seealso cref="!:InternalDictionary"/> with data from the login reply
+            Construct a new instance of the ParcelDwellReplyEventArgs class
             </summary>
-            <param name="loginSuccess">true if login was successful</param>
-            <param name="redirect">true if login request is requiring a redirect</param>
-            <param name="message">A string containing the response to the login request</param>
-            <param name="reason">A string containing the reason for the request</param>
-            <param name="replyData">A <seealso cref="T:OpenMetaverse.LoginResponseData"/> object containing the decoded 
-            reply from the login server</param>
+            <param name="parcelID">The global ID of the parcel</param>
+            <param name="localID">The simulator specific ID of the parcel</param>
+            <param name="dwell">The calculated dwell for the parcel</param>
         </member>
-        <member name="E:OpenMetaverse.FriendsManager.FriendOnline">
-            <summary>Raised when the simulator sends notification one of the members in our friends list comes online</summary>
+        <member name="P:OpenMetaverse.ParcelDwellReplyEventArgs.ParcelID">
+            <summary>Get the global ID of the parcel</summary>
         </member>
-        <member name="E:OpenMetaverse.FriendsManager.FriendOffline">
-            <summary>Raised when the simulator sends notification one of the members in our friends list goes offline</summary>
+        <member name="P:OpenMetaverse.ParcelDwellReplyEventArgs.LocalID">
+            <summary>Get the simulator specific ID of the parcel</summary>
         </member>
-        <member name="E:OpenMetaverse.FriendsManager.FriendRightsUpdate">
-            <summary>Raised when the simulator sends notification one of the members in our friends list grants or revokes permissions</summary>
+        <member name="P:OpenMetaverse.ParcelDwellReplyEventArgs.Dwell">
+            <summary>Get the calculated dwell</summary>
         </member>
-        <member name="E:OpenMetaverse.FriendsManager.FriendNames">
-            <summary>Raised when the simulator sends us the names on our friends list</summary>
+        <member name="T:OpenMetaverse.ParcelInfoReplyEventArgs">
+            <summary>Contains basic parcel information data returned from the
+            simulator in response to an <see cref="!:RequestParcelInfo" /> request</summary>
         </member>
-        <member name="E:OpenMetaverse.FriendsManager.FriendshipOffered">
-            <summary>Raised when the simulator sends notification another agent is offering us friendship</summary>
+        <member name="M:OpenMetaverse.ParcelInfoReplyEventArgs.#ctor(OpenMetaverse.ParcelInfo)">
+            <summary>
+            Construct a new instance of the ParcelInfoReplyEventArgs class
+            </summary>
+            <param name="parcel">The <see cref="T:OpenMetaverse.ParcelInfo" /> object containing basic parcel info</param>
         </member>
-        <member name="E:OpenMetaverse.FriendsManager.FriendshipResponse">
-            <summary>Raised when a request we sent to friend another agent is accepted or declined</summary>
+        <member name="P:OpenMetaverse.ParcelInfoReplyEventArgs.Parcel">
+            <summary>Get the <see cref="T:OpenMetaverse.ParcelInfo" /> object containing basic parcel info</summary>
         </member>
-        <member name="E:OpenMetaverse.FriendsManager.FriendshipTerminated">
-            <summary>Raised when the simulator sends notification one of the members in our friends list has terminated 
-            our friendship</summary>
+        <member name="T:OpenMetaverse.ParcelPropertiesEventArgs">
+            <summary>Contains basic parcel information data returned from the simulator in response to an <see cref="!:RequestParcelInfo" /> request</summary>
         </member>
-        <member name="E:OpenMetaverse.FriendsManager.FriendFoundReply">
-            <summary>Raised when the simulator sends the location of a friend we have 
-            requested map location info for</summary>
+        <member name="M:OpenMetaverse.ParcelPropertiesEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Parcel,OpenMetaverse.ParcelResult,System.Int32,System.Int32,System.Boolean)">
+            <summary>
+            Construct a new instance of the ParcelPropertiesEventArgs class
+            </summary>
+            <param name="simulator">The <see cref="T:OpenMetaverse.Parcel" /> object containing the details</param>
+            <param name="parcel">The <see cref="T:OpenMetaverse.Parcel" /> object containing the details</param>
+            <param name="result">The result of the request</param>
+            <param name="selectedPrims">The number of primitieves your agent is
+            currently selecting and or sitting on in this parcel</param>
+            <param name="sequenceID">The user assigned ID used to correlate a request with
+            these results</param>
+            <param name="snapSelection">TODO:</param>
         </member>
-        <member name="T:OpenMetaverse.FriendInfoEventArgs">
-            <summary>Contains information on a member of our friends list</summary>
+        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.Simulator">
+            <summary>Get the simulator the parcel is located in</summary>
         </member>
-        <member name="M:OpenMetaverse.FriendInfoEventArgs.#ctor(OpenMetaverse.FriendInfo)">
+        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.Parcel">
+            <summary>Get the <see cref="T:OpenMetaverse.Parcel" /> object containing the details</summary>
+            <remarks>If Result is NoData, this object will not contain valid data</remarks>
+        </member>
+        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.Result">
+            <summary>Get the result of the request</summary>
+        </member>
+        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.SelectedPrims">
+            <summary>Get the number of primitieves your agent is
+            currently selecting and or sitting on in this parcel</summary>
+        </member>
+        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.SequenceID">
+            <summary>Get the user assigned ID used to correlate a request with
+            these results</summary>
+        </member>
+        <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.SnapSelection">
+            <summary>TODO:</summary>
+        </member>
+        <member name="T:OpenMetaverse.ParcelAccessListReplyEventArgs">
+            <summary>Contains blacklist and whitelist data returned from the simulator in response to an <see cref="!:RequestParcelAccesslist" /> request</summary>
+        </member>
+        <member name="M:OpenMetaverse.ParcelAccessListReplyEventArgs.#ctor(OpenMetaverse.Simulator,System.Int32,System.Int32,System.UInt32,System.Collections.Generic.List{OpenMetaverse.ParcelManager.ParcelAccessEntry})">
             <summary>
-            Construct a new instance of the FriendInfoEventArgs class
+            Construct a new instance of the ParcelAccessListReplyEventArgs class
             </summary>
-            <param name="friend">The FriendInfo</param>
+            <param name="simulator">The simulator the parcel is located in</param>
+            <param name="sequenceID">The user assigned ID used to correlate a request with
+            these results</param>
+            <param name="localID">The simulator specific ID of the parcel</param>
+            <param name="flags">TODO:</param>
+            <param name="accessEntries">The list containing the white/blacklisted agents for the parcel</param>
         </member>
-        <member name="P:OpenMetaverse.FriendInfoEventArgs.Friend">
-            <summary>Get the FriendInfo</summary>
+        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.Simulator">
+            <summary>Get the simulator the parcel is located in</summary>
         </member>
-        <member name="T:OpenMetaverse.FriendNamesEventArgs">
-            <summary>Contains Friend Names</summary>
+        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.SequenceID">
+            <summary>Get the user assigned ID used to correlate a request with
+            these results</summary>
         </member>
-        <member name="M:OpenMetaverse.FriendNamesEventArgs.#ctor(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,System.String})">
+        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.LocalID">
+            <summary>Get the simulator specific ID of the parcel</summary>
+        </member>
+        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.Flags">
+            <summary>TODO:</summary>
+        </member>
+        <member name="P:OpenMetaverse.ParcelAccessListReplyEventArgs.AccessList">
+            <summary>Get the list containing the white/blacklisted agents for the parcel</summary>
+        </member>
+        <member name="T:OpenMetaverse.ParcelObjectOwnersReplyEventArgs">
+            <summary>Contains blacklist and whitelist data returned from the
+            simulator in response to an <see cref="!:RequestParcelAccesslist" /> request</summary>
+        </member>
+        <member name="M:OpenMetaverse.ParcelObjectOwnersReplyEventArgs.#ctor(OpenMetaverse.Simulator,System.Collections.Generic.List{OpenMetaverse.ParcelManager.ParcelPrimOwners})">
             <summary>
-            Construct a new instance of the FriendNamesEventArgs class
+            Construct a new instance of the ParcelObjectOwnersReplyEventArgs class
             </summary>
-            <param name="names">A dictionary where the Key is the ID of the Agent, 
-            and the Value is a string containing their name</param>
+            <param name="simulator">The simulator the parcel is located in</param>
+            <param name="primOwners">The list containing prim ownership counts</param>
         </member>
-        <member name="P:OpenMetaverse.FriendNamesEventArgs.Names">
-            <summary>A dictionary where the Key is the ID of the Agent, 
-            and the Value is a string containing their name</summary>
+        <member name="P:OpenMetaverse.ParcelObjectOwnersReplyEventArgs.Simulator">
+            <summary>Get the simulator the parcel is located in</summary>
         </member>
-        <member name="T:OpenMetaverse.FriendshipOfferedEventArgs">
-            <summary>Sent when another agent requests a friendship with our agent</summary>
+        <member name="P:OpenMetaverse.ParcelObjectOwnersReplyEventArgs.PrimOwners">
+            <summary>Get the list containing prim ownership counts</summary>
         </member>
-        <member name="M:OpenMetaverse.FriendshipOfferedEventArgs.#ctor(OpenMetaverse.UUID,System.String,OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.SimParcelsDownloadedEventArgs">
+            <summary>Contains the data returned when all parcel data has been retrieved from a simulator</summary>
+        </member>
+        <member name="M:OpenMetaverse.SimParcelsDownloadedEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.InternalDictionary{System.Int32,OpenMetaverse.Parcel},System.Int32[,])">
             <summary>
-            Construct a new instance of the FriendshipOfferedEventArgs class
+            Construct a new instance of the SimParcelsDownloadedEventArgs class
             </summary>
-            <param name="agentID">The ID of the agent requesting friendship</param>
-            <param name="agentName">The name of the agent requesting friendship</param>
-            <param name="imSessionID">The ID of the session, used in accepting or declining the 
-            friendship offer</param>
+            <param name="simulator">The simulator the parcel data was retrieved from</param>
+            <param name="simParcels">The dictionary containing the parcel data</param>
+            <param name="parcelMap">The multidimensional array containing a x,y grid mapped
+            to each 64x64 parcel's LocalID.</param>
         </member>
-        <member name="P:OpenMetaverse.FriendshipOfferedEventArgs.AgentID">
-            <summary>Get the ID of the agent requesting friendship</summary>
+        <member name="P:OpenMetaverse.SimParcelsDownloadedEventArgs.Simulator">
+            <summary>Get the simulator the parcel data was retrieved from</summary>
         </member>
-        <member name="P:OpenMetaverse.FriendshipOfferedEventArgs.AgentName">
-            <summary>Get the name of the agent requesting friendship</summary>
+        <member name="P:OpenMetaverse.SimParcelsDownloadedEventArgs.Parcels">
+            <summary>A dictionary containing the parcel data where the key correlates to the ParcelMap entry</summary>
         </member>
-        <member name="P:OpenMetaverse.FriendshipOfferedEventArgs.SessionID">
-            <summary>Get the ID of the session, used in accepting or declining the 
-            friendship offer</summary>
+        <member name="P:OpenMetaverse.SimParcelsDownloadedEventArgs.ParcelMap">
+            <summary>Get the multidimensional array containing a x,y grid mapped
+            to each 64x64 parcel's LocalID.</summary>
         </member>
-        <member name="T:OpenMetaverse.FriendshipResponseEventArgs">
-            <summary>A response containing the results of our request to form a friendship with another agent</summary>
+        <member name="T:OpenMetaverse.ForceSelectObjectsReplyEventArgs">
+            <summary>Contains the data returned when a <see cref="!:RequestForceSelectObjects" /> request</summary>
         </member>
-        <member name="M:OpenMetaverse.FriendshipResponseEventArgs.#ctor(OpenMetaverse.UUID,System.String,System.Boolean)">
+        <member name="M:OpenMetaverse.ForceSelectObjectsReplyEventArgs.#ctor(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32},System.Boolean)">
             <summary>
-            Construct a new instance of the FriendShipResponseEventArgs class
+            Construct a new instance of the ForceSelectObjectsReplyEventArgs class
             </summary>
-            <param name="agentID">The ID of the agent we requested a friendship with</param>
-            <param name="agentName">The name of the agent we requested a friendship with</param>
-            <param name="accepted">true if the agent accepted our friendship offer</param>
+            <param name="simulator">The simulator the parcel data was retrieved from</param>
+            <param name="objectIDs">The list of primitive IDs</param>
+            <param name="resetList">true if the list is clean and contains the information
+            only for a given request</param>
         </member>
-        <member name="P:OpenMetaverse.FriendshipResponseEventArgs.AgentID">
-            <summary>Get the ID of the agent we requested a friendship with</summary>
+        <member name="P:OpenMetaverse.ForceSelectObjectsReplyEventArgs.Simulator">
+            <summary>Get the simulator the parcel data was retrieved from</summary>
         </member>
-        <member name="P:OpenMetaverse.FriendshipResponseEventArgs.AgentName">
-            <summary>Get the name of the agent we requested a friendship with</summary>
+        <member name="P:OpenMetaverse.ForceSelectObjectsReplyEventArgs.ObjectIDs">
+            <summary>Get the list of primitive IDs</summary>
         </member>
-        <member name="P:OpenMetaverse.FriendshipResponseEventArgs.Accepted">
-            <summary>true if the agent accepted our friendship offer</summary>
+        <member name="P:OpenMetaverse.ForceSelectObjectsReplyEventArgs.ResetList">
+            <summary>true if the list is clean and contains the information
+            only for a given request</summary>
         </member>
-        <member name="T:OpenMetaverse.FriendshipTerminatedEventArgs">
-            <summary>Contains data sent when a friend terminates a friendship with us</summary>
+        <member name="T:OpenMetaverse.ParcelMediaUpdateReplyEventArgs">
+            <summary>Contains data when the media data for a parcel the avatar is on changes</summary>
         </member>
-        <member name="M:OpenMetaverse.FriendshipTerminatedEventArgs.#ctor(OpenMetaverse.UUID,System.String)">
+        <member name="M:OpenMetaverse.ParcelMediaUpdateReplyEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.ParcelMedia)">
             <summary>
-            Construct a new instance of the FrindshipTerminatedEventArgs class
+            Construct a new instance of the ParcelMediaUpdateReplyEventArgs class
             </summary>
-            <param name="agentID">The ID of the friend who terminated the friendship with us</param>
-            <param name="agentName">The name of the friend who terminated the friendship with us</param>
+            <param name="simulator">the simulator the parcel media data was updated in</param>
+            <param name="media">The updated media information</param>
         </member>
-        <member name="P:OpenMetaverse.FriendshipTerminatedEventArgs.AgentID">
-            <summary>Get the ID of the agent that terminated the friendship with us</summary>
+        <member name="P:OpenMetaverse.ParcelMediaUpdateReplyEventArgs.Simulator">
+            <summary>Get the simulator the parcel media data was updated in</summary>
         </member>
-        <member name="P:OpenMetaverse.FriendshipTerminatedEventArgs.AgentName">
-            <summary>Get the name of the agent that terminated the friendship with us</summary>
+        <member name="P:OpenMetaverse.ParcelMediaUpdateReplyEventArgs.Media">
+            <summary>Get the updated media information</summary>
         </member>
-        <member name="T:OpenMetaverse.FriendFoundReplyEventArgs">
+        <member name="T:OpenMetaverse.ParcelMediaCommandEventArgs">
+            <summary>Contains the media command for a parcel the agent is currently on</summary>
+        </member>
+        <member name="M:OpenMetaverse.ParcelMediaCommandEventArgs.#ctor(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.ParcelFlags,OpenMetaverse.ParcelMediaCommand,System.Single)">
             <summary>
-            Data sent in response to a <see cref="!:FindFriend"/> request which contains the information to allow us to map the friends location
+            Construct a new instance of the ParcelMediaCommandEventArgs class
             </summary>
+            <param name="simulator">The simulator the parcel media command was issued in</param>
+            <param name="sequence">
+            </param>
+            <param name="flags">
+            </param>
+            <param name="command">The media command that was sent</param>
+            <param name="time">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.FriendFoundReplyEventArgs.#ctor(OpenMetaverse.UUID,System.UInt64,OpenMetaverse.Vector3)">
+        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.Simulator">
+            <summary>Get the simulator the parcel media command was issued in</summary>
+        </member>
+        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.Sequence">
             <summary>
-            Construct a new instance of the FriendFoundReplyEventArgs class
             </summary>
-            <param name="agentID">The ID of the agent we have requested location information for</param>
-            <param name="regionHandle">The region handle where our friend is located</param>
-            <param name="location">The simulator local position our friend is located</param>
         </member>
-        <member name="P:OpenMetaverse.FriendFoundReplyEventArgs.AgentID">
-            <summary>Get the ID of the agent we have received location information for</summary>
+        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.ParcelFlags">
+            <summary>
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.FriendFoundReplyEventArgs.RegionHandle">
-            <summary>Get the region handle where our mapped friend is located</summary>
+        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.MediaCommand">
+            <summary>Get the media command that was sent</summary>
         </member>
-        <member name="P:OpenMetaverse.FriendFoundReplyEventArgs.Location">
-            <summary>Get the simulator local position where our friend is located</summary>
+        <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.Time">
+            <summary>
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.BinBVHAnimationReader">
+        <member name="T:OpenMetaverse.PermissionMask">
             <summary>
-            Reads in a byte array of an Animation Asset created by the SecondLife(tm) client.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.rotationkeys">
+        <member name="T:OpenMetaverse.PermissionWho">
             <summary>
-            Rotation Keyframe count (used internally)
             </summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.positionkeys">
+        <member name="F:OpenMetaverse.PermissionWho.Base">
             <summary>
-            Position Keyframe count (used internally)
             </summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.Priority">
+        <member name="F:OpenMetaverse.PermissionWho.Owner">
             <summary>
-            Animation Priority
             </summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.Length">
+        <member name="F:OpenMetaverse.PermissionWho.Group">
             <summary>
-            The animation length in seconds.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.ExpressionName">
+        <member name="F:OpenMetaverse.PermissionWho.Everyone">
             <summary>
-            Expression set in the client.  Null if [None] is selected
             </summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.InPoint">
+        <member name="F:OpenMetaverse.PermissionWho.NextOwner">
             <summary>
-            The time in seconds to start the animation
             </summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.OutPoint">
+        <member name="F:OpenMetaverse.PermissionWho.All">
             <summary>
-            The time in seconds to end the animation
             </summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.Loop">
+        <member name="T:OpenMetaverse.Permissions">
             <summary>
-            Loop the animation
             </summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.EaseInTime">
+        <member name="T:OpenMetaverse.FieldType">
             <summary>
-            Meta data. Ease in Seconds.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.EaseOutTime">
+        <member name="F:OpenMetaverse.FieldType.U8">
             <summary>
-            Meta data. Ease out seconds.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.HandPose">
+        <member name="F:OpenMetaverse.FieldType.U16">
             <summary>
-            Meta Data for the Hand Pose
             </summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.JointCount">
+        <member name="F:OpenMetaverse.FieldType.U32">
             <summary>
-            Number of joints defined in the animation
             </summary>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.joints">
+        <member name="F:OpenMetaverse.FieldType.U64">
             <summary>
-            Contains an array of joints
             </summary>
         </member>
-        <member name="M:OpenMetaverse.BinBVHAnimationReader.#ctor(System.Byte[])">
+        <member name="F:OpenMetaverse.FieldType.S8">
             <summary>
-            Searialize an animation asset into it's joints/keyframes/meta data
             </summary>
-            <param name="animationdata"></param>
         </member>
-        <member name="M:OpenMetaverse.BinBVHAnimationReader.ReadBytesUntilNull(System.Byte[],System.Int32@)">
+        <member name="F:OpenMetaverse.FieldType.S16">
             <summary>
-            Variable length strings seem to be null terminated in the animation asset..    but..   
-            use with caution, home grown.
-            advances the index.
             </summary>
-            <param name="data">The animation asset byte array</param>
-            <param name="i">The offset to start reading</param>
-            <returns>a string</returns>
         </member>
-        <member name="M:OpenMetaverse.BinBVHAnimationReader.readJoint(System.Byte[],System.Int32@)">
+        <member name="F:OpenMetaverse.FieldType.S32">
             <summary>
-            Read in a Joint from an animation asset byte array
-            Variable length Joint fields, yay!
-            Advances the index
             </summary>
-            <param name="data">animation asset byte array</param>
-            <param name="i">Byte Offset of the start of the joint</param>
-            <returns>The Joint data serialized into the binBVHJoint structure</returns>
         </member>
-        <member name="M:OpenMetaverse.BinBVHAnimationReader.readKeys(System.Byte[],System.Int32@,System.Int32,System.Single,System.Single)">
+        <member name="F:OpenMetaverse.FieldType.F32">
             <summary>
-            Read Keyframes of a certain type
-            advance i
             </summary>
-            <param name="data">Animation Byte array</param>
-            <param name="i">Offset in the Byte Array.  Will be advanced</param>
-            <param name="keycount">Number of Keyframes</param>
-            <param name="min">Scaling Min to pass to the Uint16ToFloat method</param>
-            <param name="max">Scaling Max to pass to the Uint16ToFloat method</param>
-            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.binBVHJoint">
+        <member name="F:OpenMetaverse.FieldType.F64">
             <summary>
-            A Joint and it's associated meta data and keyframes
             </summary>
         </member>
-        <member name="F:OpenMetaverse.binBVHJoint.Name">
+        <member name="F:OpenMetaverse.FieldType.UUID">
             <summary>
-            Name of the Joint.  Matches the avatar_skeleton.xml in client distros
             </summary>
         </member>
-        <member name="F:OpenMetaverse.binBVHJoint.Priority">
+        <member name="F:OpenMetaverse.FieldType.BOOL">
             <summary>
-            Joint Animation Override?   Was the same as the Priority in testing.. 
             </summary>
         </member>
-        <member name="F:OpenMetaverse.binBVHJoint.rotationkeys">
+        <member name="F:OpenMetaverse.FieldType.Vector3">
             <summary>
-            Array of Rotation Keyframes in order from earliest to latest
             </summary>
         </member>
-        <member name="F:OpenMetaverse.binBVHJoint.positionkeys">
+        <member name="F:OpenMetaverse.FieldType.Vector3d">
             <summary>
-            Array of Position Keyframes in order from earliest to latest
-            This seems to only be for the Pelvis?
             </summary>
         </member>
-        <member name="T:OpenMetaverse.binBVHJointKey">
+        <member name="F:OpenMetaverse.FieldType.Vector4">
             <summary>
-            A Joint Keyframe.  This is either a position or a rotation.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.binBVHJointKey.key_element">
+        <member name="F:OpenMetaverse.FieldType.Quaternion">
             <summary>
-            Either a Vector3 position or a Vector3 Euler rotation
             </summary>
         </member>
-        <member name="T:OpenMetaverse.HandPose">
+        <member name="F:OpenMetaverse.FieldType.IPADDR">
             <summary>
-            Poses set in the animation metadata for the hands.
             </summary>
         </member>
-        <member name="T:OpenMetaverse.Bumpiness">
+        <member name="F:OpenMetaverse.FieldType.IPPORT">
             <summary>
-            The type of bump-mapping applied to a face
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.None">
-            <summary></summary>
+        <member name="F:OpenMetaverse.FieldType.Variable">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Brightness">
-            <summary></summary>
+        <member name="F:OpenMetaverse.FieldType.Fixed">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Darkness">
-            <summary></summary>
+        <member name="F:OpenMetaverse.FieldType.Single">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Woodgrain">
-            <summary></summary>
+        <member name="F:OpenMetaverse.FieldType.Multiple">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Bark">
-            <summary></summary>
+        <member name="T:OpenMetaverse.MapField">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Bricks">
-            <summary></summary>
+        <member name="F:OpenMetaverse.MapField.KeywordPosition">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Checker">
-            <summary></summary>
+        <member name="F:OpenMetaverse.MapField.Name">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Concrete">
-            <summary></summary>
+        <member name="F:OpenMetaverse.MapField.Type">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Crustytile">
-            <summary></summary>
+        <member name="F:OpenMetaverse.MapField.Count">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Cutstone">
-            <summary></summary>
+        <member name="M:OpenMetaverse.MapField.CompareTo(System.Object)">
+            <summary>
+            </summary>
+            <param name="obj">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Discs">
-            <summary></summary>
+        <member name="T:OpenMetaverse.MapBlock">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Gravel">
-            <summary></summary>
+        <member name="F:OpenMetaverse.MapBlock.KeywordPosition">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Petridish">
-            <summary></summary>
+        <member name="F:OpenMetaverse.MapBlock.Name">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Siding">
-            <summary></summary>
+        <member name="F:OpenMetaverse.MapBlock.Count">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Stonetile">
-            <summary></summary>
+        <member name="F:OpenMetaverse.MapBlock.Fields">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Stucco">
-            <summary></summary>
+        <member name="M:OpenMetaverse.MapBlock.CompareTo(System.Object)">
+            <summary>
+            </summary>
+            <param name="obj">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Suction">
-            <summary></summary>
+        <member name="T:OpenMetaverse.MapPacket">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Weave">
-            <summary></summary>
+        <member name="F:OpenMetaverse.MapPacket.ID">
+            <summary>
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Shininess">
+        <member name="F:OpenMetaverse.MapPacket.Name">
             <summary>
-            The level of shininess applied to a face
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Shininess.None">
-            <summary></summary>
+        <member name="F:OpenMetaverse.MapPacket.Frequency">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Shininess.Low">
-            <summary></summary>
+        <member name="F:OpenMetaverse.MapPacket.Trusted">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Shininess.Medium">
-            <summary></summary>
+        <member name="F:OpenMetaverse.MapPacket.Encoded">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Shininess.High">
-            <summary></summary>
+        <member name="F:OpenMetaverse.MapPacket.Blocks">
+            <summary>
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.MappingType">
+        <member name="T:OpenMetaverse.ProtocolManager">
             <summary>
-            The texture mapping style used for a face
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MappingType.Default">
-            <summary></summary>
+        <member name="M:OpenMetaverse.ProtocolManager.#ctor(System.String,OpenMetaverse.GridClient)">
+            <summary>
+            </summary>
+            <param name="mapFile">
+            </param>
+            <param name="client">
+            </param>
         </member>
-        <member name="F:OpenMetaverse.MappingType.Planar">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ProtocolManager.TypeSizes">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.MappingType.Spherical">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ProtocolManager.KeywordPositions">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.MappingType.Cylindrical">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ProtocolManager.LowMaps">
+            <summary>
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.TextureAttributes">
+        <member name="F:OpenMetaverse.ProtocolManager.MediumMaps">
             <summary>
-            Flags in the TextureEntry block that describe which properties are 
-            set
             </summary>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.None">
-            <summary></summary>
+        <member name="F:OpenMetaverse.ProtocolManager.HighMaps">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.TextureID">
-            <summary></summary>
+        <member name="M:OpenMetaverse.ProtocolManager.Command(System.String)">
+            <summary>
+            </summary>
+            <param name="command">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.RGBA">
-            <summary></summary>
+        <member name="M:OpenMetaverse.ProtocolManager.Command(System.Byte[])">
+            <summary>
+            </summary>
+            <param name="data">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.RepeatU">
-            <summary></summary>
+        <member name="M:OpenMetaverse.ProtocolManager.Command(System.UInt16,OpenMetaverse.PacketFrequency)">
+            <summary>
+            </summary>
+            <param name="command">
+            </param>
+            <param name="frequency">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.RepeatV">
-            <summary></summary>
+        <member name="M:OpenMetaverse.ProtocolManager.PrintMap">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.OffsetU">
-            <summary></summary>
+        <member name="M:OpenMetaverse.ProtocolManager.PrintOneMap(OpenMetaverse.MapPacket[],System.String)">
+            <summary>
+            </summary>
+            <param name="map">
+            </param>
+            <param name="frequency">
+            </param>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.OffsetV">
-            <summary></summary>
+        <member name="M:OpenMetaverse.ProtocolManager.DecodeMapFile(System.String,System.String)">
+            <summary>
+            </summary>
+            <param name="mapFile">
+            </param>
+            <param name="outputFile">
+            </param>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.Rotation">
-            <summary></summary>
+        <member name="M:OpenMetaverse.ProtocolManager.LoadMapFile(System.String)">
+            <summary>
+            </summary>
+            <param name="mapFile">
+            </param>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.Material">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Settings">
+            <summary>
+            Class for controlling various system settings.
+            </summary>
+            <remarks>Some values are readonly because they affect things that
+            happen when the GridClient object is initialized, so changing them at
+            runtime won't do any good. Non-readonly values may affect things that
+            happen at login or dynamically</remarks>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.Media">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Settings.#ctor(OpenMetaverse.GridClient)">
+            <summary>Constructor</summary>
+            <param name="client">Reference to a GridClient object</param>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.Glow">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Settings.AGNI_LOGIN_SERVER">
+            <summary>Main grid login server</summary>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.All">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Settings.ADITI_LOGIN_SERVER">
+            <summary>Beta grid login server</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetScriptBinary">
+        <member name="F:OpenMetaverse.Settings.ENABLE_INVENTORY_STORE">
             <summary>
-            Represents an AssetScriptBinary object containing the 
-            LSO compiled bytecode of an LSL script
+            InventoryManager requests inventory information on login,
+            GridClient initializes an Inventory store for main inventory.
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.#ctor">
-            <summary>Initializes a new instance of an AssetScriptBinary object</summary>
+        <member name="F:OpenMetaverse.Settings.ENABLE_LIBRARY_STORE">
+            <summary>
+            InventoryManager requests library information on login,
+            GridClient initializes an Inventory store for the library.
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.#ctor(OpenMetaverse.UUID,System.Byte[])">
-            <summary>Initializes a new instance of an AssetScriptBinary object with parameters</summary>
-            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
-            <param name="assetData">A byte array containing the raw asset data</param>
+        <member name="F:OpenMetaverse.Settings.PING_INTERVAL">
+            <summary>Number of milliseconds between sending pings to each sim</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.Encode">
+        <member name="F:OpenMetaverse.Settings.DEFAULT_AGENT_UPDATE_INTERVAL">
+            <summary>Number of milliseconds between sending camera updates</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.INTERPOLATION_INTERVAL">
+            <summary>Number of milliseconds between updating the current
+            positions of moving, non-accelerating and non-colliding objects</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.NETWORK_TICK_INTERVAL">
+            <summary>Millisecond interval between ticks, where all ACKs are
+            sent out and the age of unACKed packets is checked</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.PACKET_INBOX_SIZE">
+            <summary>The initial size of the packet inbox, where packets are
+            stored before processing</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.MAX_PACKET_SIZE">
+            <summary>Maximum size of packet that we want to send over the wire</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.MAX_SEQUENCE">
+            <summary>The maximum value of a packet sequence number before it
+            rolls over back to one</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.PACKET_ARCHIVE_SIZE">
+            <summary>The maximum size of the sequence number archive, used to
+            check for resent and/or duplicate packets</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.RESOURCE_DIR">
+            <summary>The relative directory where external resources are kept</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.LOGIN_SERVER">
+            <summary>Login server to connect to</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.BIND_ADDR">
+            <summary>IP Address the client will bind to</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.USE_LLSD_LOGIN">
+            <summary>Use XML-RPC Login or LLSD Login, default is XML-RPC Login</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.TRANSFER_TIMEOUT">
+            <summary>Number of milliseconds before an asset transfer will time
+            out</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.TELEPORT_TIMEOUT">
+            <summary>Number of milliseconds before a teleport attempt will time
+            out</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.LOGOUT_TIMEOUT">
+            <summary>Number of milliseconds before NetworkManager.Logout() will
+            time out</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.CAPS_TIMEOUT">
+            <summary>Number of milliseconds before a CAPS call will time out</summary>
+            <remarks>Setting this too low will cause web requests time out and
+            possibly retry repeatedly</remarks>
+        </member>
+        <member name="F:OpenMetaverse.Settings.LOGIN_TIMEOUT">
+            <summary>Number of milliseconds for xml-rpc to timeout</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.RESEND_TIMEOUT">
+            <summary>Milliseconds before a packet is assumed lost and resent</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.SIMULATOR_TIMEOUT">
+            <summary>Milliseconds without receiving a packet before the
+            connection to a simulator is assumed lost</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.MAP_REQUEST_TIMEOUT">
+            <summary>Milliseconds to wait for a simulator info request through
+            the grid interface</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.MAX_PENDING_ACKS">
+            <summary>Maximum number of queued ACKs to be sent before SendAcks()
+            is forced</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.STATS_QUEUE_SIZE">
+            <summary>Network stats queue length (seconds)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.STORE_LAND_PATCHES">
+            <summary>Enable/disable storing terrain heightmaps in the
+            TerrainManager</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.SEND_AGENT_UPDATES">
+            <summary>Enable/disable sending periodic camera updates</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.SEND_AGENT_APPEARANCE">
+            <summary>Enable/disable automatically setting agent appearance at
+            login and after sim crossing</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.SEND_AGENT_THROTTLE">
+            <summary>Enable/disable automatically setting the bandwidth throttle
+            after connecting to each simulator</summary>
+            <remarks>The default throttle uses the equivalent of the maximum
+            bandwidth setting in the official client. If you do not set a
+            throttle your connection will by default be throttled well below
+            the minimum values and you may experience connection problems</remarks>
+        </member>
+        <member name="F:OpenMetaverse.Settings.SEND_PINGS">
+            <summary>Enable/disable the sending of pings to monitor lag and
+            packet loss</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.MULTIPLE_SIMS">
+            <summary>Should we connect to multiple sims? This will allow
+            viewing in to neighboring simulators and sim crossings
+            (Experimental)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.ALWAYS_DECODE_OBJECTS">
+            <summary>If true, all object update packets will be decoded in to
+            native objects. If false, only updates for our own agent will be
+            decoded. Registering an event handler will force objects for that
+            type to always be decoded. If this is disabled the object tracking
+            will have missing or partial prim and avatar information</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.ALWAYS_REQUEST_OBJECTS">
+            <summary>If true, when a cached object check is received from the
+            server the full object info will automatically be requested</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.ENABLE_CAPS">
+            <summary>Whether to establish connections to HTTP capabilities
+            servers for simulators</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.ENABLE_SIMSTATS">
+            <summary>Whether to decode sim stats</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.LOG_ALL_CAPS_ERRORS">
+            <summary>The capabilities servers are currently designed to
+            periodically return a 502 error which signals for the client to
+            re-establish a connection. Set this to true to log those 502 errors</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.FETCH_MISSING_INVENTORY">
+            <summary>If true, any reference received for a folder or item
+            the library is not aware of will automatically be fetched</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.DISABLE_AGENT_UPDATE_DUPLICATE_CHECK">
+            <summary>If true, and <code>SEND_AGENT_UPDATES</code> is true,
+            AgentUpdate packets will continuously be sent out to give the bot
+            smoother movement and autopiloting</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.AVATAR_TRACKING">
+            <summary>If true, currently visible avatars will be stored
+            in dictionaries inside <code>Simulator.ObjectAvatars</code>.
+            If false, a new Avatar or Primitive object will be created
+            each time an object update packet is received</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.OBJECT_TRACKING">
+            <summary>If true, currently visible avatars will be stored
+            in dictionaries inside <code>Simulator.ObjectPrimitives</code>.
+            If false, a new Avatar or Primitive object will be created
+            each time an object update packet is received</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.USE_INTERPOLATION_TIMER">
+            <summary>If true, position and velocity will periodically be
+            interpolated (extrapolated, technically) for objects and
+            avatars that are being tracked by the library. This is
+            necessary to increase the accuracy of speed and position
+            estimates for simulated objects</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.TRACK_UTILIZATION">
             <summary>
-            TODO: Encodes a scripts contents into a LSO Bytecode file
+            If true, utilization statistics will be tracked. There is a minor penalty
+            in CPU time for enabling this option.
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.Decode">
+        <member name="F:OpenMetaverse.Settings.PARCEL_TRACKING">
+            <summary>If true, parcel details will be stored in the
+            <code>Simulator.Parcels</code> dictionary as they are received</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.ALWAYS_REQUEST_PARCEL_ACL">
             <summary>
-            TODO: Decode LSO Bytecode into a string
+            If true, an incoming parcel properties reply will automatically send
+            a request for the parcel access list
             </summary>
-            <returns>true</returns>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetScriptBinary.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="F:OpenMetaverse.Settings.ALWAYS_REQUEST_PARCEL_DWELL">
+            <summary>
+            if true, an incoming parcel properties reply will automatically send
+            a request for the traffic count.
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.TarArchiveWriter">
+        <member name="F:OpenMetaverse.Settings.USE_ASSET_CACHE">
             <summary>
-            Temporary code to produce a tar archive in tar v7 format
+            If true, images, and other assets downloaded from the server
+            will be cached in a local directory
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.TarArchiveWriter.m_bw">
+        <member name="F:OpenMetaverse.Settings.ASSET_CACHE_DIR">
+            <summary>Path to store cached texture data</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.ASSET_CACHE_MAX_SIZE">
+            <summary>Maximum size cached files are allowed to take on disk (bytes)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.DEFAULT_EFFECT_COLOR">
+            <summary>Default color used for viewer particle effects</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.MAX_RESEND_COUNT">
+            <summary>Maximum number of times to resend a failed packet</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.THROTTLE_OUTGOING_PACKETS">
+            <summary>Throttle outgoing packet rate</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.CLIENT_IDENTIFICATION_TAG">
+            <summary>UUID of a texture used by some viewers to indentify type of client used</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.USE_HTTP_TEXTURES">
             <summary>
-            Binary writer for the underlying stream
+            Download textures using GetTexture capability when available
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteDir(System.String)">
+        <member name="F:OpenMetaverse.Settings.MAX_CONCURRENT_TEXTURE_DOWNLOADS">
+            <summary>The maximum number of concurrent texture downloads allowed</summary>
+            <remarks>Increasing this number will not necessarily increase texture retrieval times due to
+            simulator throttles</remarks>
+        </member>
+        <member name="F:OpenMetaverse.Settings.PIPELINE_REFRESH_INTERVAL">
             <summary>
-            Write a directory entry to the tar archive.  We can only handle one path level right now!
+            The Refresh timer inteval is used to set the delay between checks for stalled texture downloads
             </summary>
-            <param name="dirName"></param>
+            <remarks>This is a static variable which applies to all instances</remarks>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteFile(System.String,System.String)">
+        <member name="F:OpenMetaverse.Settings.PIPELINE_REQUEST_TIMEOUT">
             <summary>
-            Write a file to the tar archive
+            Textures taking longer than this value will be flagged as timed out and removed from the pipeline
             </summary>
-            <param name="filePath"></param>
-            <param name="data"></param>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteFile(System.String,System.Byte[])">
+        <member name="F:OpenMetaverse.Settings.LOG_LEVEL">
             <summary>
-            Write a file to the tar archive
+            Get or set the minimum log level to output to the console by default
+            If the library is not compiled with DEBUG defined and this level is set to DEBUG
+            You will get no output on the console. This behavior can be overriden by creating
+            a logger configuration file for log4net
             </summary>
-            <param name="filePath"></param>
-            <param name="data"></param>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.Close">
+        <member name="F:OpenMetaverse.Settings.LOG_NAMES">
+            <summary>Attach avatar names to log messages</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.LOG_RESENDS">
+            <summary>Log packet retransmission info</summary>
+        </member>
+        <member name="P:OpenMetaverse.Settings.UPLOAD_COST">
+            <summary>Cost of uploading an asset</summary>
+            <remarks>Read-only since this value is dynamically fetched at login</remarks>
+        </member>
+        <member name="M:OpenMetaverse.Settings.EconomyDataHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="T:OpenMetaverse.RegionFlags">
             <summary>
-            Finish writing the raw tar archive data to a stream.  The stream will be closed on completion.
+            Simulator (region) properties
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteEntry(System.String,System.Byte[],System.Char)">
+        <member name="F:OpenMetaverse.RegionFlags.None">
+            <summary>No flags set</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.AllowDamage">
+            <summary>Agents can take damage and be killed</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.AllowLandmark">
+            <summary>Landmarks can be created here</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.AllowSetHome">
+            <summary>Home position can be set in this sim</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.ResetHomeOnTeleport">
+            <summary>Home position is reset when an agent teleports away</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.SunFixed">
+            <summary>Sun does not move</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.TaxFree">
+            <summary>No object, land, etc. taxes</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.BlockTerraform">
+            <summary>Disable heightmap alterations (agents can still plant
+            foliage)</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.BlockLandResell">
+            <summary>Land cannot be released, sold, or purchased</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.Sandbox">
+            <summary>All content is wiped nightly</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.NullLayer">
+            <summary>Unknown: Related to the availability of an overview world map tile.(Think mainland images when zoomed out.)</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.SkipAgentAction">
+            <summary>Unknown: Related to region debug flags. Possibly to skip processing of agent interaction with world. </summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.SkipUpdateInterestList">
+            <summary>Region does not update agent prim interest lists. Internal debugging option.</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.SkipCollisions">
+            <summary>No collision detection for non-agent objects</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.SkipScripts">
+            <summary>No scripts are ran</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.SkipPhysics">
+            <summary>All physics processing is turned off</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.ExternallyVisible">
+            <summary>Region can be seen from other regions on world map. (Legacy world map option?) </summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.MainlandVisible">
+            <summary>Region can be seen from mainland on world map. (Legacy world map option?) </summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.PublicAllowed">
+            <summary>Agents not explicitly on the access list can visit the region. </summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.BlockDwell">
+            <summary>Traffic calculations are not run across entire region, overrides parcel settings. </summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.NoFly">
+            <summary>Flight is disabled (not currently enforced by the sim)</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.AllowDirectTeleport">
+            <summary>Allow direct (p2p) teleporting</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.EstateSkipScripts">
+            <summary>Estate owner has temporarily disabled scripting</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.RestrictPushObject">
+            <summary>Restricts the usage of the LSL llPushObject function, applies to whole region.</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.DenyAnonymous">
+            <summary>Deny agents with no payment info on file</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.DenyIdentified">
+            <summary>Deny agents with payment info on file</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.DenyTransacted">
+            <summary>Deny agents who have made a monetary transaction</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.AllowParcelChanges">
+            <summary>Parcels within the region may be joined or divided by anyone, not just estate owners/managers. </summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.AbuseEmailToEstateOwner">
+            <summary>Abuse reports sent from within this region are sent to the estate owner defined email. </summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.AllowVoice">
+            <summary>Region is Voice Enabled</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.BlockParcelSearch">
+            <summary>Removes the ability from parcel owners to set their parcels to show in search.</summary>
+        </member>
+        <member name="F:OpenMetaverse.RegionFlags.DenyAgeUnverified">
+            <summary>Deny agents who have not been age verified from entering the region.</summary>
+        </member>
+        <member name="T:OpenMetaverse.SimAccess">
+            <summary>
+            Access level for a simulator
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.SimAccess.Unknown">
+            <summary>Unknown or invalid access level</summary>
+        </member>
+        <member name="F:OpenMetaverse.SimAccess.Trial">
+            <summary>Trial accounts allowed</summary>
+        </member>
+        <member name="F:OpenMetaverse.SimAccess.PG">
+            <summary>PG rating</summary>
+        </member>
+        <member name="F:OpenMetaverse.SimAccess.Mature">
+            <summary>Mature rating</summary>
+        </member>
+        <member name="F:OpenMetaverse.SimAccess.Adult">
+            <summary>Adult rating</summary>
+        </member>
+        <member name="F:OpenMetaverse.SimAccess.Down">
+            <summary>Simulator is offline</summary>
+        </member>
+        <member name="F:OpenMetaverse.SimAccess.NonExistent">
+            <summary>Simulator does not exist</summary>
+        </member>
+        <member name="T:OpenMetaverse.Simulator">
+            <summary>
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Simulator.#ctor(OpenMetaverse.GridClient,System.Net.IPEndPoint,System.UInt64)">
+            <summary>
+            </summary>
+            <param name="client">Reference to the GridClient object</param>
+            <param name="address">IPEndPoint of the simulator</param>
+            <param name="handle">handle of the simulator</param>
+        </member>
+        <member name="T:OpenMetaverse.Simulator.SimStats">
+            <summary>
+            Simulator Statistics
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.SentPackets">
+            <summary>Total number of packets sent by this simulator to this agent</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.RecvPackets">
+            <summary>Total number of packets received by this simulator to this agent</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.SentBytes">
+            <summary>Total number of bytes sent by this simulator to this agent</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.RecvBytes">
+            <summary>Total number of bytes received by this simulator to this agent</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ConnectTime">
+            <summary>Time in seconds agent has been connected to simulator</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ResentPackets">
+            <summary>Total number of packets that have been resent</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ReceivedResends">
+            <summary>Total number of resent packets recieved</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.SentPings">
+            <summary>Total number of pings sent to this simulator by this agent</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ReceivedPongs">
+            <summary>Total number of ping replies sent to this agent by this simulator</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.IncomingBPS">
+            <summary>
+            Incoming bytes per second
+            </summary>
+            <remarks>It would be nice to have this claculated on the fly, but
+            this is far, far easier</remarks>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.OutgoingBPS">
+            <summary>
+            Outgoing bytes per second
+            </summary>
+            <remarks>It would be nice to have this claculated on the fly, but
+            this is far, far easier</remarks>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.LastPingSent">
+            <summary>Time last ping was sent</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.LastPingID">
+            <summary>ID of last Ping sent</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.LastLag">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.MissedPings">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.Dilation">
+            <summary>Current time dilation of this simulator</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.FPS">
+            <summary>Current Frames per second of simulator</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.PhysicsFPS">
+            <summary>Current Physics frames per second of simulator</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.AgentUpdates">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.FrameTime">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.NetTime">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.PhysicsTime">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ImageTime">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ScriptTime">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.AgentTime">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.OtherTime">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.Objects">
+            <summary>Total number of objects Simulator is simulating</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ScriptedObjects">
+            <summary>Total number of Active (Scripted) objects running</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.Agents">
+            <summary>Number of agents currently in this simulator</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ChildAgents">
+            <summary>Number of agents in neighbor simulators</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ActiveScripts">
+            <summary>Number of Active scripts running in this simulator</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.LSLIPS">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.INPPS">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.OUTPPS">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.PendingDownloads">
+            <summary>Number of downloads pending</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.PendingUploads">
+            <summary>Number of uploads pending</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.VirtualSize">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.ResidentSize">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.PendingLocalUploads">
+            <summary>Number of local uploads pending</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimStats.UnackedBytes">
+            <summary>Unacknowledged bytes in queue</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.Client">
+            <summary>A public reference to the client that this Simulator object
+            is attached to</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.ID">
+            <summary>A Unique Cache identifier for this simulator</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.Caps">
+            <summary>The capabilities for this simulator</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.Handle">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimVersion">
+            <summary>The current version of software this simulator is running</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.Name">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.ParcelOverlay">
+            <summary>A 64x64 grid of parcel coloring values. The values stored
+            in this array are of the <seealso cref="!:ParcelArrayType" /> type</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.ParcelOverlaysReceived">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange00">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange01">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange10">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange11">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight00">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight01">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight10">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight11">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.WaterHeight">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.SimOwner">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.TerrainBase0">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.TerrainBase1">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.TerrainBase2">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.TerrainBase3">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.TerrainDetail0">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.TerrainDetail1">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.TerrainDetail2">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.TerrainDetail3">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.IsEstateManager">
+            <summary>true if your agent has Estate Manager rights on this region</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.Flags">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.Access">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.BillableFactor">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.Stats">
+            <summary>Statistics information for this simulator and the
+            connection to the simulator, calculated by the simulator itself
+            and the library</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.RegionID">
+            <summary>The regions Unique ID</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.ColoLocation">
+            <summary>The physical data center the simulator is located</summary>
+            <remarks>Known values are:
+            <list type="table"><item>Dallas</item><item>Chandler</item><item>SF</item></list></remarks>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.CPUClass">
+            <summary>The CPU Class of the simulator</summary>
+            <remarks>Most full mainland/estate sims appear to be 5,
+            Homesteads and Openspace appear to be 501</remarks>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.CPURatio">
+            <summary>The number of regions sharing the same CPU as this one</summary>
+            <remarks>"Full Sims" appear to be 1, Homesteads appear to be 4</remarks>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.ProductName">
+            <summary>The billing product name</summary>
+            <remarks>Known values are:
+            <list type="table"><item>Mainland / Full Region (Sku: 023)</item><item>Estate / Full Region (Sku: 024)</item><item>Estate / Openspace (Sku: 027)</item><item>Estate / Homestead (Sku: 029)</item><item>Mainland / Homestead (Sku: 129) (Linden Owned)</item><item>Mainland / Linden Homes (Sku: 131)</item></list></remarks>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.ProductSku">
+            <summary>The billing product SKU</summary>
+            <remarks>Known values are:
+            <list type="table"><item>023 Mainland / Full Region</item><item>024 Estate / Full Region</item><item>027 Estate / Openspace</item><item>029 Estate / Homestead</item><item>129 Mainland / Homestead (Linden Owned)</item><item>131 Linden Homes / Full Region</item></list></remarks>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.Sequence">
+            <summary>The current sequence number for packets sent to this
+            simulator. Must be Interlocked before modifying. Only
+            useful for applications manipulating sequence numbers</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.ObjectsAvatars">
+            <summary>
+            A thread-safe dictionary containing avatars in a simulator
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.ObjectsPrimitives">
+            <summary>
+            A thread-safe dictionary containing primitives in a simulator
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.Parcels">
+            <summary>
+            Provides access to an internal thread-safe dictionary containing parcel
+            information found in this simulator
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.AgentMovementComplete">
+            <summary>
+            Is it safe to send agent updates to this sim
+            AgentMovementComplete message received
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.DisconnectCandidate">
+            <summary>Used internally to track sim disconnections</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.ConnectedEvent">
+            <summary>Event that is triggered when the simulator successfully
+            establishes a connection</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.connected">
+            <summary>Whether this sim is currently connected or not. Hooked up
+            to the property Connected</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.avatarPositions">
+            <summary>Coarse locations of avatars in this simulator</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.preyID">
+            <summary>AvatarPositions key representing TrackAgent target</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.PacketArchive">
+            <summary>Sequence numbers of packets we've received
+            (for duplicate checking)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.NeedAck">
+            <summary>Packets we sent out that need ACKs from the simulator</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.pauseSerial">
+            <summary>Sequence number for pause/resume</summary>
+        </member>
+        <member name="F:OpenMetaverse.Simulator.handshakeComplete">
+            <summary>Indicates if UDP connection to the sim is fully established</summary>
+        </member>
+        <member name="P:OpenMetaverse.Simulator.ParcelMap">
+            <summary>
+            Provides access to an internal thread-safe multidimensional array containing a x,y grid mapped
+            to each 64x64 parcel's LocalID.
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.Simulator.IPEndPoint">
+            <summary>The IP address and port of the server</summary>
+        </member>
+        <member name="P:OpenMetaverse.Simulator.Connected">
+            <summary>Whether there is a working connection to the simulator or
+            not</summary>
+        </member>
+        <member name="P:OpenMetaverse.Simulator.AvatarPositions">
+            <summary>Coarse locations of avatars in this simulator</summary>
+        </member>
+        <member name="P:OpenMetaverse.Simulator.PreyID">
+            <summary>AvatarPositions key representing TrackAgent target</summary>
+        </member>
+        <member name="P:OpenMetaverse.Simulator.HandshakeComplete">
+            <summary>Indicates if UDP connection to the sim is fully established</summary>
+        </member>
+        <member name="M:OpenMetaverse.Simulator.IsParcelMapFull">
+            <summary>
+            Checks simulator parcel map to make sure it has downloaded all data successfully
+            </summary>
+            <returns>true if map is full (contains no 0's)</returns>
+        </member>
+        <member name="M:OpenMetaverse.Simulator.Dispose">
+            <summary>
+            Called when this Simulator object is being destroyed
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Simulator.Connect(System.Boolean)">
+            <summary>
+            Attempt to connect to this simulator
+            </summary>
+            <param name="moveToSim">Whether to move our agent in to this sim or not</param>
+            <returns>True if the connection succeeded or connection status is
+            unknown, false if there was a failure</returns>
+        </member>
+        <member name="M:OpenMetaverse.Simulator.UseCircuitCode(System.Boolean)">
+            <summary>
+            Initiates connection to the simulator
+            </summary>
+            <param name="waitForAck">Should we block until ack for this packet is recieved</param>
+        </member>
+        <member name="M:OpenMetaverse.Simulator.Disconnect(System.Boolean)">
+            <summary>
+            Disconnect from this simulator
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Simulator.Pause">
+            <summary>
+            Instructs the simulator to stop sending update (and possibly other) packets
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Simulator.Resume">
+            <summary>
+            Instructs the simulator to resume sending update packets (unpause)
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Simulator.TerrainHeightAtPoint(System.Int32,System.Int32,System.Single@)">
+            <summary>
+            Retrieve the terrain height at a given coordinate
+            </summary>
+            <param name="x">Sim X coordinate, valid range is from 0 to 255</param>
+            <param name="y">Sim Y coordinate, valid range is from 0 to 255</param>
+            <param name="height">The terrain height at the given point if the
+            lookup was successful, otherwise 0.0f</param>
+            <returns>True if the lookup was successful, otherwise false</returns>
+        </member>
+        <member name="M:OpenMetaverse.Simulator.SendPacket(OpenMetaverse.Packets.Packet)">
+            <summary>
+            Sends a packet
+            </summary>
+            <param name="packet">Packet to be sent</param>
+        </member>
+        <member name="M:OpenMetaverse.Simulator.SendPing">
+            <summary>
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Simulator.ToString">
+            <summary>
+            Returns Simulator Name as a String
+            </summary>
+            <returns>
+            </returns>
+        </member>
+        <member name="M:OpenMetaverse.Simulator.GetHashCode">
+            <summary>
+            </summary>
+            <returns>
+            </returns>
+        </member>
+        <member name="M:OpenMetaverse.Simulator.Equals(System.Object)">
+            <summary>
+            </summary>
+            <param name="obj">
+            </param>
+            <returns>
+            </returns>
+        </member>
+        <member name="M:OpenMetaverse.Simulator.SendAcks">
+            <summary>
+            Sends out pending acknowledgements
+            </summary>
+            <returns>Number of ACKs sent</returns>
+        </member>
+        <member name="M:OpenMetaverse.Simulator.ResendUnacked">
+            <summary>
+            Resend unacknowledged packets
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.SoundManager">
+            <summary>
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.SoundManager.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Construct a new instance of the SoundManager class, used for playing and receiving
+            sound assets
+            </summary>
+            <param name="client">A reference to the current GridClient instance</param>
+        </member>
+        <member name="F:OpenMetaverse.SoundManager.m_AttachedSound">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.SoundManager.m_AttachedSoundLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.SoundManager.m_AttachedSoundGainChange">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.SoundManager.m_AttachedSoundGainChangeLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.SoundManager.m_SoundTrigger">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.SoundManager.m_SoundTriggerLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.SoundManager.m_PreloadSound">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.SoundManager.m_PreloadSoundLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="E:OpenMetaverse.SoundManager.AttachedSound">
+            <summary>Raised when the simulator sends us data containing
+            sound</summary>
+        </member>
+        <member name="E:OpenMetaverse.SoundManager.AttachedSoundGainChange">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
+        </member>
+        <member name="E:OpenMetaverse.SoundManager.SoundTrigger">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
+        </member>
+        <member name="E:OpenMetaverse.SoundManager.PreloadSound">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
+        </member>
+        <member name="M:OpenMetaverse.SoundManager.OnAttachedSound(OpenMetaverse.AttachedSoundEventArgs)">
+            <summary>Raises the AttachedSound Event</summary>
+            <param name="e">A AttachedSoundEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.SoundManager.OnAttachedSoundGainChange(OpenMetaverse.AttachedSoundGainChangeEventArgs)">
+            <summary>Raises the AttachedSoundGainChange Event</summary>
+            <param name="e">A AttachedSoundGainChangeEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.SoundManager.OnSoundTrigger(OpenMetaverse.SoundTriggerEventArgs)">
+            <summary>Raises the SoundTrigger Event</summary>
+            <param name="e">A SoundTriggerEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.SoundManager.OnPreloadSound(OpenMetaverse.PreloadSoundEventArgs)">
+            <summary>Raises the PreloadSound Event</summary>
+            <param name="e">A PreloadSoundEventArgs object containing
+            the data sent from the simulator</param>
+        </member>
+        <member name="M:OpenMetaverse.SoundManager.PlaySound(OpenMetaverse.UUID)">
+            <summary>
+            Plays a sound in the current region at full volume from avatar position
+            </summary>
+            <param name="soundID">UUID of the sound to be played</param>
+        </member>
+        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,OpenMetaverse.Vector3)">
+            <summary>
+            Plays a sound in the current region at full volume
+            </summary>
+            <param name="soundID">UUID of the sound to be played.</param>
+            <param name="position">position for the sound to be played at. Normally the avatar.</param>
+        </member>
+        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,OpenMetaverse.Vector3,System.Single)">
+            <summary>
+            Plays a sound in the current region
+            </summary>
+            <param name="soundID">UUID of the sound to be played.</param>
+            <param name="position">position for the sound to be played at. Normally the avatar.</param>
+            <param name="gain">volume of the sound, from 0.0 to 1.0</param>
+        </member>
+        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,OpenMetaverse.Simulator,OpenMetaverse.Vector3,System.Single)">
+            <summary>
+            Plays a sound in the specified sim
+            </summary>
+            <param name="soundID">UUID of the sound to be played.</param>
+            <param name="sim">UUID of the sound to be played.</param>
+            <param name="position">position for the sound to be played at. Normally the avatar.</param>
+            <param name="gain">volume of the sound, from 0.0 to 1.0</param>
+        </member>
+        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,System.UInt64,OpenMetaverse.Vector3,System.Single)">
+            <summary>
+            Play a sound asset
+            </summary>
+            <param name="soundID">UUID of the sound to be played.</param>
+            <param name="handle">handle id for the sim to be played in.</param>
+            <param name="position">position for the sound to be played at. Normally the avatar.</param>
+            <param name="gain">volume of the sound, from 0.0 to 1.0</param>
+        </member>
+        <member name="M:OpenMetaverse.SoundManager.AttachedSoundHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="M:OpenMetaverse.SoundManager.AttachedSoundGainChangeHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="M:OpenMetaverse.SoundManager.PreloadSoundHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="M:OpenMetaverse.SoundManager.SoundTriggerHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>Process an incoming packet and raise the appropriate events</summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="T:OpenMetaverse.AttachedSoundEventArgs">
+            <summary>Provides data for the <see cref="E:OpenMetaverse.SoundManager.AttachedSound" /> event</summary>
+            <remarks>The <see cref="E:OpenMetaverse.SoundManager.AttachedSound" /> event occurs when the simulator sends
+            the sound data which emits from an agents attachment</remarks>
+            <example>
+            The following code example shows the process to subscribe to the <see cref="E:OpenMetaverse.SoundManager.AttachedSound" /> event
+            and a stub to handle the data passed from the simulator
+            <code>
+            // Subscribe to the AttachedSound event
+            Client.Sound.AttachedSound += Sound_AttachedSound;
+            // process the data raised in the event here
+            private void Sound_AttachedSound(object sender, AttachedSoundEventArgs e)
+            {
+            // ... Process AttachedSoundEventArgs here ...
+            }
+            </code></example>
+        </member>
+        <member name="M:OpenMetaverse.AttachedSoundEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,System.Single,OpenMetaverse.SoundFlags)">
+            <summary>
+            Construct a new instance of the SoundTriggerEventArgs class
+            </summary>
+            <param name="sim">Simulator where the event originated</param>
+            <param name="soundID">The sound asset id</param>
+            <param name="ownerID">The ID of the owner</param>
+            <param name="objectID">The ID of the object</param>
+            <param name="gain">The volume level</param>
+            <param name="flags">The <see cref="T:OpenMetaverse.SoundFlags" /></param>
+        </member>
+        <member name="P:OpenMetaverse.AttachedSoundEventArgs.Simulator">
+            <summary>Simulator where the event originated</summary>
+        </member>
+        <member name="P:OpenMetaverse.AttachedSoundEventArgs.SoundID">
+            <summary>Get the sound asset id</summary>
+        </member>
+        <member name="P:OpenMetaverse.AttachedSoundEventArgs.OwnerID">
+            <summary>Get the ID of the owner</summary>
+        </member>
+        <member name="P:OpenMetaverse.AttachedSoundEventArgs.ObjectID">
+            <summary>Get the ID of the Object</summary>
+        </member>
+        <member name="P:OpenMetaverse.AttachedSoundEventArgs.Gain">
+            <summary>Get the volume level</summary>
+        </member>
+        <member name="P:OpenMetaverse.AttachedSoundEventArgs.Flags">
+            <summary>Get the <see cref="T:OpenMetaverse.SoundFlags" /></summary>
+        </member>
+        <member name="T:OpenMetaverse.AttachedSoundGainChangeEventArgs">
+            <summary>Provides data for the <see cref="E:OpenMetaverse.SoundManager.AttachedSoundGainChange" /> event</summary>
+            <remarks>The <see cref="E:OpenMetaverse.SoundManager.AttachedSoundGainChange" /> event occurs when an attached sound
+            changes its volume level</remarks>
+        </member>
+        <member name="M:OpenMetaverse.AttachedSoundGainChangeEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,System.Single)">
+            <summary>
+            Construct a new instance of the AttachedSoundGainChangedEventArgs class
+            </summary>
+            <param name="sim">Simulator where the event originated</param>
+            <param name="objectID">The ID of the Object</param>
+            <param name="gain">The new volume level</param>
+        </member>
+        <member name="P:OpenMetaverse.AttachedSoundGainChangeEventArgs.Simulator">
+            <summary>Simulator where the event originated</summary>
+        </member>
+        <member name="P:OpenMetaverse.AttachedSoundGainChangeEventArgs.ObjectID">
+            <summary>Get the ID of the Object</summary>
+        </member>
+        <member name="P:OpenMetaverse.AttachedSoundGainChangeEventArgs.Gain">
+            <summary>Get the volume level</summary>
+        </member>
+        <member name="T:OpenMetaverse.SoundTriggerEventArgs">
+            <summary>Provides data for the <see cref="E:OpenMetaverse.SoundManager.SoundTrigger" /> event</summary>
+            <remarks>
+                <para>The <see cref="E:OpenMetaverse.SoundManager.SoundTrigger" /> event occurs when the simulator forwards
+            a request made by yourself or another agent to play either an asset sound or a built in sound</para>
+                <para>Requests to play sounds where the <see cref="P:OpenMetaverse.SoundTriggerEventArgs.SoundID" /> is not one of the built-in
+            <see cref="T:OpenMetaverse.Sounds" /> will require sending a request to download the sound asset before it can be played</para>
+            </remarks>
+            <example>
+            The following code example uses the <see cref="P:OpenMetaverse.SoundTriggerEventArgs.OwnerID" />, <see cref="P:OpenMetaverse.SoundTriggerEventArgs.SoundID" />
+            and <see cref="P:OpenMetaverse.SoundTriggerEventArgs.Gain" />
+            properties to display some information on a sound request on the <see cref="T:System.Console" /> window.
+            <code>
+            // subscribe to the event
+            Client.Sound.SoundTrigger += Sound_SoundTrigger;
+            // play the pre-defined BELL_TING sound
+            Client.Sound.SendSoundTrigger(Sounds.BELL_TING);
+            // handle the response data
+            private void Sound_SoundTrigger(object sender, SoundTriggerEventArgs e)
+            {
+            Console.WriteLine("{0} played the sound {1} at volume {2}",
+            e.OwnerID, e.SoundID, e.Gain);
+            }
+            </code></example>
+        </member>
+        <member name="M:OpenMetaverse.SoundTriggerEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,System.Single,System.UInt64,OpenMetaverse.Vector3)">
+            <summary>
+            Construct a new instance of the SoundTriggerEventArgs class
+            </summary>
+            <param name="sim">Simulator where the event originated</param>
+            <param name="soundID">The sound asset id</param>
+            <param name="ownerID">The ID of the owner</param>
+            <param name="objectID">The ID of the object</param>
+            <param name="parentID">The ID of the objects parent</param>
+            <param name="gain">The volume level</param>
+            <param name="regionHandle">The regionhandle</param>
+            <param name="position">The source position</param>
+        </member>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.Simulator">
+            <summary>Simulator where the event originated</summary>
+        </member>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.SoundID">
+            <summary>Get the sound asset id</summary>
+        </member>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.OwnerID">
+            <summary>Get the ID of the owner</summary>
+        </member>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.ObjectID">
+            <summary>Get the ID of the Object</summary>
+        </member>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.ParentID">
+            <summary>Get the ID of the objects parent</summary>
+        </member>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.Gain">
+            <summary>Get the volume level</summary>
+        </member>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.RegionHandle">
+            <summary>Get the regionhandle</summary>
+        </member>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.Position">
+            <summary>Get the source position</summary>
+        </member>
+        <member name="T:OpenMetaverse.PreloadSoundEventArgs">
+            <summary>Provides data for the <see cref="E:OpenMetaverse.AvatarManager.AvatarAppearance" /> event</summary>
+            <remarks>The <see cref="E:OpenMetaverse.AvatarManager.AvatarAppearance" /> event occurs when the simulator sends
+            the appearance data for an avatar</remarks>
+            <example>
+            The following code example uses the <see cref="P:OpenMetaverse.AvatarAppearanceEventArgs.AvatarID" /> and <see cref="P:OpenMetaverse.AvatarAppearanceEventArgs.VisualParams" />
+            properties to display the selected shape of an avatar on the <see cref="T:System.Console" /> window.
+            <code>
+            // subscribe to the event
+            Client.Avatars.AvatarAppearance += Avatars_AvatarAppearance;
+            // handle the data when the event is raised
+            void Avatars_AvatarAppearance(object sender, AvatarAppearanceEventArgs e)
+            {
+            Console.WriteLine("The Agent {0} is using a {1} shape.", e.AvatarID, (e.VisualParams[31] &gt; 0) : "male" ? "female")
+            }
+            </code></example>
+        </member>
+        <member name="M:OpenMetaverse.PreloadSoundEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID)">
+            <summary>
+            Construct a new instance of the PreloadSoundEventArgs class
+            </summary>
+            <param name="sim">Simulator where the event originated</param>
+            <param name="soundID">The sound asset id</param>
+            <param name="ownerID">The ID of the owner</param>
+            <param name="objectID">The ID of the object</param>
+        </member>
+        <member name="P:OpenMetaverse.PreloadSoundEventArgs.Simulator">
+            <summary>Simulator where the event originated</summary>
+        </member>
+        <member name="P:OpenMetaverse.PreloadSoundEventArgs.SoundID">
+            <summary>Get the sound asset id</summary>
+        </member>
+        <member name="P:OpenMetaverse.PreloadSoundEventArgs.OwnerID">
+            <summary>Get the ID of the owner</summary>
+        </member>
+        <member name="P:OpenMetaverse.PreloadSoundEventArgs.ObjectID">
+            <summary>Get the ID of the Object</summary>
+        </member>
+        <member name="T:OpenMetaverse.Sounds">
+            <summary>
+            pre-defined built in sounds
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.BELL_TING">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.CLICK">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.HEALTH_REDUCTION_FEMALE">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.HEALTH_REDUCTION_MALE">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.IM_START">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.INSTANT_MESSAGE_NOTIFICATION">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.INVALID_OPERATION">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.KEYBOARD_LOOP">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.MONEY_REDUCTION_COINS">
+            <summary>coins</summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.MONEY_INCREASE_CASH_REGISTER_BELL">
+            <summary>cash register bell</summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.NULL_KEYSTROKE">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_RUBBER">
+            <summary>rubber</summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_PLASTIC">
+            <summary>plastic</summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_FLESH">
+            <summary>flesh</summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_WOOD_SPLINTERING">
+            <summary>wood splintering?</summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_GLASS_BREAK">
+            <summary>glass break</summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_METAL_CLUNK">
+            <summary>metal clunk</summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_CREATE_WHOOSH">
+            <summary>whoosh</summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_DELETE_SHAKE">
+            <summary>shake</summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.OBJECT_REZ">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_APPEAR_DING">
+            <summary>ding</summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT1">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT2">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT3">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT4">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT5">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT6">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT7">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.SNAPSHOT">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.TELEPORT_TEXTURE_APPLY">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.THUNDER">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.WINDOW_CLOSE">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.WINDOW_OPEN">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Sounds.ZIPPER">
+            <summary>
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Sounds.ToDictionary">
+            <summary>
+            A dictionary containing all pre-defined sounds
+            </summary>
+            <returns>A dictionary containing the pre-defined sounds,
+            where the key is the sounds ID, and the value is a string
+            containing a name to identify the purpose of the sound</returns>
+        </member>
+        <member name="F:OpenMetaverse.TerrainPatch.X">
+            <summary>X position of this patch</summary>
+        </member>
+        <member name="F:OpenMetaverse.TerrainPatch.Y">
+            <summary>Y position of this patch</summary>
+        </member>
+        <member name="F:OpenMetaverse.TerrainPatch.Data">
+            <summary>A 16x16 array of floats holding decompressed layer data</summary>
+        </member>
+        <member name="M:OpenMetaverse.TerrainCompressor.CreateLandPacket(System.Single[],System.Int32[])">
+            <summary>
+            Creates a LayerData packet for compressed land data given a full
+            simulator heightmap and an array of indices of patches to compress
+            </summary>
+            <param name="heightmap">A 256 * 256 array of floating point values
+            specifying the height at each meter in the simulator</param>
+            <param name="patches">Array of indexes in the 16x16 grid of patches
+            for this simulator. For example if 1 and 17 are specified, patches
+            x=1,y=0 and x=1,y=1 are sent</param>
+            <returns>
+            </returns>
+        </member>
+        <member name="M:OpenMetaverse.TerrainCompressor.CreatePatchFromHeightmap(OpenMetaverse.BitPack,System.Single[],System.Int32,System.Int32)">
+            <summary>
+            Add a patch of terrain to a BitPacker
+            </summary>
+            <param name="output">BitPacker to write the patch to</param>
+            <param name="heightmap">Heightmap of the simulator, must be a 256 *
+            256 float array</param>
+            <param name="x">X offset of the patch to create, valid values are
+            from 0 to 15</param>
+            <param name="y">Y offset of the patch to create, valid values are
+            from 0 to 15</param>
+        </member>
+        <member name="M:OpenMetaverse.TerrainManager.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Default constructor
+            </summary>
+            <param name="client">
+            </param>
+        </member>
+        <member name="F:OpenMetaverse.TerrainManager.m_LandPatchReceivedEvent">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </member>
+        <member name="F:OpenMetaverse.TerrainManager.m_LandPatchReceivedLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="E:OpenMetaverse.TerrainManager.LandPatchReceived">
+            <summary>Raised when the simulator responds sends </summary>
+        </member>
+        <member name="M:OpenMetaverse.TerrainManager.OnLandPatchReceived(OpenMetaverse.LandPatchReceivedEventArgs)">
+            <summary>Raises the LandPatchReceived event</summary>
+            <param name="e">A LandPatchReceivedEventArgs object containing the
+            data returned from the simulator</param>
+        </member>
+        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.Simulator">
+            <summary>Simulator from that sent tha data</summary>
+        </member>
+        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.X">
+            <summary>Sim coordinate of the patch</summary>
+        </member>
+        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.Y">
+            <summary>Sim coordinate of the patch</summary>
+        </member>
+        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.PatchSize">
+            <summary>Size of tha patch</summary>
+        </member>
+        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.HeightMap">
+            <summary>Heightmap for the patch</summary>
+        </member>
+        <member name="T:OpenMetaverse.TextureRequestState">
+            <summary>
+            The current status of a texture request as it moves through the pipeline or final result of a texture request.
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.TextureRequestState.Pending">
+            <summary>The initial state given to a request. Requests in this state
+            are waiting for an available slot in the pipeline</summary>
+        </member>
+        <member name="F:OpenMetaverse.TextureRequestState.Started">
+            <summary>A request that has been added to the pipeline and the request packet
+            has been sent to the simulator</summary>
+        </member>
+        <member name="F:OpenMetaverse.TextureRequestState.Progress">
+            <summary>A request that has received one or more packets back from the simulator</summary>
+        </member>
+        <member name="F:OpenMetaverse.TextureRequestState.Finished">
+            <summary>A request that has received all packets back from the simulator</summary>
+        </member>
+        <member name="F:OpenMetaverse.TextureRequestState.Timeout">
+            <summary>A request that has taken longer than <seealso cref="F:OpenMetaverse.Settings.PIPELINE_REQUEST_TIMEOUT" />
+            to download OR the initial packet containing the packet information was never received</summary>
+        </member>
+        <member name="F:OpenMetaverse.TextureRequestState.Aborted">
+            <summary>The texture request was aborted by request of the agent</summary>
+        </member>
+        <member name="F:OpenMetaverse.TextureRequestState.NotFound">
+            <summary>The simulator replied to the request that it was not able to find the requested texture</summary>
+        </member>
+        <member name="T:OpenMetaverse.TexturePipeline">
+            <summary>
+            Texture request download handler, allows a configurable number of download slots which manage multiple
+            concurrent texture downloads from the <seealso cref="T:OpenMetaverse.Simulator" /></summary>
+            <remarks>This class makes full use of the internal <seealso cref="!:TextureCache" />
+            system for full texture downloads.</remarks>
+        </member>
+        <member name="M:OpenMetaverse.TexturePipeline.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Default constructor, Instantiates a new copy of the TexturePipeline class
+            </summary>
+            <param name="client">Reference to the instantiated <see cref="T:OpenMetaverse.GridClient" /> object</param>
+        </member>
+        <member name="T:OpenMetaverse.TexturePipeline.TaskInfo">
+            <summary>
+            A request task containing information and status of a request as it is processed through the <see cref="T:OpenMetaverse.TexturePipeline" /></summary>
+        </member>
+        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.State">
+            <summary>The current <seealso cref="T:OpenMetaverse.TextureRequestState" /> which identifies the current status of the request</summary>
+        </member>
+        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.RequestID">
+            <summary>The Unique Request ID, This is also the Asset ID of the texture being requested</summary>
+        </member>
+        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.RequestSlot">
+            <summary>The slot this request is occupying in the threadpoolSlots array</summary>
+        </member>
+        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.Type">
+            <summary>The ImageType of the request.</summary>
+        </member>
+        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.Callbacks">
+            <summary>The callback to fire when the request is complete, will include
+            the <seealso cref="T:OpenMetaverse.TextureRequestState" /> and the <see cref="T:OpenMetaverse.Assets.AssetTexture" />
+            object containing the result data</summary>
+        </member>
+        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.ReportProgress">
+            <summary>If true, indicates the callback will be fired whenever new data is returned from the simulator.
+            This is used to progressively render textures as portions of the texture are received.</summary>
+        </member>
+        <member name="F:OpenMetaverse.TexturePipeline.TaskInfo.Transfer">
+            <summary>An object that maintains the data of an request thats in-process.</summary>
+        </member>
+        <member name="F:OpenMetaverse.TexturePipeline._Transfers">
+            <summary>A dictionary containing all pending and in-process transfer requests where the Key is both the RequestID
+            and also the Asset Texture ID, and the value is an object containing the current state of the request and also
+            the asset data as it is being re-assembled</summary>
+        </member>
+        <member name="F:OpenMetaverse.TexturePipeline._Client">
+            <summary>Holds the reference to the <see cref="T:OpenMetaverse.GridClient" /> client object</summary>
+        </member>
+        <member name="F:OpenMetaverse.TexturePipeline.maxTextureRequests">
+            <summary>Maximum concurrent texture requests allowed at a time</summary>
+        </member>
+        <member name="F:OpenMetaverse.TexturePipeline.resetEvents">
+            <summary>An array of <see cref="T:System.Threading.AutoResetEvent" /> objects used to manage worker request threads</summary>
+        </member>
+        <member name="F:OpenMetaverse.TexturePipeline.threadpoolSlots">
+            <summary>An array of worker slots which shows the availablity status of the slot</summary>
+        </member>
+        <member name="F:OpenMetaverse.TexturePipeline.downloadMaster">
+            <summary>The primary thread which manages the requests.</summary>
+        </member>
+        <member name="F:OpenMetaverse.TexturePipeline._Running">
+            <summary>true if the TexturePipeline is currently running</summary>
+        </member>
+        <member name="F:OpenMetaverse.TexturePipeline.lockerObject">
+            <summary>A synchronization object used by the primary thread</summary>
+        </member>
+        <member name="F:OpenMetaverse.TexturePipeline.RefreshDownloadsTimer">
+            <summary>A refresh timer used to increase the priority of stalled requests</summary>
+        </member>
+        <member name="P:OpenMetaverse.TexturePipeline.TransferCount">
+            <summary>Current number of pending and in-process transfers</summary>
+        </member>
+        <member name="M:OpenMetaverse.TexturePipeline.Startup">
+            <summary>
+            Initialize callbacks required for the TexturePipeline to operate
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.TexturePipeline.Shutdown">
+            <summary>
+            Shutdown the TexturePipeline and cleanup any callbacks or transfers
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.TexturePipeline.RequestTexture(OpenMetaverse.UUID,OpenMetaverse.ImageType,System.Single,System.Int32,System.UInt32,OpenMetaverse.TextureDownloadCallback,System.Boolean)">
+            <summary>
+            Request a texture asset from the simulator using the <see cref="T:OpenMetaverse.TexturePipeline" /> system to
+            manage the requests and re-assemble the image from the packets received from the simulator
+            </summary>
+            <param name="textureID">The <see cref="T:OpenMetaverse.UUID" /> of the texture asset to download</param>
+            <param name="imageType">The <see cref="T:OpenMetaverse.ImageType" /> of the texture asset.
+            Use <see cref="F:OpenMetaverse.ImageType.Normal" /> for most textures, or <see cref="F:OpenMetaverse.ImageType.Baked" /> for baked layer texture assets</param>
+            <param name="priority">A float indicating the requested priority for the transfer. Higher priority values tell the simulator
+            to prioritize the request before lower valued requests. An image already being transferred using the <see cref="T:OpenMetaverse.TexturePipeline" /> can have
+            its priority changed by resending the request with the new priority value</param>
+            <param name="discardLevel">Number of quality layers to discard.
+            This controls the end marker of the data sent</param>
+            <param name="packetStart">The packet number to begin the request at. A value of 0 begins the request
+            from the start of the asset texture</param>
+            <param name="callback">The <see cref="T:OpenMetaverse.TextureDownloadCallback" /> callback to fire when the image is retrieved. The callback
+            will contain the result of the request and the texture asset data</param>
+            <param name="progressive">If true, the callback will be fired for each chunk of the downloaded image.
+            The callback asset parameter will contain all previously received chunks of the texture asset starting
+            from the beginning of the request</param>
+        </member>
+        <member name="M:OpenMetaverse.TexturePipeline.RequestImage(OpenMetaverse.UUID,OpenMetaverse.ImageType,System.Single,System.Int32,System.UInt32)">
+            <summary>
+            Sends the actual request packet to the simulator
+            </summary>
+            <param name="imageID">The image to download</param>
+            <param name="type">Type of the image to download, either a baked
+            avatar texture or a normal texture</param>
+            <param name="priority">Priority level of the download. Default is
+            <c>1,013,000.0f</c></param>
+            <param name="discardLevel">Number of quality layers to discard.
+            This controls the end marker of the data sent</param>
+            <param name="packetNum">Packet number to start the download at.
+            This controls the start marker of the data sent</param>
+            <remarks>Sending a priority of 0 and a discardlevel of -1 aborts
+            download</remarks>
+        </member>
+        <member name="M:OpenMetaverse.TexturePipeline.AbortTextureRequest(OpenMetaverse.UUID)">
+            <summary>
+            Cancel a pending or in process texture request
+            </summary>
+            <param name="textureID">The texture assets unique ID</param>
+        </member>
+        <member name="M:OpenMetaverse.TexturePipeline.DownloadThread">
+            <summary>
+            Master Download Thread, Queues up downloads in the threadpool
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.TexturePipeline.TextureRequestDoWork(System.Object)">
+            <summary>
+            The worker thread that sends the request and handles timeouts
+            </summary>
+            <param name="threadContext">A <see cref="T:OpenMetaverse.TexturePipeline.TaskInfo" /> object containing the request details</param>
+        </member>
+        <member name="M:OpenMetaverse.TexturePipeline.ImageNotInDatabaseHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>
+            Handle responses from the simulator that tell us a texture we have requested is unable to be located
+            or no longer exists. This will remove the request from the pipeline and free up a slot if one is in use
+            </summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="M:OpenMetaverse.TexturePipeline.ImagePacketHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>
+            Handles the remaining Image data that did not fit in the initial ImageData packet
+            </summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="M:OpenMetaverse.TexturePipeline.ImageDataHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+            <summary>
+            Handle the initial ImageDataPacket sent from the simulator
+            </summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
+        </member>
+        <member name="T:ThreadUtil">
+            <summary>
+            </summary>
+        </member>
+        <member name="T:ThreadUtil.DelegateWrapper">
+            <summary>
+            Delegate to wrap another delegate and its arguments
+            </summary>
+            <param name="d">
+            </param>
+            <param name="args">
+            </param>
+        </member>
+        <member name="F:ThreadUtil.wrapperInstance">
+            <summary>
+            An instance of DelegateWrapper which calls InvokeWrappedDelegate,
+            which in turn calls the DynamicInvoke method of the wrapped
+            delegate
+            </summary>
+        </member>
+        <member name="F:ThreadUtil.callback">
+            <summary>
+            Callback used to call EndInvoke on the asynchronously
+            invoked DelegateWrapper
+            </summary>
+        </member>
+        <member name="M:ThreadUtil.FireAndForget(System.Delegate,System.Object[])">
+            <summary>
+            Executes the specified delegate with the specified arguments
+            asynchronously on a thread pool thread
+            </summary>
+            <param name="d">
+            </param>
+            <param name="args">
+            </param>
+        </member>
+        <member name="M:ThreadUtil.InvokeWrappedDelegate(System.Delegate,System.Object[])">
+            <summary>
+            Invokes the wrapped delegate synchronously
+            </summary>
+            <param name="d">
+            </param>
+            <param name="args">
+            </param>
+        </member>
+        <member name="M:ThreadUtil.EndWrapperInvoke(System.IAsyncResult)">
+            <summary>
+            Calls EndInvoke on the wrapper and Close on the resulting WaitHandle
+            to prevent resource leaks
+            </summary>
+            <param name="ar">
+            </param>
+        </member>
+        <member name="T:OpenMetaverse.UDPBase">
+            <summary>
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.UDPBase.#ctor(System.Int32)">
+            <summary>
+            Initialize the UDP packet handler in server mode
+            </summary>
+            <param name="port">Port to listening for incoming UDP packets on</param>
+        </member>
+        <member name="M:OpenMetaverse.UDPBase.#ctor(System.Net.IPEndPoint)">
+            <summary>
+            Initialize the UDP packet handler in client mode
+            </summary>
+            <param name="endPoint">Remote UDP server to connect to</param>
+        </member>
+        <member name="P:OpenMetaverse.UDPBase.IsRunning">
+            <summary>
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.UDPBase.Start">
+            <summary>
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.UDPBase.Stop">
             <summary>
-            Write a particular entry
             </summary>
-            <param name="filePath"></param>
-            <param name="data"></param>
-            <param name="fileType"></param>
         </member>
         <member name="T:OpenMetaverse.PacketFrequency">
             <summary>
-            
             </summary>
         </member>
         <member name="F:OpenMetaverse.PacketFrequency.Low">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.PacketFrequency.Medium">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.PacketFrequency.High">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="T:OpenMetaverse.Packets.MalformedDataException">
             <summary>
@@ -16954,20 +17969,25 @@
         </member>
         <member name="M:OpenMetaverse.Packets.Header.BuildHeader(System.Byte[],System.Int32@,System.Int32@)">
             <summary>
-            
             </summary>
-            <param name="bytes"></param>
-            <param name="pos"></param>
-            <param name="packetEnd"></param>
-            <returns></returns>
+            <param name="bytes">
+            </param>
+            <param name="pos">
+            </param>
+            <param name="packetEnd">
+            </param>
+            <returns>
+            </returns>
         </member>
         <member name="M:OpenMetaverse.Packets.Header.CreateAckList(OpenMetaverse.Packets.Header@,System.Byte[],System.Int32@)">
             <summary>
-            
             </summary>
-            <param name="header"></param>
-            <param name="bytes"></param>
-            <param name="packetEnd"></param>
+            <param name="header">
+            </param>
+            <param name="bytes">
+            </param>
+            <param name="packetEnd">
+            </param>
         </member>
         <member name="T:OpenMetaverse.Packets.PacketBlock">
             <summary>
@@ -16975,6 +17995,9 @@
             each block containing one or more fields
             </summary>
         </member>
+        <member name="P:OpenMetaverse.Packets.PacketBlock.Length">
+            <summary>Current length of the data in this packet</summary>
+        </member>
         <member name="M:OpenMetaverse.Packets.PacketBlock.FromBytes(System.Byte[],System.Int32@)">
             <summary>
             Create a block from a byte array
@@ -16993,8076 +18016,8407 @@
             This will point to the position directly after the end of the
             serialized block when the call returns</param>
         </member>
-        <member name="P:OpenMetaverse.Packets.PacketBlock.Length">
-            <summary>Current length of the data in this packet</summary>
-        </member>
         <member name="F:OpenMetaverse.Packets.PacketType.Default">
             <summary>A generic value, not an actual packet type</summary>
         </member>
         <member name="T:OpenMetaverse.Packets.TestMessagePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TestMessagePacket.TestBlock1Block">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TestMessagePacket.NeighborBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UseCircuitCodePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UseCircuitCodePacket.CircuitCodeBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TelehubInfoPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TelehubInfoPacket.TelehubBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TelehubInfoPacket.SpawnPointBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EconomyDataRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EconomyDataPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EconomyDataPacket.InfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarPickerRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarPickerRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarPickerRequestPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarPickerReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarPickerReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarPickerReplyPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PlacesQueryPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PlacesQueryPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PlacesQueryPacket.TransactionDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PlacesQueryPacket.QueryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PlacesReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PlacesReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PlacesReplyPacket.TransactionDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PlacesReplyPacket.QueryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirFindQueryPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirFindQueryPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirFindQueryPacket.QueryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirPlacesQueryPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirPlacesQueryPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirPlacesQueryPacket.QueryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket.QueryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket.QueryRepliesBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket.StatusDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket.QueryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket.QueryRepliesBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket.QueryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket.QueryRepliesBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket.StatusDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket.QueryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket.QueryRepliesBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirClassifiedQueryPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirClassifiedQueryPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirClassifiedQueryPacket.QueryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.QueryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.QueryRepliesBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.StatusDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarClassifiedReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarClassifiedReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarClassifiedReplyPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ClassifiedInfoRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ClassifiedInfoRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ClassifiedInfoRequestPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ClassifiedInfoReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ClassifiedInfoReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ClassifiedInfoReplyPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ClassifiedInfoUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ClassifiedInfoUpdatePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ClassifiedInfoUpdatePacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ClassifiedDeletePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ClassifiedDeletePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ClassifiedDeletePacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ClassifiedGodDeletePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ClassifiedGodDeletePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ClassifiedGodDeletePacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirLandQueryPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirLandQueryPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirLandQueryPacket.QueryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirLandReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirLandReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirLandReplyPacket.QueryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirLandReplyPacket.QueryRepliesBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirPopularQueryPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirPopularQueryPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirPopularQueryPacket.QueryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket.QueryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket.QueryRepliesBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelInfoRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelInfoRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelInfoRequestPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelInfoReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelInfoReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelInfoReplyPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersRequestPacket.ParcelDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersReplyPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupNoticesListRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupNoticesListRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupNoticesListRequestPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupNoticesListReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupNoticesListReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupNoticesListReplyPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupNoticeRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupNoticeRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupNoticeRequestPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TeleportRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TeleportRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TeleportRequestPacket.InfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TeleportLocationRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TeleportLocationRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TeleportLocationRequestPacket.InfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TeleportLocalPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TeleportLocalPacket.InfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TeleportLandmarkRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TeleportLandmarkRequestPacket.InfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TeleportProgressPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TeleportProgressPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TeleportProgressPacket.InfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TeleportFinishPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TeleportFinishPacket.InfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.StartLurePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.StartLurePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.StartLurePacket.InfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.StartLurePacket.TargetDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TeleportLureRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TeleportLureRequestPacket.InfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TeleportCancelPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TeleportCancelPacket.InfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TeleportStartPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TeleportStartPacket.InfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TeleportFailedPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TeleportFailedPacket.InfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TeleportFailedPacket.AlertInfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UndoPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UndoPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UndoPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RedoPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RedoPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RedoPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UndoLandPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UndoLandPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentPausePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentPausePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentResumePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentResumePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChatFromViewerPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChatFromViewerPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChatFromViewerPacket.ChatDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentThrottlePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentThrottlePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentThrottlePacket.ThrottleBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentFOVPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentFOVPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentFOVPacket.FOVBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentHeightWidthPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentHeightWidthPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentHeightWidthPacket.HeightWidthBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.WearableDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.VisualParamBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentQuitCopyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentQuitCopyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentQuitCopyPacket.FuseBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ImageNotInDatabasePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ImageNotInDatabasePacket.ImageIDBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RebakeAvatarTexturesPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RebakeAvatarTexturesPacket.TextureDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SetAlwaysRunPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SetAlwaysRunPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDeletePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDeletePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDeletePacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket.SharedDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDuplicateOnRayPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDuplicateOnRayPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDuplicateOnRayPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectScalePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectScalePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectScalePacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectRotationPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectRotationPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectRotationPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectFlagUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectFlagUpdatePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
+        </member>
+        <member name="T:OpenMetaverse.Packets.ObjectFlagUpdatePacket.ExtraPhysicsBlock">
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectClickActionPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectClickActionPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectClickActionPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectImagePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectImagePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectImagePacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectMaterialPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectMaterialPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectMaterialPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectShapePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectShapePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectShapePacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectExtraParamsPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectExtraParamsPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectExtraParamsPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket.HeaderDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectGroupPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectGroupPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectGroupPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectBuyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectBuyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectBuyPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.BuyObjectInventoryPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.BuyObjectInventoryPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.BuyObjectInventoryPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DerezContainerPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DerezContainerPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectPermissionsPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectPermissionsPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectPermissionsPacket.HeaderDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectPermissionsPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectSaleInfoPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectSaleInfoPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectSaleInfoPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectNamePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectNamePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectNamePacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDescriptionPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDescriptionPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDescriptionPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectCategoryPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectCategoryPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectCategoryPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectSelectPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectSelectPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectSelectPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDeselectPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDeselectPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDeselectPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectAttachPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectAttachPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectAttachPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDetachPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDetachPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDetachPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDropPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDropPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDropPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectLinkPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectLinkPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectLinkPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDelinkPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDelinkPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDelinkPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectGrabPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectGrabPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectGrabPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectGrabPacket.SurfaceInfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket.SurfaceInfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDeGrabPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDeGrabPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDeGrabPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectDeGrabPacket.SurfaceInfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectSpinStartPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectSpinStartPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectSpinStartPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectSpinUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectSpinUpdatePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectSpinUpdatePacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectSpinStopPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectSpinStopPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectSpinStopPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectExportSelectedPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectExportSelectedPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectExportSelectedPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ModifyLandPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ModifyLandPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ModifyLandPacket.ModifyBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ModifyLandPacket.ParcelDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ModifyLandPacket.ModifyBlockExtendedBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.VelocityInterpolateOnPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.VelocityInterpolateOnPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.VelocityInterpolateOffPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.VelocityInterpolateOffPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.StateSavePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.StateSavePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.StateSavePacket.DataBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ReportAutosaveCrashPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ReportAutosaveCrashPacket.AutosaveDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SimWideDeletesPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SimWideDeletesPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SimWideDeletesPacket.DataBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TrackAgentPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TrackAgentPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TrackAgentPacket.TargetDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ViewerStatsPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.DownloadTotalsBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.NetStatsBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.FailStatsBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.MiscStatsBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptAnswerYesPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptAnswerYesPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptAnswerYesPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UserReportPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UserReportPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UserReportPacket.ReportDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AlertMessagePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AlertMessagePacket.AlertDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AlertMessagePacket.AlertInfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentAlertMessagePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentAlertMessagePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentAlertMessagePacket.AlertDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MeanCollisionAlertPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MeanCollisionAlertPacket.MeanCollisionBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ViewerFrozenMessagePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ViewerFrozenMessagePacket.FrozenDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.HealthMessagePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.HealthMessagePacket.HealthDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChatFromSimulatorPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChatFromSimulatorPacket.ChatDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SimStatsPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SimStatsPacket.RegionBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SimStatsPacket.StatBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SimStatsPacket.PidStatBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RequestRegionInfoPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RequestRegionInfoPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RegionInfoPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RegionInfoPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RegionInfoPacket.RegionInfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RegionInfoPacket.RegionInfo2Block">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GodUpdateRegionInfoPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GodUpdateRegionInfoPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GodUpdateRegionInfoPacket.RegionInfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RegionHandshakePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RegionHandshakePacket.RegionInfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RegionHandshakePacket.RegionInfo2Block">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RegionHandshakePacket.RegionInfo3Block">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RegionHandshakeReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RegionHandshakeReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RegionHandshakeReplyPacket.RegionInfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SimulatorViewerTimeMessagePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SimulatorViewerTimeMessagePacket.TimeInfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EnableSimulatorPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EnableSimulatorPacket.SimulatorInfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DisableSimulatorPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TransferRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TransferRequestPacket.TransferInfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TransferInfoPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TransferInfoPacket.TransferInfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TransferAbortPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TransferAbortPacket.TransferInfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RequestXferPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RequestXferPacket.XferIDBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AbortXferPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AbortXferPacket.XferIDBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket.SenderBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket.VisualParamBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SetFollowCamPropertiesPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SetFollowCamPropertiesPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SetFollowCamPropertiesPacket.CameraPropertyBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ClearFollowCamPropertiesPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ClearFollowCamPropertiesPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RequestPayPricePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RequestPayPricePacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PayPriceReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PayPriceReplyPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PayPriceReplyPacket.ButtonDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.KickUserPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.KickUserPacket.TargetBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.KickUserPacket.UserInfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GodKickUserPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GodKickUserPacket.UserInfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EjectUserPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EjectUserPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EjectUserPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.FreezeUserPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.FreezeUserPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.FreezeUserPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarPropertiesRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarPropertiesRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarPropertiesReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarPropertiesReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarPropertiesReplyPacket.PropertiesDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarInterestsReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarInterestsReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarInterestsReplyPacket.PropertiesDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket.GroupDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket.NewGroupDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarPropertiesUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarPropertiesUpdatePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarPropertiesUpdatePacket.PropertiesDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarInterestsUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarInterestsUpdatePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarInterestsUpdatePacket.PropertiesDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarNotesReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarNotesReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarNotesReplyPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarNotesUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarNotesUpdatePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarNotesUpdatePacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarPicksReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarPicksReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarPicksReplyPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EventInfoRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EventInfoRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EventInfoRequestPacket.EventDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EventInfoReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EventInfoReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EventInfoReplyPacket.EventDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EventNotificationAddRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EventNotificationAddRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EventNotificationAddRequestPacket.EventDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EventNotificationRemoveRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EventNotificationRemoveRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EventNotificationRemoveRequestPacket.EventDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EventGodDeletePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EventGodDeletePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EventGodDeletePacket.EventDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EventGodDeletePacket.QueryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PickInfoReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PickInfoReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PickInfoReplyPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PickInfoUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PickInfoUpdatePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PickInfoUpdatePacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PickDeletePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PickDeletePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PickDeletePacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PickGodDeletePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PickGodDeletePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PickGodDeletePacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptQuestionPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptQuestionPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptControlChangePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptControlChangePacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptDialogPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptDialogPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptDialogPacket.ButtonsBlock">
-            <exclude/>
+            <exclude />
+        </member>
+        <member name="T:OpenMetaverse.Packets.ScriptDialogPacket.OwnerDataBlock">
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptDialogReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptDialogReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptDialogReplyPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ForceScriptControlReleasePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ForceScriptControlReleasePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RevokePermissionsPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RevokePermissionsPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RevokePermissionsPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LoadURLPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LoadURLPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptTeleportRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptTeleportRequestPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelOverlayPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelOverlayPacket.ParcelDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestByIDPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestByIDPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestByIDPacket.ParcelDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelPropertiesUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelPropertiesUpdatePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelPropertiesUpdatePacket.ParcelDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.ParcelDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.TaskIDsBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.OwnerIDsBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelSetOtherCleanTimePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelSetOtherCleanTimePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelSetOtherCleanTimePacket.ParcelDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.ParcelDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.TaskIDsBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.OwnerIDsBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket.ParcelDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket.ReturnIDsBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EstateCovenantRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EstateCovenantRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EstateCovenantReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EstateCovenantReplyPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ForceObjectSelectPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ForceObjectSelectPacket.HeaderBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ForceObjectSelectPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelBuyPassPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelBuyPassPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelBuyPassPacket.ParcelDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelDeedToGroupPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelDeedToGroupPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelDeedToGroupPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelReclaimPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelReclaimPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelReclaimPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelClaimPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelClaimPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelClaimPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelClaimPacket.ParcelDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelJoinPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelJoinPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelJoinPacket.ParcelDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelDividePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelDividePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelDividePacket.ParcelDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelReleasePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelReleasePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelReleasePacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelBuyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelBuyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelBuyPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelBuyPacket.ParcelDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelGodForceOwnerPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelGodForceOwnerPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelGodForceOwnerPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelAccessListRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelAccessListRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelAccessListRequestPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelAccessListReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelAccessListReplyPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelAccessListReplyPacket.ListBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket.ListBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelDwellRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelDwellRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelDwellRequestPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelDwellReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelDwellReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelDwellReplyPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelGodMarkAsContentPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelGodMarkAsContentPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelGodMarkAsContentPacket.ParcelDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ViewerStartAuctionPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ViewerStartAuctionPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ViewerStartAuctionPacket.ParcelDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UUIDNameRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UUIDNameRequestPacket.UUIDNameBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UUIDNameReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UUIDNameReplyPacket.UUIDNameBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UUIDGroupNameRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UUIDGroupNameRequestPacket.UUIDNameBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UUIDGroupNameReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UUIDGroupNameReplyPacket.UUIDNameBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChildAgentDyingPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChildAgentDyingPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChildAgentUnknownPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChildAgentUnknownPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GetScriptRunningPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GetScriptRunningPacket.ScriptBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptRunningReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptRunningReplyPacket.ScriptBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SetScriptRunningPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SetScriptRunningPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SetScriptRunningPacket.ScriptBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptResetPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptResetPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptResetPacket.ScriptBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptSensorRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptSensorRequestPacket.RequesterBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptSensorReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptSensorReplyPacket.RequesterBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ScriptSensorReplyPacket.SensedDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CompleteAgentMovementPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CompleteAgentMovementPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket.SimDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LogoutRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LogoutRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LogoutReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LogoutReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LogoutReplyPacket.InventoryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ImprovedInstantMessagePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ImprovedInstantMessagePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ImprovedInstantMessagePacket.MessageBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RetrieveInstantMessagesPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RetrieveInstantMessagesPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.FindAgentPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.FindAgentPacket.AgentBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.FindAgentPacket.LocationBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RequestGodlikePowersPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RequestGodlikePowersPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RequestGodlikePowersPacket.RequestBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GrantGodlikePowersPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GrantGodlikePowersPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GrantGodlikePowersPacket.GrantDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GodlikeMessagePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GodlikeMessagePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GodlikeMessagePacket.MethodDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GodlikeMessagePacket.ParamListBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EstateOwnerMessagePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EstateOwnerMessagePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EstateOwnerMessagePacket.MethodDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EstateOwnerMessagePacket.ParamListBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GenericMessagePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GenericMessagePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GenericMessagePacket.MethodDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GenericMessagePacket.ParamListBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MuteListRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MuteListRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MuteListRequestPacket.MuteDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UpdateMuteListEntryPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UpdateMuteListEntryPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UpdateMuteListEntryPacket.MuteDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RemoveMuteListEntryPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RemoveMuteListEntryPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RemoveMuteListEntryPacket.MuteDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket.NotecardDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket.InventoryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UpdateInventoryItemPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UpdateInventoryItemPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UpdateInventoryItemPacket.InventoryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UpdateCreateInventoryItemPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UpdateCreateInventoryItemPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UpdateCreateInventoryItemPacket.InventoryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MoveInventoryItemPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MoveInventoryItemPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MoveInventoryItemPacket.InventoryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CopyInventoryItemPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CopyInventoryItemPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CopyInventoryItemPacket.InventoryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RemoveInventoryItemPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RemoveInventoryItemPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RemoveInventoryItemPacket.InventoryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChangeInventoryItemFlagsPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChangeInventoryItemFlagsPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChangeInventoryItemFlagsPacket.InventoryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SaveAssetIntoInventoryPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SaveAssetIntoInventoryPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SaveAssetIntoInventoryPacket.InventoryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CreateInventoryFolderPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CreateInventoryFolderPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CreateInventoryFolderPacket.FolderDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UpdateInventoryFolderPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UpdateInventoryFolderPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UpdateInventoryFolderPacket.FolderDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MoveInventoryFolderPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MoveInventoryFolderPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MoveInventoryFolderPacket.InventoryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RemoveInventoryFolderPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RemoveInventoryFolderPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RemoveInventoryFolderPacket.FolderDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.FetchInventoryDescendentsPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.FetchInventoryDescendentsPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.FetchInventoryDescendentsPacket.InventoryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket.FolderDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket.ItemDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.FetchInventoryPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.FetchInventoryPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.FetchInventoryPacket.InventoryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.FetchInventoryReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.FetchInventoryReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.FetchInventoryReplyPacket.InventoryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket.FolderDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket.ItemDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket.FolderDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket.ItemDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PurgeInventoryDescendentsPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PurgeInventoryDescendentsPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PurgeInventoryDescendentsPacket.InventoryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket.UpdateDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket.InventoryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RemoveTaskInventoryPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RemoveTaskInventoryPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RemoveTaskInventoryPacket.InventoryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MoveTaskInventoryPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MoveTaskInventoryPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MoveTaskInventoryPacket.InventoryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RequestTaskInventoryPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RequestTaskInventoryPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RequestTaskInventoryPacket.InventoryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ReplyTaskInventoryPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ReplyTaskInventoryPacket.InventoryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DeRezObjectPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DeRezObjectPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DeRezObjectPacket.AgentBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DeRezObjectPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DeRezAckPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DeRezAckPacket.TransactionDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RezObjectPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RezObjectPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RezObjectPacket.RezDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RezObjectPacket.InventoryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.RezDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.NotecardDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.InventoryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AcceptFriendshipPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AcceptFriendshipPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AcceptFriendshipPacket.TransactionBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AcceptFriendshipPacket.FolderDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DeclineFriendshipPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DeclineFriendshipPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DeclineFriendshipPacket.TransactionBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TerminateFriendshipPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TerminateFriendshipPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TerminateFriendshipPacket.ExBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.OfferCallingCardPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.OfferCallingCardPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.OfferCallingCardPacket.AgentBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AcceptCallingCardPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AcceptCallingCardPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AcceptCallingCardPacket.TransactionBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AcceptCallingCardPacket.FolderDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DeclineCallingCardPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DeclineCallingCardPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DeclineCallingCardPacket.TransactionBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RezScriptPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RezScriptPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RezScriptPacket.UpdateBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RezScriptPacket.InventoryBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CreateInventoryItemPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CreateInventoryItemPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CreateInventoryItemPacket.InventoryBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket.EventDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket.InventoryBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RegionHandleRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RegionHandleRequestPacket.RequestBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RegionIDAndHandleReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RegionIDAndHandleReplyPacket.ReplyBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MoneyTransferRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MoneyTransferRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MoneyTransferRequestPacket.MoneyDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MoneyBalanceRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MoneyBalanceRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MoneyBalanceRequestPacket.MoneyDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MoneyBalanceReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MoneyBalanceReplyPacket.MoneyDataBlock">
-            <exclude/>
+            <exclude />
+        </member>
+        <member name="T:OpenMetaverse.Packets.MoneyBalanceReplyPacket.TransactionInfoBlock">
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket.TargetBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket.MoneyDataBlock">
-            <exclude/>
+            <exclude />
+        </member>
+        <member name="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket.TransactionInfoBlock">
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ActivateGesturesPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ActivateGesturesPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ActivateGesturesPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DeactivateGesturesPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DeactivateGesturesPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DeactivateGesturesPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MuteListUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MuteListUpdatePacket.MuteDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UseCachedMuteListPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UseCachedMuteListPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GrantUserRightsPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GrantUserRightsPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GrantUserRightsPacket.RightsBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChangeUserRightsPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChangeUserRightsPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChangeUserRightsPacket.RightsBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.OnlineNotificationPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.OnlineNotificationPacket.AgentBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.OfflineNotificationPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.OfflineNotificationPacket.AgentBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SetStartLocationRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SetStartLocationRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SetStartLocationRequestPacket.StartLocationDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AssetUploadRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AssetUploadRequestPacket.AssetBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AssetUploadCompletePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AssetUploadCompletePacket.AssetBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CreateGroupRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CreateGroupRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CreateGroupRequestPacket.GroupDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CreateGroupReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CreateGroupReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CreateGroupReplyPacket.ReplyDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UpdateGroupInfoPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UpdateGroupInfoPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UpdateGroupInfoPacket.GroupDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupRoleChangesPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupRoleChangesPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupRoleChangesPacket.RoleChangeBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.JoinGroupRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.JoinGroupRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.JoinGroupRequestPacket.GroupDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.JoinGroupReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.JoinGroupReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.JoinGroupReplyPacket.GroupDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket.GroupDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket.EjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket.GroupDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket.EjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LeaveGroupRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LeaveGroupRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LeaveGroupRequestPacket.GroupDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LeaveGroupReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LeaveGroupReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LeaveGroupReplyPacket.GroupDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.InviteGroupRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.InviteGroupRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.InviteGroupRequestPacket.GroupDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.InviteGroupRequestPacket.InviteDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupProfileRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupProfileRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupProfileRequestPacket.GroupDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupProfileReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupProfileReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupProfileReplyPacket.GroupDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupAccountSummaryRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupAccountSummaryRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupAccountSummaryRequestPacket.MoneyDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupAccountSummaryReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupAccountSummaryReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupAccountSummaryReplyPacket.MoneyDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupAccountDetailsRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupAccountDetailsRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupAccountDetailsRequestPacket.MoneyDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket.MoneyDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket.HistoryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsRequestPacket.MoneyDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket.MoneyDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket.HistoryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket.GroupDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket.TransactionDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket.TransactionDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket.ProposalDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket.GroupDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket.TransactionDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.TransactionDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.HistoryItemDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.VoteItemBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.StartGroupProposalPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.StartGroupProposalPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.StartGroupProposalPacket.ProposalDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupProposalBallotPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupProposalBallotPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupProposalBallotPacket.ProposalDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupMembersRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupMembersRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupMembersRequestPacket.GroupDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket.GroupDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket.MemberDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ActivateGroupPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ActivateGroupPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SetGroupContributionPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SetGroupContributionPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SetGroupContributionPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SetGroupAcceptNoticesPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SetGroupAcceptNoticesPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SetGroupAcceptNoticesPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SetGroupAcceptNoticesPacket.NewDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupRoleDataRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupRoleDataRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupRoleDataRequestPacket.GroupDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket.GroupDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket.RoleDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupRoleMembersRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupRoleMembersRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupRoleMembersRequestPacket.GroupDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupRoleMembersReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupRoleMembersReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupRoleMembersReplyPacket.MemberDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupTitlesRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupTitlesRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupTitlesReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupTitlesReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupTitlesReplyPacket.GroupDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupTitleUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupTitleUpdatePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupRoleUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupRoleUpdatePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupRoleUpdatePacket.RoleDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LiveHelpGroupRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LiveHelpGroupRequestPacket.RequestDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LiveHelpGroupReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LiveHelpGroupReplyPacket.ReplyDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentWearablesRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentWearablesRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentWearablesUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentWearablesUpdatePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentWearablesUpdatePacket.WearableDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentIsNowWearingPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentIsNowWearingPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentIsNowWearingPacket.WearableDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentCachedTexturePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentCachedTexturePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentCachedTexturePacket.WearableDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentCachedTextureResponsePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentCachedTextureResponsePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentCachedTextureResponsePacket.WearableDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentDataUpdateRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentDataUpdateRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentDataUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentDataUpdatePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupDataUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.GroupDataUpdatePacket.AgentGroupDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentGroupDataUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentGroupDataUpdatePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentGroupDataUpdatePacket.GroupDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentDropGroupPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentDropGroupPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RezSingleAttachmentFromInvPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RezSingleAttachmentFromInvPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RezSingleAttachmentFromInvPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket.HeaderDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DetachAttachmentIntoInvPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.DetachAttachmentIntoInvPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket.HeaderDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UserInfoRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UserInfoRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UserInfoReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UserInfoReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UserInfoReplyPacket.UserDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UpdateUserInfoPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UpdateUserInfoPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.UpdateUserInfoPacket.UserDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.InitiateDownloadPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.InitiateDownloadPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.InitiateDownloadPacket.FileDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MapLayerRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MapLayerRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MapLayerReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MapLayerReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MapLayerReplyPacket.LayerDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MapBlockRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MapBlockRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MapBlockRequestPacket.PositionDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MapNameRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MapNameRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MapNameRequestPacket.NameDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MapItemRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MapItemRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MapItemRequestPacket.RequestDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MapItemReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MapItemReplyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MapItemReplyPacket.RequestDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MapItemReplyPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SendPostcardPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SendPostcardPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelMediaCommandMessagePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelMediaCommandMessagePacket.CommandBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelMediaUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelMediaUpdatePacket.DataBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelMediaUpdatePacket.DataBlockExtendedBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LandStatRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LandStatRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LandStatRequestPacket.RequestDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LandStatReplyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LandStatReplyPacket.RequestDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LandStatReplyPacket.ReportDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ErrorPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ErrorPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ErrorPacket.DataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectIncludeInSearchPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectIncludeInSearchPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectIncludeInSearchPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RezRestoreToWorldPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RezRestoreToWorldPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RezRestoreToWorldPacket.InventoryDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LinkInventoryItemPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LinkInventoryItemPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LinkInventoryItemPacket.InventoryBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PacketAckPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PacketAckPacket.PacketsBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.OpenCircuitPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.OpenCircuitPacket.CircuitInfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CloseCircuitPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectAddPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectAddPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectAddPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MultipleObjectUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MultipleObjectUpdatePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.MultipleObjectUpdatePacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RequestMultipleObjectsPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RequestMultipleObjectsPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RequestMultipleObjectsPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectPositionPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectPositionPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectPositionPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RequestObjectPropertiesFamilyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RequestObjectPropertiesFamilyPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RequestObjectPropertiesFamilyPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket.LocationBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket.IndexBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CrossedRegionPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CrossedRegionPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CrossedRegionPacket.RegionDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CrossedRegionPacket.InfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ConfirmEnableSimulatorPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ConfirmEnableSimulatorPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectPropertiesPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectPropertiesPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectPropertiesFamilyPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectPropertiesFamilyPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestPacket.ParcelDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AttachedSoundPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AttachedSoundPacket.DataBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AttachedSoundGainChangePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AttachedSoundGainChangePacket.DataBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PreloadSoundPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.PreloadSoundPacket.DataBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ViewerEffectPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ViewerEffectPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ViewerEffectPacket.EffectBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.StartPingCheckPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.StartPingCheckPacket.PingIDBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CompletePingCheckPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CompletePingCheckPacket.PingIDBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentUpdatePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentAnimationPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentAnimationPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentAnimationPacket.AnimationListBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentAnimationPacket.PhysicalAvatarEventListBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentRequestSitPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentRequestSitPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentRequestSitPacket.TargetObjectBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentSitPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AgentSitPacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RequestImagePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RequestImagePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.RequestImagePacket.RequestImageBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ImageDataPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ImageDataPacket.ImageIDBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ImageDataPacket.ImageDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ImagePacketPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ImagePacketPacket.ImageIDBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ImagePacketPacket.ImageDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LayerDataPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LayerDataPacket.LayerIDBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.LayerDataPacket.LayerDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectUpdatePacket.RegionDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectUpdatePacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectUpdateCompressedPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectUpdateCompressedPacket.RegionDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectUpdateCompressedPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectUpdateCachedPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectUpdateCachedPacket.RegionDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ObjectUpdateCachedPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ImprovedTerseObjectUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ImprovedTerseObjectUpdatePacket.RegionDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ImprovedTerseObjectUpdatePacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.KillObjectPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.KillObjectPacket.ObjectDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TransferPacketPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.TransferPacketPacket.TransferDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SendXferPacketPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SendXferPacketPacket.XferIDBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SendXferPacketPacket.DataPacketBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ConfirmXferPacketPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ConfirmXferPacketPacket.XferIDBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.SenderBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.AnimationListBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.AnimationSourceListBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.PhysicalAvatarEventListBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarSitResponsePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarSitResponsePacket.SitObjectBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.AvatarSitResponsePacket.SitTransformBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CameraConstraintPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.CameraConstraintPacket.CameraCollidePlaneBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelPropertiesPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelPropertiesPacket.ParcelDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ParcelPropertiesPacket.AgeVerificationBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.GroupDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AnimationDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.GranterBlockBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.NVPairDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.VisualParamBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AgentAccessBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AgentInfoBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChildAgentAlivePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChildAgentAlivePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChildAgentPositionUpdatePacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.ChildAgentPositionUpdatePacket.AgentDataBlock">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SoundTriggerPacket">
-            <exclude/>
+            <exclude />
         </member>
         <member name="T:OpenMetaverse.Packets.SoundTriggerPacket.SoundDataBlock">
-            <exclude/>
+            <exclude />
         </member>
-        <member name="T:OpenMetaverse.Voice.VoiceSession">
+        <member name="T:OpenMetaverse.VisualColorOperation">
             <summary>
-            Represents a single Voice Session to the Vivox service.
+            Operation to apply when applying color to texture
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceSession.Close">
+        <member name="T:OpenMetaverse.VisualColorParam">
             <summary>
-            Close this session.
+            Information needed to translate visual param value to RGBA color
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceSession.FindParticipant(System.String)">
+        <member name="M:OpenMetaverse.VisualColorParam.#ctor(OpenMetaverse.VisualColorOperation,OpenMetaverse.Color4[])">
             <summary>
-            Look up an existing Participants in this session
+            Construct VisualColorParam
             </summary>
-            <param name="puri"></param>
-            <returns></returns>
+            <param name="operation">Operation to apply when applying color to texture</param>
+            <param name="colors">Colors</param>
         </member>
-        <member name="T:ThreadUtil">
+        <member name="T:OpenMetaverse.VisualAlphaParam">
             <summary>
-            
+            Represents alpha blending and bump infor for a visual parameter
+            such as sleive length
             </summary>
         </member>
-        <member name="F:ThreadUtil.wrapperInstance">
+        <member name="M:OpenMetaverse.VisualAlphaParam.#ctor(System.Single,System.String,System.Boolean,System.Boolean)">
             <summary>
-            An instance of DelegateWrapper which calls InvokeWrappedDelegate,
-            which in turn calls the DynamicInvoke method of the wrapped
-            delegate
+            Create new alhpa information for a visual param
             </summary>
+            <param name="domain">Stregth of the alpha to apply</param>
+            <param name="tgaFile">File containing the alpha channel</param>
+            <param name="skipIfZero">Skip blending if parameter value is 0</param>
+            <param name="multiplyBlend">Use miltiply insted of alpha blending</param>
         </member>
-        <member name="F:ThreadUtil.callback">
+        <member name="F:OpenMetaverse.VisualAlphaParam.Domain">
+            <summary>Stregth of the alpha to apply</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualAlphaParam.TGAFile">
+            <summary>File containing the alpha channel</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualAlphaParam.SkipIfZero">
+            <summary>Skip blending if parameter value is 0</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualAlphaParam.MultiplyBlend">
+            <summary>Use miltiply insted of alpha blending</summary>
+        </member>
+        <member name="T:OpenMetaverse.VisualParam">
             <summary>
-            Callback used to call EndInvoke on the asynchronously
-            invoked DelegateWrapper
+            A single visual characteristic of an avatar mesh, such as eyebrow height
             </summary>
         </member>
-        <member name="M:ThreadUtil.FireAndForget(System.Delegate,System.Object[])">
+        <member name="M:OpenMetaverse.VisualParam.#ctor(System.Int32,System.String,System.Int32,System.String,System.String,System.String,System.String,System.Single,System.Single,System.Single,System.Boolean,System.Int32[],System.Nullable{OpenMetaverse.VisualAlphaParam},System.Nullable{OpenMetaverse.VisualColorParam})">
             <summary>
-            Executes the specified delegate with the specified arguments
-            asynchronously on a thread pool thread
+            Set all the values through the constructor
             </summary>
-            <param name="d"></param>
-            <param name="args"></param>
+            <param name="paramID">Index of this visual param</param>
+            <param name="name">Internal name</param>
+            <param name="group">
+            </param>
+            <param name="wearable">
+            </param>
+            <param name="label">Displayable label of this characteristic</param>
+            <param name="labelMin">Displayable label for the minimum value of this characteristic</param>
+            <param name="labelMax">Displayable label for the maximum value of this characteristic</param>
+            <param name="def">Default value</param>
+            <param name="min">Minimum value</param>
+            <param name="max">Maximum value</param>
+            <param name="isBumpAttribute">Is this param used for creation of bump layer?</param>
+            <param name="drivers">Array of param IDs that are drivers for this parameter</param>
+            <param name="alpha">Alpha blending/bump info</param>
+            <param name="colorParams">Color information</param>
         </member>
-        <member name="M:ThreadUtil.InvokeWrappedDelegate(System.Delegate,System.Object[])">
+        <member name="F:OpenMetaverse.VisualParam.ParamID">
+            <summary>Index of this visual param</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.Name">
+            <summary>Internal name</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.Group">
+            <summary>Group ID this parameter belongs to</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.Wearable">
+            <summary>Name of the wearable this parameter belongs to</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.Label">
+            <summary>Displayable label of this characteristic</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.LabelMin">
+            <summary>Displayable label for the minimum value of this characteristic</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.LabelMax">
+            <summary>Displayable label for the maximum value of this characteristic</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.DefaultValue">
+            <summary>Default value</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.MinValue">
+            <summary>Minimum value</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.MaxValue">
+            <summary>Maximum value</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.IsBumpAttribute">
+            <summary>Is this param used for creation of bump layer?</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.AlphaParams">
+            <summary>Alpha blending/bump info</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.ColorParams">
+            <summary>Color information</summary>
+        </member>
+        <member name="F:OpenMetaverse.VisualParam.Drivers">
+            <summary>Array of param IDs that are drivers for this parameter</summary>
+        </member>
+        <member name="T:OpenMetaverse.VisualParams">
             <summary>
-            Invokes the wrapped delegate synchronously
+            Holds the Params array of all the avatar appearance parameters
             </summary>
-            <param name="d"></param>
-            <param name="args"></param>
         </member>
-        <member name="M:ThreadUtil.EndWrapperInvoke(System.IAsyncResult)">
+        <member name="T:OpenMetaverse.Assets.Asset">
             <summary>
-            Calls EndInvoke on the wrapper and Close on the resulting WaitHandle
-            to prevent resource leaks
+            Base class for all Asset types
             </summary>
-            <param name="ar"></param>
         </member>
-        <member name="T:ThreadUtil.DelegateWrapper">
+        <member name="M:OpenMetaverse.Assets.Asset.#ctor">
             <summary>
-            Delegate to wrap another delegate and its arguments
+            Construct a new Asset object
             </summary>
-            <param name="d"></param>
-            <param name="args"></param>
-        </member>
-        <member name="F:OpenMetaverse.TerrainManager.m_LandPatchReceivedEvent">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.TerrainManager.OnLandPatchReceived(OpenMetaverse.LandPatchReceivedEventArgs)">
-            <summary>Raises the LandPatchReceived event</summary>
-            <param name="e">A LandPatchReceivedEventArgs object containing the
-            data returned from the simulator</param>
-        </member>
-        <member name="F:OpenMetaverse.TerrainManager.m_LandPatchReceivedLock">
-            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.TerrainManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="M:OpenMetaverse.Assets.Asset.#ctor(OpenMetaverse.UUID,System.Byte[])">
             <summary>
-            Default constructor
+            Construct a new Asset object
             </summary>
-            <param name="client"></param>
+            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID" /> specific to this asset</param>
+            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="E:OpenMetaverse.TerrainManager.LandPatchReceived">
-            <summary>Raised when the simulator responds sends </summary>
+        <member name="F:OpenMetaverse.Assets.Asset.AssetData">
+            <summary>A byte array containing the raw asset data</summary>
         </member>
-        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.Simulator">
-            <summary>Simulator from that sent tha data</summary>
+        <member name="F:OpenMetaverse.Assets.Asset.Temporary">
+            <summary>True if the asset it only stored on the server temporarily</summary>
         </member>
-        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.X">
-            <summary>Sim coordinate of the patch</summary>
+        <member name="F:OpenMetaverse.Assets.Asset._AssetID">
+            <summary>A unique ID</summary>
         </member>
-        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.Y">
-            <summary>Sim coordinate of the patch</summary>
+        <member name="P:OpenMetaverse.Assets.Asset.AssetID">
+            <summary>The assets unique ID</summary>
         </member>
-        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.PatchSize">
-            <summary>Size of tha patch</summary>
+        <member name="P:OpenMetaverse.Assets.Asset.AssetType">
+            <summary>
+            The "type" of asset, Notecard, Animation, etc
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.HeightMap">
-            <summary>Heightmap for the patch</summary>
+        <member name="M:OpenMetaverse.Assets.Asset.Encode">
+            <summary>
+            Regenerates the <code>AssetData</code> byte array from the properties
+            of the derived class.
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.PermissionMask">
+        <member name="M:OpenMetaverse.Assets.Asset.Decode">
             <summary>
-            
+            Decodes the AssetData, placing it in appropriate properties of the derived
+            class.
             </summary>
+            <returns>True if the asset decoding succeeded, otherwise false</returns>
         </member>
-        <member name="T:OpenMetaverse.PermissionWho">
+        <member name="T:OpenMetaverse.Assets.ArchiveConstants">
             <summary>
-            
+            Constants for the archiving module
             </summary>
         </member>
-        <member name="F:OpenMetaverse.PermissionWho.Base">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.CONTROL_FILE_PATH">
+            <summary>
+            The location of the archive control file
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.PermissionWho.Owner">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.ASSETS_PATH">
+            <summary>
+            Path for the assets held in an archive
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.PermissionWho.Group">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.OBJECTS_PATH">
+            <summary>
+            Path for the prims file
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.PermissionWho.Everyone">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.TERRAINS_PATH">
+            <summary>
+            Path for terrains.  Technically these may be assets, but I think it's quite nice to split them out.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.PermissionWho.NextOwner">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.SETTINGS_PATH">
+            <summary>
+            Path for region settings.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.PermissionWho.All">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.ASSET_EXTENSION_SEPARATOR">
+            <summary>
+            The character the separates the uuid from extension information in an archived asset filename
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Permissions">
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.ASSET_TYPE_TO_EXTENSION">
             <summary>
-            
+            Extensions used for asset types in the archive
             </summary>
         </member>
-        <member name="F:OpenMetaverse.UDPPacketBuffer.BUFFER_SIZE">
-            <summary>Size of the byte array used to store raw packet data</summary>
+        <member name="T:OpenMetaverse.Assets.AssetsArchiver">
+            <summary>
+            Archives assets
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.UDPPacketBuffer.Data">
-            <summary>Raw packet data buffer</summary>
+        <member name="F:OpenMetaverse.Assets.AssetsArchiver.m_assets">
+            <summary>
+            Archive assets
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.UDPPacketBuffer.DataLength">
-            <summary>Length of the data to transmit</summary>
+        <member name="M:OpenMetaverse.Assets.AssetsArchiver.Archive(OpenMetaverse.Assets.TarArchiveWriter)">
+            <summary>
+            Archive the assets given to this archiver to the given archive.
+            </summary>
+            <param name="archive">
+            </param>
         </member>
-        <member name="F:OpenMetaverse.UDPPacketBuffer.RemoteEndPoint">
-            <summary>EndPoint of the remote host</summary>
+        <member name="M:OpenMetaverse.Assets.AssetsArchiver.WriteMetadata(OpenMetaverse.Assets.TarArchiveWriter)">
+            <summary>
+            Write an assets metadata file to the given archive
+            </summary>
+            <param name="archive">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.UDPPacketBuffer.#ctor">
+        <member name="M:OpenMetaverse.Assets.AssetsArchiver.WriteData(OpenMetaverse.Assets.TarArchiveWriter)">
             <summary>
-            Create an allocated UDP packet buffer for receiving a packet
+            Write asset data files to the given archive
             </summary>
+            <param name="archive">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.UDPPacketBuffer.#ctor(System.Net.IPEndPoint)">
+        <member name="T:OpenMetaverse.Assets.TarArchiveReader">
             <summary>
-            Create an allocated UDP packet buffer for sending a packet
+            Temporary code to do the bare minimum required to read a tar archive for our purposes
             </summary>
-            <param name="endPoint">EndPoint of the remote host</param>
         </member>
-        <member name="M:OpenMetaverse.UDPPacketBuffer.#ctor(System.Net.IPEndPoint,System.Int32)">
+        <member name="M:OpenMetaverse.Assets.TarArchiveReader.#ctor(System.IO.Stream)">
             <summary>
-            Create an allocated UDP packet buffer for sending a packet
+            Generate a tar reader which reads from the given stream.
             </summary>
-            <param name="endPoint">EndPoint of the remote host</param>
-            <param name="bufferSize">Size of the buffer to allocate for packet data</param>
+            <param name="s">
+            </param>
         </member>
-        <member name="T:OpenMetaverse.PacketBufferPool">
+        <member name="F:OpenMetaverse.Assets.TarArchiveReader.m_br">
             <summary>
-            Object pool for packet buffers. This is used to allocate memory for all
-            incoming and outgoing packets, and zerocoding buffers for those packets
+            Binary reader for the underlying stream
             </summary>
         </member>
-        <member name="M:OpenMetaverse.PacketBufferPool.#ctor(System.Net.IPEndPoint,System.Int32,System.Int32)">
+        <member name="F:OpenMetaverse.Assets.TarArchiveReader.m_nullCharArray">
             <summary>
-            Initialize the object pool in client mode
+            Used to trim off null chars
             </summary>
-            <param name="endPoint">Server to connect to</param>
-            <param name="itemsPerSegment"></param>
-            <param name="minSegments"></param>
         </member>
-        <member name="M:OpenMetaverse.PacketBufferPool.#ctor(System.Int32,System.Int32)">
+        <member name="F:OpenMetaverse.Assets.TarArchiveReader.m_spaceCharArray">
             <summary>
-            Initialize the object pool in server mode
+            Used to trim off space chars
             </summary>
-            <param name="itemsPerSegment"></param>
-            <param name="minSegments"></param>
         </member>
-        <member name="M:OpenMetaverse.PacketBufferPool.GetObjectInstance">
+        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ReadEntry(System.String@,OpenMetaverse.Assets.TarArchiveReader.TarEntryType@)">
             <summary>
-            Returns a packet buffer with EndPoint set if the buffer is in
-            client mode, or with EndPoint set to null in server mode
+            Read the next entry in the tar file.
             </summary>
-            <returns>Initialized UDPPacketBuffer object</returns>
+            <param name="filePath">
+            </param>
+            <param name="entryType">
+            </param>
+            <returns>the data for the entry.  Returns null if there are no more entries</returns>
         </member>
-        <member name="M:OpenMetaverse.Pool.#cctor">
+        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ReadHeader">
             <summary>
-            Default constructor
+            Read the next 512 byte chunk of data as a tar header.
             </summary>
+            <returns>A tar header struct.  null if we have reached the end of the archive.</returns>
         </member>
-        <member name="M:OpenMetaverse.Pool.CheckOut">
+        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ReadData(System.Int32)">
             <summary>
-            Check a packet buffer out of the pool
+            Read data following a header
             </summary>
-            <returns>A packet buffer object</returns>
+            <param name="fileSize">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="T:OpenMetaverse.Logger">
+        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ConvertOctalBytesToDecimal(System.Byte[],System.Int32,System.Int32)">
             <summary>
-            Singleton logging class for the entire library
+            Convert octal bytes to a decimal representation
             </summary>
+            <param name="bytes">
+            </param>
+            <param name="count">
+            </param>
+            <param name="startIndex">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="F:OpenMetaverse.Logger.LogInstance">
-            <summary>log4net logging engine</summary>
+        <member name="T:OpenMetaverse.Assets.TarArchiveWriter">
+            <summary>
+            Temporary code to produce a tar archive in tar v7 format
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.Logger.#cctor">
+        <member name="F:OpenMetaverse.Assets.TarArchiveWriter.m_bw">
             <summary>
-            Default constructor
+            Binary writer for the underlying stream
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Logger.Log(System.Object,OpenMetaverse.Helpers.LogLevel)">
+        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteDir(System.String)">
             <summary>
-            Send a log message to the logging engine
+            Write a directory entry to the tar archive.  We can only handle one path level right now!
             </summary>
-            <param name="message">The log message</param>
-            <param name="level">The severity of the log entry</param>
+            <param name="dirName">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.Logger.Log(System.Object,OpenMetaverse.Helpers.LogLevel,OpenMetaverse.GridClient)">
+        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteFile(System.String,System.String)">
             <summary>
-            Send a log message to the logging engine
+            Write a file to the tar archive
             </summary>
-            <param name="message">The log message</param>
-            <param name="level">The severity of the log entry</param>
-            <param name="client">Instance of the client</param>
+            <param name="filePath">
+            </param>
+            <param name="data">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.Logger.Log(System.Object,OpenMetaverse.Helpers.LogLevel,System.Exception)">
+        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteFile(System.String,System.Byte[])">
             <summary>
-            Send a log message to the logging engine
+            Write a file to the tar archive
             </summary>
-            <param name="message">The log message</param>
-            <param name="level">The severity of the log entry</param>
-            <param name="exception">Exception that was raised</param>
+            <param name="filePath">
+            </param>
+            <param name="data">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.Logger.Log(System.Object,OpenMetaverse.Helpers.LogLevel,OpenMetaverse.GridClient,System.Exception)">
+        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.Close">
             <summary>
-            Send a log message to the logging engine
+            Finish writing the raw tar archive data to a stream.  The stream will be closed on completion.
             </summary>
-            <param name="message">The log message</param>
-            <param name="level">The severity of the log entry</param>
-            <param name="client">Instance of the client</param>
-            <param name="exception">Exception that was raised</param>
         </member>
-        <member name="M:OpenMetaverse.Logger.DebugLog(System.Object)">
+        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteEntry(System.String,System.Byte[],System.Char)">
             <summary>
-            If the library is compiled with DEBUG defined, an event will be
-            fired if an <code>OnLogMessage</code> handler is registered and the
-            message will be sent to the logging engine
+            Write a particular entry
             </summary>
-            <param name="message">The message to log at the DEBUG level to the
-            current logging engine</param>
+            <param name="filePath">
+            </param>
+            <param name="data">
+            </param>
+            <param name="fileType">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.Logger.DebugLog(System.Object,OpenMetaverse.GridClient)">
+        <member name="T:OpenMetaverse.Assets.AssetAnimation">
             <summary>
-            If the library is compiled with DEBUG defined and
-            <code>GridClient.Settings.DEBUG</code> is true, an event will be
-            fired if an <code>OnLogMessage</code> handler is registered and the
-            message will be sent to the logging engine
+            Represents an Animation
             </summary>
-            <param name="message">The message to log at the DEBUG level to the
-            current logging engine</param>
-            <param name="client">Instance of the client</param>
         </member>
-        <member name="E:OpenMetaverse.Logger.OnLogMessage">
-            <summary>Triggered whenever a message is logged. If this is left
-            null, log messages will go to the console</summary>
+        <member name="M:OpenMetaverse.Assets.AssetAnimation.#ctor">
+            <summary>Default Constructor</summary>
         </member>
-        <member name="T:OpenMetaverse.Logger.LogCallback">
+        <member name="M:OpenMetaverse.Assets.AssetAnimation.#ctor(OpenMetaverse.UUID,System.Byte[])">
             <summary>
-            Callback used for client apps to receive log messages from
-            the library
+            Construct an Asset object of type Animation
             </summary>
-            <param name="message">Data being logged</param>
-            <param name="level">The severity of the log entry from <seealso cref="T:OpenMetaverse.Helpers.LogLevel"/></param>
+            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID" /> specific to this asset</param>
+            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="F:OpenMetaverse.InventorySortOrder.ByName">
-            <summary>Sort by name</summary>
+        <member name="P:OpenMetaverse.Assets.AssetAnimation.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="F:OpenMetaverse.InventorySortOrder.ByDate">
-            <summary>Sort by date</summary>
+        <member name="T:OpenMetaverse.Assets.AssetBodypart">
+            <summary>
+            Represents an <seealso cref="T:OpenMetaverse.Assets.AssetWearable" /> that represents an avatars body ie: Hair, Etc.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.InventorySortOrder.FoldersByName">
-            <summary>Sort folders by name, regardless of whether items are
-            sorted by name or date</summary>
+        <member name="M:OpenMetaverse.Assets.AssetBodypart.#ctor">
+            <summary>Initializes a new instance of an AssetBodyPart object</summary>
         </member>
-        <member name="F:OpenMetaverse.InventorySortOrder.SystemFoldersToTop">
-            <summary>Place system folders at the top</summary>
+        <member name="M:OpenMetaverse.Assets.AssetBodypart.#ctor(OpenMetaverse.UUID,System.Byte[])">
+            <summary>Initializes a new instance of an AssetBodyPart object with parameters</summary>
+            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID" /> specific to this asset</param>
+            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="T:OpenMetaverse.DeRezDestination">
+        <member name="P:OpenMetaverse.Assets.AssetBodypart.AssetType">
+            <summary>Override the base classes AssetType</summary>
+        </member>
+        <member name="T:OpenMetaverse.Assets.AssetClothing">
             <summary>
-            Possible destinations for DeRezObject request
+            Represents an <seealso cref="T:OpenMetaverse.Assets.AssetWearable" /> that can be worn on an avatar
+            such as a Shirt, Pants, etc.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.AgentInventorySave">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Assets.AssetClothing.#ctor">
+            <summary>Initializes a new instance of an AssetScriptBinary object</summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.AgentInventoryCopy">
-            <summary>Copy from in-world to agent inventory</summary>
+        <member name="M:OpenMetaverse.Assets.AssetClothing.#ctor(OpenMetaverse.UUID,System.Byte[])">
+            <summary>Initializes a new instance of an AssetScriptBinary object with parameters</summary>
+            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID" /> specific to this asset</param>
+            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.TaskInventory">
-            <summary>Derez to TaskInventory</summary>
+        <member name="P:OpenMetaverse.Assets.AssetClothing.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.Attachment">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Assets.GestureStepType">
+            <summary>
+            Type of gesture step
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.AgentInventoryTake">
-            <summary>Take Object</summary>
+        <member name="T:OpenMetaverse.Assets.GestureStep">
+            <summary>
+            Base class for gesture steps
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.ForceToGodInventory">
-            <summary></summary>
+        <member name="P:OpenMetaverse.Assets.GestureStep.GestureStepType">
+            <summary>
+            Retururns what kind of gesture step this is
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.TrashFolder">
-            <summary>Delete Object</summary>
+        <member name="T:OpenMetaverse.Assets.GestureStepAnimation">
+            <summary>
+            Describes animation step of a gesture
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.AttachmentToInventory">
-            <summary>Put an avatar attachment into agent inventory</summary>
+        <member name="F:OpenMetaverse.Assets.GestureStepAnimation.AnimationStart">
+            <summary>
+            If true, this step represents start of animation, otherwise animation stop
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.AttachmentExists">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Assets.GestureStepAnimation.ID">
+            <summary>
+            Animation asset <see cref="T:OpenMetaverse.UUID" /></summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.ReturnToOwner">
-            <summary>Return an object back to the owner's inventory</summary>
+        <member name="F:OpenMetaverse.Assets.GestureStepAnimation.Name">
+            <summary>
+            Animation inventory name
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.ReturnToLastOwner">
-            <summary>Return a deeded object back to the last owner's inventory</summary>
+        <member name="P:OpenMetaverse.Assets.GestureStepAnimation.GestureStepType">
+            <summary>
+            Returns what kind of gesture step this is
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryItemFlags">
+        <member name="T:OpenMetaverse.Assets.GestureStepSound">
             <summary>
-            Upper half of the Flags field for inventory items
+            Describes sound step of a gesture
             </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectSlamPerm">
-            <summary>Indicates that the NextOwner permission will be set to the
-            most restrictive set of permissions found in the object set
-            (including linkset items and object inventory items) on next rez</summary>
+        <member name="F:OpenMetaverse.Assets.GestureStepSound.ID">
+            <summary>
+            Sound asset <see cref="T:OpenMetaverse.UUID" /></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectSlamSale">
-            <summary>Indicates that the object sale information has been
-            changed</summary>
+        <member name="F:OpenMetaverse.Assets.GestureStepSound.Name">
+            <summary>
+            Sound inventory name
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectOverwriteBase">
-            <summary>If set, and a slam bit is set, indicates BaseMask will be overwritten on Rez</summary>
+        <member name="P:OpenMetaverse.Assets.GestureStepSound.GestureStepType">
+            <summary>
+            Returns what kind of gesture step this is
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectOverwriteOwner">
-            <summary>If set, and a slam bit is set, indicates OwnerMask will be overwritten on Rez</summary>
+        <member name="T:OpenMetaverse.Assets.GestureStepChat">
+            <summary>
+            Describes sound step of a gesture
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectOverwriteGroup">
-            <summary>If set, and a slam bit is set, indicates GroupMask will be overwritten on Rez</summary>
+        <member name="F:OpenMetaverse.Assets.GestureStepChat.Text">
+            <summary>
+            Text to output in chat
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectOverwriteEveryone">
-            <summary>If set, and a slam bit is set, indicates EveryoneMask will be overwritten on Rez</summary>
+        <member name="P:OpenMetaverse.Assets.GestureStepChat.GestureStepType">
+            <summary>
+            Returns what kind of gesture step this is
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectOverwriteNextOwner">
-            <summary>If set, and a slam bit is set, indicates NextOwnerMask will be overwritten on Rez</summary>
+        <member name="T:OpenMetaverse.Assets.GestureStepWait">
+            <summary>
+            Describes sound step of a gesture
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectHasMultipleItems">
-            <summary>Indicates whether this object is composed of multiple
-            items or not</summary>
+        <member name="F:OpenMetaverse.Assets.GestureStepWait.WaitForAnimation">
+            <summary>
+            If true in this step we wait for all animations to finish
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItemFlags.SharedSingleReference">
-            <summary>Indicates that the asset is only referenced by this
-            inventory item. If this item is deleted or updated to reference a
-            new assetID, the asset can be deleted</summary>
+        <member name="F:OpenMetaverse.Assets.GestureStepWait.WaitForTime">
+            <summary>
+            If true gesture player should wait for the specified amount of time
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryBase">
+        <member name="F:OpenMetaverse.Assets.GestureStepWait.WaitTime">
             <summary>
-            Base Class for Inventory Items
+            Time in seconds to wait if WaitForAnimation is false
             </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryBase.UUID">
-            <summary><seealso cref="T:OpenMetaverse.UUID"/> of item/folder</summary>
+        <member name="P:OpenMetaverse.Assets.GestureStepWait.GestureStepType">
+            <summary>
+            Returns what kind of gesture step this is
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryBase.ParentUUID">
-            <summary><seealso cref="T:OpenMetaverse.UUID"/> of parent folder</summary>
+        <member name="T:OpenMetaverse.Assets.GestureStepEOF">
+            <summary>
+            Describes the final step of a gesture
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryBase.Name">
-            <summary>Name of item/folder</summary>
+        <member name="P:OpenMetaverse.Assets.GestureStepEOF.GestureStepType">
+            <summary>
+            Returns what kind of gesture step this is
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryBase.OwnerID">
-            <summary>Item/Folder Owners <seealso cref="T:OpenMetaverse.UUID"/></summary>
+        <member name="T:OpenMetaverse.Assets.AssetGesture">
+            <summary>
+            Represents a sequence of animations, sounds, and chat actions
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryBase.#ctor(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Assets.AssetGesture.#ctor">
             <summary>
-            Constructor, takes an itemID as a parameter
+            Constructs guesture asset
             </summary>
-            <param name="itemID">The <seealso cref="T:OpenMetaverse.UUID"/> of the item</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryBase.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="M:OpenMetaverse.Assets.AssetGesture.#ctor(OpenMetaverse.UUID,System.Byte[])">
             <summary>
-            
+            Constructs guesture asset
             </summary>
-            <returns></returns>
+            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID" /> specific to this asset</param>
+            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryBase.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="F:OpenMetaverse.Assets.AssetGesture.TriggerKey">
             <summary>
-            
+            Keyboard key that triggers the gestyre
             </summary>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryBase.GetHashCode">
+        <member name="F:OpenMetaverse.Assets.AssetGesture.TriggerKeyMask">
             <summary>
-            Generates a number corresponding to the value of the object to support the use of a hash table,
-            suitable for use in hashing algorithms and data structures such as a hash table
+            Modifier to the trigger key
             </summary>
-            <returns>A Hashcode of all the combined InventoryBase fields</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryBase.Equals(System.Object)">
+        <member name="F:OpenMetaverse.Assets.AssetGesture.Trigger">
             <summary>
-            Determine whether the specified <seealso cref="T:OpenMetaverse.InventoryBase"/> object is equal to the current object
+            String that triggers playing of the gesture sequence
             </summary>
-            <param name="o">InventoryBase object to compare against</param>
-            <returns>true if objects are the same</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryBase.Equals(OpenMetaverse.InventoryBase)">
+        <member name="F:OpenMetaverse.Assets.AssetGesture.ReplaceWith">
             <summary>
-            Determine whether the specified <seealso cref="T:OpenMetaverse.InventoryBase"/> object is equal to the current object
+            Text that replaces trigger in chat once gesture is triggered
             </summary>
-            <param name="o">InventoryBase object to compare against</param>
-            <returns>true if objects are the same</returns>
         </member>
-        <member name="T:OpenMetaverse.InventoryItem">
+        <member name="F:OpenMetaverse.Assets.AssetGesture.Sequence">
             <summary>
-            An Item in Inventory
+            Sequence of gesture steps
             </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.AssetUUID">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of this item</summary>
+        <member name="P:OpenMetaverse.Assets.AssetGesture.AssetType">
+            <summary>
+            Returns asset type
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.Permissions">
-            <summary>The combined <seealso cref="T:OpenMetaverse.Permissions"/> of this item</summary>
+        <member name="M:OpenMetaverse.Assets.AssetGesture.Encode">
+            <summary>
+            Encodes gesture asset suitable for uplaod
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.AssetType">
-            <summary>The type of item from <seealso cref="T:OpenMetaverse.AssetType"/></summary>
+        <member name="M:OpenMetaverse.Assets.AssetGesture.Decode">
+            <summary>
+            Decodes gesture assset into play sequence
+            </summary>
+            <returns>true if the asset data was decoded successfully</returns>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.InventoryType">
-            <summary>The type of item from the <seealso cref="T:OpenMetaverse.InventoryType"/> enum</summary>
+        <member name="T:OpenMetaverse.Assets.AssetLandmark">
+            <summary>
+            Represents a Landmark with RegionID and Position vector
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.CreatorID">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the creator of this item</summary>
+        <member name="M:OpenMetaverse.Assets.AssetLandmark.#ctor">
+            <summary>Construct an Asset of type Landmark</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.Description">
-            <summary>A Description of this item</summary>
+        <member name="M:OpenMetaverse.Assets.AssetLandmark.#ctor(OpenMetaverse.UUID,System.Byte[])">
+            <summary>
+            Construct an Asset object of type Landmark
+            </summary>
+            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID" /> specific to this asset</param>
+            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.GroupID">
-            <summary>The <seealso cref="T:OpenMetaverse.Group"/>s <seealso cref="T:OpenMetaverse.UUID"/> this item is set to or owned by</summary>
+        <member name="F:OpenMetaverse.Assets.AssetLandmark.RegionID">
+            <summary>UUID of the Landmark target region</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.GroupOwned">
-            <summary>If true, item is owned by a group</summary>
+        <member name="F:OpenMetaverse.Assets.AssetLandmark.Position">
+            <summary> Local position of the target </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.SalePrice">
-            <summary>The price this item can be purchased for</summary>
+        <member name="P:OpenMetaverse.Assets.AssetLandmark.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.SaleType">
-            <summary>The type of sale from the <seealso cref="T:OpenMetaverse.SaleType"/> enum</summary>
+        <member name="M:OpenMetaverse.Assets.AssetLandmark.Encode">
+            <summary>
+            Encode the raw contents of a string with the specific Landmark format
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.Flags">
-            <summary>Combined flags from <seealso cref="T:OpenMetaverse.InventoryItemFlags"/></summary>
+        <member name="M:OpenMetaverse.Assets.AssetLandmark.Decode">
+            <summary>
+            Decode the raw asset data, populating the RegionID and Position
+            </summary>
+            <returns>true if the AssetData was successfully decoded to a UUID and Vector</returns>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.CreationDate">
-            <summary>Time and date this inventory item was created, stored as
-            UTC (Coordinated Universal Time)</summary>
+        <member name="T:OpenMetaverse.Assets.AssetMesh">
+            <summary>
+            Represents Mesh asset
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.TransactionID">
-            <summary>Used to update the AssetID in requests sent to the server</summary>
+        <member name="M:OpenMetaverse.Assets.AssetMesh.#ctor">
+            <summary>Initializes a new instance of an AssetMesh object</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.LastOwnerID">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the previous owner of the item</summary>
+        <member name="M:OpenMetaverse.Assets.AssetMesh.#ctor(OpenMetaverse.UUID,System.Byte[])">
+            <summary>Initializes a new instance of an AssetMesh object with parameters</summary>
+            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID" /> specific to this asset</param>
+            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.#ctor(OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Assets.AssetMesh.MeshData">
             <summary>
-             Construct a new InventoryItem object
+            Decoded mesh data
             </summary>
-            <param name="itemID">The <seealso cref="T:OpenMetaverse.UUID"/> of the item</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.#ctor(OpenMetaverse.InventoryType,OpenMetaverse.UUID)">
+        <member name="P:OpenMetaverse.Assets.AssetMesh.AssetType">
+            <summary>Override the base classes AssetType</summary>
+        </member>
+        <member name="M:OpenMetaverse.Assets.AssetMesh.Encode">
             <summary>
-            Construct a new InventoryItem object of a specific Type
+            TODO: Encodes Collada file into LLMesh format
             </summary>
-            <param name="type">The type of item from <seealso cref="T:OpenMetaverse.InventoryType"/></param>
-            <param name="itemID"><seealso cref="T:OpenMetaverse.UUID"/> of the item</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.IsLink">
+        <member name="M:OpenMetaverse.Assets.AssetMesh.Decode">
             <summary>
-            Indicates inventory item is a link
+            Decodes mesh asset. See <see cref="M:OpenMetaverse.Rendering.FacetedMesh.TryDecodeFromAsset(OpenMetaverse.Primitive,OpenMetaverse.Assets.AssetMesh,OpenMetaverse.Rendering.DetailLevel,OpenMetaverse.Rendering.FacetedMesh)" />
+            to furter decode it for rendering</summary>
+            <returns>true</returns>
+        </member>
+        <member name="T:OpenMetaverse.Assets.AssetNotecard">
+            <summary>
+            Represents a string of characters encoded with specific formatting properties
             </summary>
-            <returns>True if inventory item is a link to another inventory item</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="M:OpenMetaverse.Assets.AssetNotecard.#ctor">
+            <summary>Construct an Asset of type Notecard</summary>
+        </member>
+        <member name="M:OpenMetaverse.Assets.AssetNotecard.#ctor(OpenMetaverse.UUID,System.Byte[])">
             <summary>
-            
+            Construct an Asset object of type Notecard
             </summary>
-            <returns></returns>
+            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID" /> specific to this asset</param>
+            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="F:OpenMetaverse.Assets.AssetNotecard.BodyText">
+            <summary>A text string containing main text of the notecard</summary>
+        </member>
+        <member name="F:OpenMetaverse.Assets.AssetNotecard.EmbeddedItems">
+            <summary>List of <see cref="T:OpenMetaverse.InventoryItem" />s embedded on the notecard</summary>
+        </member>
+        <member name="P:OpenMetaverse.Assets.AssetNotecard.AssetType">
+            <summary>Override the base classes AssetType</summary>
+        </member>
+        <member name="M:OpenMetaverse.Assets.AssetNotecard.Encode">
             <summary>
-            
+            Encode the raw contents of a string with the specific Linden Text properties
             </summary>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.GetHashCode">
+        <member name="M:OpenMetaverse.Assets.AssetNotecard.Decode">
             <summary>
-            Generates a number corresponding to the value of the object to support the use of a hash table.
-            Suitable for use in hashing algorithms and data structures such as a hash table
+            Decode the raw asset data including the Linden Text properties
             </summary>
-            <returns>A Hashcode of all the combined InventoryItem fields</returns>
+            <returns>true if the AssetData was successfully decoded</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.Equals(System.Object)">
+        <member name="T:OpenMetaverse.Assets.AssetPrim">
             <summary>
-            Compares an object
+            A linkset asset, containing a parent primitive and zero or more children
             </summary>
-            <param name="o">The object to compare</param>
-            <returns>true if comparison object matches</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.Equals(OpenMetaverse.InventoryBase)">
+        <member name="M:OpenMetaverse.Assets.AssetPrim.#ctor">
+            <summary>Initializes a new instance of an AssetPrim object</summary>
+        </member>
+        <member name="M:OpenMetaverse.Assets.AssetPrim.#ctor(OpenMetaverse.UUID,System.Byte[])">
             <summary>
-            Determine whether the specified <seealso cref="T:OpenMetaverse.InventoryBase"/> object is equal to the current object
+            Initializes a new instance of an AssetPrim object
             </summary>
-            <param name="o">The <seealso cref="T:OpenMetaverse.InventoryBase"/> object to compare against</param>
-            <returns>true if objects are the same</returns>
+            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID" /> specific to this asset</param>
+            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.Equals(OpenMetaverse.InventoryItem)">
+        <member name="T:OpenMetaverse.Assets.AssetPrim.ProfileShape">
             <summary>
-            Determine whether the specified <seealso cref="T:OpenMetaverse.InventoryItem"/> object is equal to the current object
+            Only used internally for XML serialization/deserialization
             </summary>
-            <param name="o">The <seealso cref="T:OpenMetaverse.InventoryItem"/> object to compare against</param>
-            <returns>true if objects are the same</returns>
         </member>
-        <member name="T:OpenMetaverse.InventoryTexture">
+        <member name="P:OpenMetaverse.Assets.AssetPrim.AssetType">
+            <summary>Override the base classes AssetType</summary>
+        </member>
+        <member name="M:OpenMetaverse.Assets.AssetPrim.Encode">
             <summary>
-            InventoryTexture Class representing a graphical image
             </summary>
-            <seealso cref="!:ManagedImage"/>
         </member>
-        <member name="M:OpenMetaverse.InventoryTexture.#ctor(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Assets.AssetPrim.Decode">
             <summary>
-            Construct an InventoryTexture object
             </summary>
-            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID"/> which becomes the 
-            <seealso cref="T:OpenMetaverse.InventoryItem"/> objects AssetUUID</param>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryTexture.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="T:OpenMetaverse.Assets.PrimObject">
             <summary>
-            Construct an InventoryTexture object from a serialization stream
+            The deserialized form of a single primitive in a linkset asset
             </summary>
         </member>
-        <member name="T:OpenMetaverse.InventorySound">
+        <member name="T:OpenMetaverse.Assets.AssetScriptBinary">
             <summary>
-            InventorySound Class representing a playable sound
+            Represents an AssetScriptBinary object containing the
+            LSO compiled bytecode of an LSL script
             </summary>
         </member>
-        <member name="M:OpenMetaverse.InventorySound.#ctor(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.#ctor">
+            <summary>Initializes a new instance of an AssetScriptBinary object</summary>
+        </member>
+        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.#ctor(OpenMetaverse.UUID,System.Byte[])">
+            <summary>Initializes a new instance of an AssetScriptBinary object with parameters</summary>
+            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID" /> specific to this asset</param>
+            <param name="assetData">A byte array containing the raw asset data</param>
+        </member>
+        <member name="P:OpenMetaverse.Assets.AssetScriptBinary.AssetType">
+            <summary>Override the base classes AssetType</summary>
+        </member>
+        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.Encode">
             <summary>
-            Construct an InventorySound object
+            TODO: Encodes a scripts contents into a LSO Bytecode file
             </summary>
-            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID"/> which becomes the 
-            <seealso cref="T:OpenMetaverse.InventoryItem"/> objects AssetUUID</param>
         </member>
-        <member name="M:OpenMetaverse.InventorySound.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.Decode">
             <summary>
-            Construct an InventorySound object from a serialization stream
+            TODO: Decode LSO Bytecode into a string
             </summary>
+            <returns>true</returns>
         </member>
-        <member name="T:OpenMetaverse.InventoryCallingCard">
+        <member name="T:OpenMetaverse.Assets.AssetScriptText">
             <summary>
-            InventoryCallingCard Class, contains information on another avatar
+            Represents an LSL Text object containing a string of UTF encoded characters
             </summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryCallingCard.#ctor(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Assets.AssetScriptText.#ctor">
+            <summary>Initializes a new AssetScriptText object</summary>
+        </member>
+        <member name="M:OpenMetaverse.Assets.AssetScriptText.#ctor(OpenMetaverse.UUID,System.Byte[])">
             <summary>
-            Construct an InventoryCallingCard object
+            Initializes a new AssetScriptText object with parameters
             </summary>
-            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID"/> which becomes the 
-            <seealso cref="T:OpenMetaverse.InventoryItem"/> objects AssetUUID</param>
+            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID" /> specific to this asset</param>
+            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryCallingCard.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="F:OpenMetaverse.Assets.AssetScriptText.Source">
+            <summary>A string of characters represting the script contents</summary>
+        </member>
+        <member name="P:OpenMetaverse.Assets.AssetScriptText.AssetType">
+            <summary>Override the base classes AssetType</summary>
+        </member>
+        <member name="M:OpenMetaverse.Assets.AssetScriptText.Encode">
             <summary>
-            Construct an InventoryCallingCard object from a serialization stream
+            Encode a string containing the scripts contents into byte encoded AssetData
             </summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryLandmark">
+        <member name="M:OpenMetaverse.Assets.AssetScriptText.Decode">
             <summary>
-            InventoryLandmark Class, contains details on a specific location
+            Decode a byte array containing the scripts contents into a string
             </summary>
+            <returns>true if decoding is successful</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryLandmark.#ctor(OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.Assets.AssetSound">
             <summary>
-            Construct an InventoryLandmark object
+            Represents a Sound Asset
             </summary>
-            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID"/> which becomes the 
-            <seealso cref="T:OpenMetaverse.InventoryItem"/> objects AssetUUID</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryLandmark.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="M:OpenMetaverse.Assets.AssetSound.#ctor">
+            <summary>Initializes a new instance of an AssetSound object</summary>
+        </member>
+        <member name="M:OpenMetaverse.Assets.AssetSound.#ctor(OpenMetaverse.UUID,System.Byte[])">
+            <summary>Initializes a new instance of an AssetSound object with parameters</summary>
+            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID" /> specific to this asset</param>
+            <param name="assetData">A byte array containing the raw asset data</param>
+        </member>
+        <member name="P:OpenMetaverse.Assets.AssetSound.AssetType">
+            <summary>Override the base classes AssetType</summary>
+        </member>
+        <member name="M:OpenMetaverse.Assets.AssetSound.Encode">
             <summary>
-            Construct an InventoryLandmark object from a serialization stream
+            TODO: Encodes a sound file
             </summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryLandmark.LandmarkVisited">
+        <member name="M:OpenMetaverse.Assets.AssetSound.Decode">
             <summary>
-            Landmarks use the InventoryItemFlags struct and will have a flag of 1 set if they have been visited
+            TODO: Decode a sound file
             </summary>
+            <returns>true</returns>
         </member>
-        <member name="T:OpenMetaverse.InventoryObject">
+        <member name="T:OpenMetaverse.Assets.AssetTexture">
             <summary>
-            InventoryObject Class contains details on a primitive or coalesced set of primitives
+            Represents a texture
             </summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryObject.#ctor(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Assets.AssetTexture.#ctor">
+            <summary>Initializes a new instance of an AssetTexture object</summary>
+        </member>
+        <member name="M:OpenMetaverse.Assets.AssetTexture.#ctor(OpenMetaverse.UUID,System.Byte[])">
             <summary>
-            Construct an InventoryObject object
+            Initializes a new instance of an AssetTexture object
             </summary>
-            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID"/> which becomes the 
-            <seealso cref="T:OpenMetaverse.InventoryItem"/> objects AssetUUID</param>
+            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID" /> specific to this asset</param>
+            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryObject.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="M:OpenMetaverse.Assets.AssetTexture.#ctor(OpenMetaverse.Imaging.ManagedImage)">
             <summary>
-            Construct an InventoryObject object from a serialization stream
+            Initializes a new instance of an AssetTexture object
             </summary>
+            <param name="image">A <seealso cref="T:OpenMetaverse.Imaging.ManagedImage" /> object containing texture data</param>
         </member>
-        <member name="P:OpenMetaverse.InventoryObject.ItemFlags">
+        <member name="F:OpenMetaverse.Assets.AssetTexture.Image">
+            <summary>A <seealso cref="T:OpenMetaverse.Imaging.ManagedImage" /> object containing image data</summary>
+        </member>
+        <member name="F:OpenMetaverse.Assets.AssetTexture.LayerInfo">
             <summary>
-            Gets or sets the upper byte of the Flags value
             </summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryObject.AttachPoint">
+        <member name="F:OpenMetaverse.Assets.AssetTexture.Components">
             <summary>
-            Gets or sets the object attachment point, the lower byte of the Flags value
             </summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryNotecard">
+        <member name="P:OpenMetaverse.Assets.AssetTexture.AssetType">
+            <summary>Override the base classes AssetType</summary>
+        </member>
+        <member name="M:OpenMetaverse.Assets.AssetTexture.Encode">
             <summary>
-            InventoryNotecard Class, contains details on an encoded text document
+            Populates the <seealso cref="F:OpenMetaverse.Assets.AssetTexture.AssetData" /> byte array with a JPEG2000
+            encoded image created from the data in <seealso cref="F:OpenMetaverse.Assets.AssetTexture.Image" /></summary>
+        </member>
+        <member name="M:OpenMetaverse.Assets.AssetTexture.Decode">
+            <summary>
+            Decodes the JPEG2000 data in <code>AssetData</code> to the
+            <seealso cref="T:OpenMetaverse.Imaging.ManagedImage" /> object <seealso cref="F:OpenMetaverse.Assets.AssetTexture.Image" /></summary>
+            <returns>True if the decoding was successful, otherwise false</returns>
+        </member>
+        <member name="M:OpenMetaverse.Assets.AssetTexture.DecodeLayerBoundaries">
+            <summary>
+            Decodes the begin and end byte positions for each quality layer in
+            the image
             </summary>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryNotecard.#ctor(OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.Assets.AssetWearable">
             <summary>
-            Construct an InventoryNotecard object
+            Represents a Wearable Asset, Clothing, Hair, Skin, Etc
             </summary>
-            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID"/> which becomes the 
-            <seealso cref="T:OpenMetaverse.InventoryItem"/> objects AssetUUID</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryNotecard.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="M:OpenMetaverse.Assets.AssetWearable.#ctor">
+            <summary>Initializes a new instance of an AssetWearable object</summary>
+        </member>
+        <member name="M:OpenMetaverse.Assets.AssetWearable.#ctor(OpenMetaverse.UUID,System.Byte[])">
+            <summary>Initializes a new instance of an AssetWearable object with parameters</summary>
+            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID" /> specific to this asset</param>
+            <param name="assetData">A byte array containing the raw asset data</param>
+        </member>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.Name">
+            <summary>A string containing the name of the asset</summary>
+        </member>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.Description">
+            <summary>A string containing a short description of the asset</summary>
+        </member>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.WearableType">
+            <summary>The Assets WearableType</summary>
+        </member>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.ForSale">
+            <summary>The For-Sale status of the object</summary>
+        </member>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.SalePrice">
+            <summary>An Integer representing the purchase price of the asset</summary>
+        </member>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.Creator">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID" /> of the assets creator</summary>
+        </member>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.Owner">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID" /> of the assets current owner</summary>
+        </member>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.LastOwner">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID" /> of the assets prior owner</summary>
+        </member>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.Group">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID" /> of the Group this asset is set to</summary>
+        </member>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.GroupOwned">
+            <summary>True if the asset is owned by a <seealso cref="T:OpenMetaverse.Group" /></summary>
+        </member>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.Permissions">
+            <summary>The Permissions mask of the asset</summary>
+        </member>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.Params">
+            <summary>A Dictionary containing Key/Value pairs of the objects parameters</summary>
+        </member>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.Textures">
+            <summary>A Dictionary containing Key/Value pairs where the Key is the textures Index and the Value is the Textures <seealso cref="T:OpenMetaverse.UUID" /></summary>
+        </member>
+        <member name="M:OpenMetaverse.Assets.AssetWearable.Decode">
             <summary>
-            Construct an InventoryNotecard object from a serialization stream
+            Decode an assets byte encoded data to a string
             </summary>
+            <returns>true if the asset data was decoded successfully</returns>
         </member>
-        <member name="T:OpenMetaverse.InventoryCategory">
+        <member name="M:OpenMetaverse.Assets.AssetWearable.Encode">
             <summary>
-            InventoryCategory Class
+            Encode the assets string represantion into a format consumable by the asset server
             </summary>
-            <remarks>TODO: Is this even used for anything?</remarks>
         </member>
-        <member name="M:OpenMetaverse.InventoryCategory.#ctor(OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Http.EventQueueClient.REQUEST_TIMEOUT">
+            <summary>=</summary>
+        </member>
+        <member name="F:OpenMetaverse.Http.EventQueueClient._errorCount">
+            <summary>Number of times we've received an unknown CAPS exception in series.</summary>
+        </member>
+        <member name="F:OpenMetaverse.Http.EventQueueClient._random">
+            <summary>For exponential backoff on error.</summary>
+        </member>
+        <member name="T:OpenMetaverse.Imaging.Baker">
             <summary>
-            Construct an InventoryCategory object
+            A set of textures that are layered on texture of each other and "baked"
+            in to a single texture, for avatar appearances
             </summary>
-            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID"/> which becomes the 
-            <seealso cref="T:OpenMetaverse.InventoryItem"/> objects AssetUUID</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryCategory.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="M:OpenMetaverse.Imaging.Baker.#ctor(OpenMetaverse.BakeType)">
             <summary>
-            Construct an InventoryCategory object from a serialization stream
+            Default constructor
             </summary>
+            <param name="bakeType">Bake type</param>
         </member>
-        <member name="T:OpenMetaverse.InventoryLSL">
+        <member name="F:OpenMetaverse.Imaging.Baker.bakedTexture">
+            <summary>Final baked texture</summary>
+        </member>
+        <member name="F:OpenMetaverse.Imaging.Baker.textures">
+            <summary>Component layers</summary>
+        </member>
+        <member name="F:OpenMetaverse.Imaging.Baker.bakeWidth">
+            <summary>Width of the final baked image and scratchpad</summary>
+        </member>
+        <member name="F:OpenMetaverse.Imaging.Baker.bakeHeight">
+            <summary>Height of the final baked image and scratchpad</summary>
+        </member>
+        <member name="F:OpenMetaverse.Imaging.Baker.bakeType">
+            <summary>Bake type</summary>
+        </member>
+        <member name="P:OpenMetaverse.Imaging.Baker.BakedTexture">
+            <summary>Final baked texture</summary>
+        </member>
+        <member name="P:OpenMetaverse.Imaging.Baker.Textures">
+            <summary>Component layers</summary>
+        </member>
+        <member name="P:OpenMetaverse.Imaging.Baker.BakeWidth">
+            <summary>Width of the final baked image and scratchpad</summary>
+        </member>
+        <member name="P:OpenMetaverse.Imaging.Baker.BakeHeight">
+            <summary>Height of the final baked image and scratchpad</summary>
+        </member>
+        <member name="P:OpenMetaverse.Imaging.Baker.BakeType">
+            <summary>Bake type</summary>
+        </member>
+        <member name="P:OpenMetaverse.Imaging.Baker.IsSkin">
+            <summary>Is this one of the 3 skin bakes</summary>
+        </member>
+        <member name="M:OpenMetaverse.Imaging.Baker.AddTexture(OpenMetaverse.AppearanceManager.TextureData)">
             <summary>
-            InventoryLSL Class, represents a Linden Scripting Language object
+            Adds layer for baking
             </summary>
+            <param name="tdata">TexturaData struct that contains texture and its params</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryLSL.#ctor(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Imaging.Baker.BakeTypeFor(OpenMetaverse.AvatarTextureIndex)">
             <summary>
-            Construct an InventoryLSL object
+            Converts avatar texture index (face) to Bake type
             </summary>
-            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID"/> which becomes the 
-            <seealso cref="T:OpenMetaverse.InventoryItem"/> objects AssetUUID</param>
+            <param name="index">Face number (AvatarTextureIndex)</param>
+            <returns>BakeType, layer to which this texture belongs to</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryLSL.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="M:OpenMetaverse.Imaging.Baker.SanitizeLayers(OpenMetaverse.Imaging.ManagedImage,OpenMetaverse.Imaging.ManagedImage)">
             <summary>
-            Construct an InventoryLSL object from a serialization stream
+            Make sure images exist, resize source if needed to match the destination
             </summary>
+            <param name="dest">Destination image</param>
+            <param name="src">Source image</param>
+            <returns>Sanitization was succefull</returns>
         </member>
-        <member name="T:OpenMetaverse.InventorySnapshot">
+        <member name="M:OpenMetaverse.Imaging.Baker.InitBakedLayerColor(OpenMetaverse.Color4)">
             <summary>
-            InventorySnapshot Class, an image taken with the viewer
+            Fills a baked layer as a solid *appearing* color. The colors are
+            subtly dithered on a 16x16 grid to prevent the JPEG2000 stage from
+            compressing it too far since it seems to cause upload failures if
+            the image is a pure solid color
             </summary>
+            <param name="color">Color of the base of this layer</param>
         </member>
-        <member name="M:OpenMetaverse.InventorySnapshot.#ctor(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Imaging.Baker.InitBakedLayerColor(System.Single,System.Single,System.Single)">
             <summary>
-            Construct an InventorySnapshot object
+            Fills a baked layer as a solid *appearing* color. The colors are
+            subtly dithered on a 16x16 grid to prevent the JPEG2000 stage from
+            compressing it too far since it seems to cause upload failures if
+            the image is a pure solid color
             </summary>
-            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID"/> which becomes the 
-            <seealso cref="T:OpenMetaverse.InventoryItem"/> objects AssetUUID</param>
+            <param name="r">Red value</param>
+            <param name="g">Green value</param>
+            <param name="b">Blue value</param>
         </member>
-        <member name="M:OpenMetaverse.InventorySnapshot.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="M:OpenMetaverse.Imaging.ManagedImage.#ctor(System.Int32,System.Int32,OpenMetaverse.Imaging.ManagedImage.ImageChannels)">
             <summary>
-            Construct an InventorySnapshot object from a serialization stream
+            Create a new blank image
             </summary>
+            <param name="width">width</param>
+            <param name="height">height</param>
+            <param name="channels">channel flags</param>
         </member>
-        <member name="T:OpenMetaverse.InventoryAttachment">
+        <member name="M:OpenMetaverse.Imaging.ManagedImage.#ctor(System.Drawing.Bitmap)">
             <summary>
-            InventoryAttachment Class, contains details on an attachable object
             </summary>
+            <param name="bitmap">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.InventoryAttachment.#ctor(OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Width">
             <summary>
-            Construct an InventoryAttachment object
+            Image width
             </summary>
-            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID"/> which becomes the 
-            <seealso cref="T:OpenMetaverse.InventoryItem"/> objects AssetUUID</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryAttachment.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Height">
             <summary>
-            Construct an InventoryAttachment object from a serialization stream
+            Image height
             </summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryAttachment.AttachmentPoint">
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Channels">
             <summary>
-            Get the last AttachmentPoint this object was attached to
+            Image channel flags
             </summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryWearable">
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Red">
             <summary>
-            InventoryWearable Class, details on a clothing item or body part
+            Red channel data
             </summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryWearable.#ctor(OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Green">
             <summary>
-            Construct an InventoryWearable object
+            Green channel data
             </summary>
-            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID"/> which becomes the 
-            <seealso cref="T:OpenMetaverse.InventoryItem"/> objects AssetUUID</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryWearable.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Blue">
             <summary>
-            Construct an InventoryWearable object from a serialization stream
+            Blue channel data
             </summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryWearable.WearableType">
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Alpha">
             <summary>
-            The <seealso cref="T:OpenMetaverse.WearableType"/>, Skin, Shape, Skirt, Etc
+            Alpha channel data
             </summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryAnimation">
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Bump">
             <summary>
-            InventoryAnimation Class, A bvh encoded object which animates an avatar
+            Bump channel data
             </summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryAnimation.#ctor(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Imaging.ManagedImage.ConvertChannels(OpenMetaverse.Imaging.ManagedImage.ImageChannels)">
             <summary>
-            Construct an InventoryAnimation object
+            Convert the channels in the image. Channels are created or destroyed as required.
             </summary>
-            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID"/> which becomes the 
-            <seealso cref="T:OpenMetaverse.InventoryItem"/> objects AssetUUID</param>
+            <param name="channels">new channel flags</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryAnimation.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="M:OpenMetaverse.Imaging.ManagedImage.ResizeNearestNeighbor(System.Int32,System.Int32)">
             <summary>
-            Construct an InventoryAnimation object from a serialization stream
+            Resize or stretch the image using nearest neighbor (ugly) resampling
             </summary>
+            <param name="width">new width</param>
+            <param name="height">new height</param>
         </member>
-        <member name="T:OpenMetaverse.InventoryGesture">
+        <member name="M:OpenMetaverse.Imaging.ManagedImage.ExportRaw">
             <summary>
-            InventoryGesture Class, details on a series of animations, sounds, and actions
+            Create a byte array containing 32-bit RGBA data with a bottom-left
+            origin, suitable for feeding directly into OpenGL
             </summary>
+            <returns>A byte array containing raw texture data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryGesture.#ctor(OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.Imaging.OpenJPEG">
             <summary>
-            Construct an InventoryGesture object
+            A Wrapper around openjpeg to encode and decode images to and from byte arrays
             </summary>
-            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID"/> which becomes the 
-            <seealso cref="T:OpenMetaverse.InventoryItem"/> objects AssetUUID</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryGesture.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="T:OpenMetaverse.Imaging.OpenJPEG.J2KLayerInfo">
             <summary>
-            Construct an InventoryGesture object from a serialization stream
+            Defines the beginning and ending file positions of a layer in an
+            LRCP-progression JPEG2000 file
             </summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryFolder">
+        <member name="T:OpenMetaverse.Imaging.OpenJPEG.MarshalledImage">
             <summary>
-            A folder contains <seealso cref="T:OpenMetaverse.InventoryItem"/>s and has certain attributes specific 
-            to itself
+            This structure is used to marshal both encoded and decoded images.
+            MUST MATCH THE STRUCT IN dotnet.h!
             </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryFolder.PreferredType">
-            <summary>The Preferred <seealso cref="T:OpenMetaverse.AssetType"/> for a folder.</summary>
+        <member name="T:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket">
+            <summary>
+            Information about a single packet in a JPEG2000 stream
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryFolder.Version">
-            <summary>The Version of this folder</summary>
+        <member name="F:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket.start_pos">
+            <summary>Packet start position</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryFolder.DescendentCount">
-            <summary>Number of child items this folder contains.</summary>
+        <member name="F:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket.end_ph_pos">
+            <summary>Packet header end position</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.#ctor(OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket.end_pos">
+            <summary>Packet end position</summary>
+        </member>
+        <member name="F:OpenMetaverse.Imaging.OpenJPEG.TGA_HEADER_SIZE">
+            <summary>TGA Header size</summary>
+        </member>
+        <member name="F:OpenMetaverse.Imaging.OpenJPEG.OpenJPEGLock">
+            <summary>OpenJPEG is not threadsafe, so this object is used to lock
+            during calls into unmanaged code</summary>
+        </member>
+        <member name="M:OpenMetaverse.Imaging.OpenJPEG.Encode(OpenMetaverse.Imaging.ManagedImage,System.Boolean)">
             <summary>
-            Constructor
+            Encode a <seealso cref="T:OpenMetaverse.Imaging.ManagedImage" /> object into a byte array
             </summary>
-            <param name="itemID">UUID of the folder</param>
+            <param name="image">The <seealso cref="T:OpenMetaverse.Imaging.ManagedImage" /> object to encode</param>
+            <param name="lossless">true to enable lossless conversion, only useful for small images ie: sculptmaps</param>
+            <returns>A byte array containing the encoded Image object</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.ToString">
+        <member name="M:OpenMetaverse.Imaging.OpenJPEG.Encode(OpenMetaverse.Imaging.ManagedImage)">
             <summary>
-            
+            Encode a <seealso cref="T:OpenMetaverse.Imaging.ManagedImage" /> object into a byte array
             </summary>
-            <returns></returns>
+            <param name="image">The <seealso cref="T:OpenMetaverse.Imaging.ManagedImage" /> object to encode</param>
+            <returns>a byte array of the encoded image</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="M:OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(System.Byte[],OpenMetaverse.Imaging.ManagedImage@,System.Drawing.Image@)">
             <summary>
-            Get Serilization data for this InventoryFolder object
-            </summary>
+            Decode JPEG2000 data to an <seealso cref="T:System.Drawing.Image" /> and
+            <seealso cref="T:OpenMetaverse.Imaging.ManagedImage" /></summary>
+            <param name="encoded">JPEG2000 encoded data</param>
+            <param name="managedImage">ManagedImage object to decode to</param>
+            <param name="image">Image object to decode to</param>
+            <returns>True if the decode succeeds, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="M:OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(System.Byte[],OpenMetaverse.Imaging.ManagedImage@)">
             <summary>
-            Construct an InventoryFolder object from a serialization stream
             </summary>
+            <param name="encoded">
+            </param>
+            <param name="managedImage">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.GetHashCode">
+        <member name="M:OpenMetaverse.Imaging.OpenJPEG.DecodeLayerBoundaries(System.Byte[],OpenMetaverse.Imaging.OpenJPEG.J2KLayerInfo[]@,System.Int32@)">
             <summary>
-            
             </summary>
-            <returns></returns>
+            <param name="encoded">
+            </param>
+            <param name="layerInfo">
+            </param>
+            <param name="components">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.Equals(System.Object)">
+        <member name="M:OpenMetaverse.Imaging.OpenJPEG.EncodeFromImage(System.Drawing.Bitmap,System.Boolean)">
             <summary>
-            
+            Encode a <seealso cref="T:System.Drawing.Bitmap" /> object into a byte array
             </summary>
-            <param name="o"></param>
-            <returns></returns>
+            <param name="bitmap">The source <seealso cref="T:System.Drawing.Bitmap" /> object to encode</param>
+            <param name="lossless">true to enable lossless decoding</param>
+            <returns>A byte array containing the source Bitmap object</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.Equals(OpenMetaverse.InventoryBase)">
+        <member name="T:OpenMetaverse.Imaging.LoadTGAClass">
             <summary>
-            
+            Capability to load TGAs to Bitmap
             </summary>
-            <param name="o"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.Equals(OpenMetaverse.InventoryFolder)">
+        <member name="T:OpenMetaverse.Interfaces.IMessage">
             <summary>
-            
+            Interface requirements for Messaging system
             </summary>
-            <param name="o"></param>
-            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.InventoryManager">
+        <member name="T:OpenMetaverse.Rendering.IRendering">
             <summary>
-            Tools for dealing with agents inventory
+            Abstract base for rendering plugins
             </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.MAGIC_ID">
-            <summary>Used for converting shadow_id to asset_id</summary>
-        </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_ItemReceived">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.InventoryManager.OnItemReceived(OpenMetaverse.ItemReceivedEventArgs)">
-            <summary>Raises the ItemReceived Event</summary>
-             <param name="e">A ItemReceivedEventArgs object containing
-             the data sent from the simulator</param>
-        </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_ItemReceivedLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_FolderUpdated">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.InventoryManager.OnFolderUpdated(OpenMetaverse.FolderUpdatedEventArgs)">
-            <summary>Raises the FolderUpdated Event</summary>
-             <param name="e">A FolderUpdatedEventArgs object containing
-             the data sent from the simulator</param>
-        </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_FolderUpdatedLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_InventoryObjectOffered">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.InventoryManager.OnInventoryObjectOffered(OpenMetaverse.InventoryObjectOfferedEventArgs)">
-            <summary>Raises the InventoryObjectOffered Event</summary>
-             <param name="e">A InventoryObjectOfferedEventArgs object containing
-             the data sent from the simulator</param>
-        </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_InventoryObjectOfferedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.Rendering.IRendering.GenerateSimpleMesh(OpenMetaverse.Primitive,OpenMetaverse.Rendering.DetailLevel)">
+            <summary>
+            Generates a basic mesh structure from a primitive
+            </summary>
+            <param name="prim">Primitive to generate the mesh from</param>
+            <param name="lod">Level of detail to generate the mesh at</param>
+            <returns>The generated mesh</returns>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_TaskItemReceived">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="M:OpenMetaverse.Rendering.IRendering.GenerateSimpleSculptMesh(OpenMetaverse.Primitive,System.Drawing.Bitmap,OpenMetaverse.Rendering.DetailLevel)">
+            <summary>
+            Generates a basic mesh structure from a sculpted primitive and
+            texture
+            </summary>
+            <param name="prim">Sculpted primitive to generate the mesh from</param>
+            <param name="sculptTexture">Sculpt texture</param>
+            <param name="lod">Level of detail to generate the mesh at</param>
+            <returns>The generated mesh</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.OnTaskItemReceived(OpenMetaverse.TaskItemReceivedEventArgs)">
-            <summary>Raises the TaskItemReceived Event</summary>
-             <param name="e">A TaskItemReceivedEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="M:OpenMetaverse.Rendering.IRendering.GenerateFacetedMesh(OpenMetaverse.Primitive,OpenMetaverse.Rendering.DetailLevel)">
+            <summary>
+            Generates a series of faces, each face containing a mesh and
+            metadata
+            </summary>
+            <param name="prim">Primitive to generate the mesh from</param>
+            <param name="lod">Level of detail to generate the mesh at</param>
+            <returns>The generated mesh</returns>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_TaskItemReceivedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.Rendering.IRendering.GenerateFacetedSculptMesh(OpenMetaverse.Primitive,System.Drawing.Bitmap,OpenMetaverse.Rendering.DetailLevel)">
+            <summary>
+            Generates a series of faces for a sculpted prim, each face
+            containing a mesh and metadata
+            </summary>
+            <param name="prim">Sculpted primitive to generate the mesh from</param>
+            <param name="sculptTexture">Sculpt texture</param>
+            <param name="lod">Level of detail to generate the mesh at</param>
+            <returns>The generated mesh</returns>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_FindObjectByPathReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="M:OpenMetaverse.Rendering.IRendering.TransformTexCoords(System.Collections.Generic.List{OpenMetaverse.Rendering.Vertex},OpenMetaverse.Vector3,OpenMetaverse.Primitive.TextureEntryFace,OpenMetaverse.Vector3)">
+            <summary>
+            Apply texture coordinate modifications from a
+            <seealso cref="!:TextureEntryFace" /> to a list of vertices
+            </summary>
+            <param name="vertices">Vertex list to modify texture coordinates for</param>
+            <param name="center">Center-point of the face</param>
+            <param name="teFace">Face texture parameters</param>
+            <param name="primScale">Scale of the prim</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.OnFindObjectByPathReply(OpenMetaverse.FindObjectByPathReplyEventArgs)">
-            <summary>Raises the FindObjectByPath Event</summary>
-             <param name="e">A FindObjectByPathEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="T:OpenMetaverse.Messages.Linden.TeleportFinishMessage">
+            <summary>
+            Sent to the client to indicate a teleport request has completed
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_FindObjectByPathReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.AgentID">
+            <summary>The <see cref="T:OpenMetaverse.UUID" /> of the agent</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_TaskInventoryReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.LocationID">
+            <summary>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.OnTaskInventoryReply(OpenMetaverse.TaskInventoryReplyEventArgs)">
-            <summary>Raises the TaskInventoryReply Event</summary>
-             <param name="e">A TaskInventoryReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.RegionHandle">
+            <summary>The simulators handle the agent teleported to</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_TaskInventoryReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.SeedCapability">
+            <summary>A Uri which contains a list of Capabilities the simulator supports</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_SaveAssetToInventory">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.SimAccess">
+            <summary>Indicates the level of access required
+            to access the simulator, or the content rating, or the simulators
+            map status</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.OnSaveAssetToInventory(OpenMetaverse.SaveAssetToInventoryEventArgs)">
-            <summary>Raises the SaveAssetToInventory Event</summary>
-             <param name="e">A SaveAssetToInventoryEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.IP">
+            <summary>The IP Address of the simulator</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_SaveAssetToInventoryLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.Port">
+            <summary>The UDP Port the simulator will listen for UDP traffic on</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_ScriptRunningReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.Flags">
+            <summary>Status flags indicating the state of the Agent upon arrival, Flying, etc.</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.OnScriptRunningReply(OpenMetaverse.ScriptRunningReplyEventArgs)">
-            <summary>Raises the ScriptRunningReply Event</summary>
-             <param name="e">A ScriptRunningReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="M:OpenMetaverse.Messages.Linden.TeleportFinishMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_ScriptRunningReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.TeleportFinishMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.InventoryManager._NewFolderNames">
-            <summary>Partial mapping of AssetTypes to folder names</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.EstablishAgentCommunicationMessage">
+            <summary>
+            Sent to the viewer when a neighboring simulator is requesting the agent make a connection to it.
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="M:OpenMetaverse.Messages.Linden.EstablishAgentCommunicationMessage.Serialize">
             <summary>
-            Default constructor
+            Serialize the object
             </summary>
-            <param name="client">Reference to the GridClient object</param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.FetchItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Int32)">
+        <member name="M:OpenMetaverse.Messages.Linden.EstablishAgentCommunicationMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Fetch an inventory item from the dataserver
+            Deserialize the message
             </summary>
-            <param name="itemID">The items <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <param name="ownerID">The item Owners <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <param name="timeoutMS">a integer representing the number of milliseconds to wait for results</param>
-            <returns>An <seealso cref="T:OpenMetaverse.InventoryItem"/> object on success, or null if no item was found</returns>
-            <remarks>Items will also be sent to the <seealso cref="M:OpenMetaverse.InventoryManager.OnItemReceived(OpenMetaverse.ItemReceivedEventArgs)"/> event</remarks>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestFetchInventory(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Messages.Linden.CrossedRegionMessage.Serialize">
             <summary>
-            Request A single inventory item
+            Serialize the object
             </summary>
-            <param name="itemID">The items <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <param name="ownerID">The item Owners <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <seealso cref="M:OpenMetaverse.InventoryManager.OnItemReceived(OpenMetaverse.ItemReceivedEventArgs)"/>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestFetchInventory(System.Collections.Generic.List{OpenMetaverse.UUID},System.Collections.Generic.List{OpenMetaverse.UUID})">
+        <member name="M:OpenMetaverse.Messages.Linden.CrossedRegionMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Request inventory items
+            Deserialize the message
             </summary>
-            <param name="itemIDs">Inventory items to request</param>
-            <param name="ownerIDs">Owners of the inventory items</param>
-            <seealso cref="M:OpenMetaverse.InventoryManager.OnItemReceived(OpenMetaverse.ItemReceivedEventArgs)"/>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.FolderContents(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventorySortOrder,System.Int32)">
+        <member name="M:OpenMetaverse.Messages.Linden.EnableSimulatorMessage.Serialize">
             <summary>
-            Get contents of a folder
+            Serialize the object
             </summary>
-            <param name="folder">The <seealso cref="T:OpenMetaverse.UUID"/> of the folder to search</param>
-            <param name="owner">The <seealso cref="T:OpenMetaverse.UUID"/> of the folders owner</param>
-            <param name="folders">true to retrieve folders</param>
-            <param name="items">true to retrieve items</param>
-            <param name="order">sort order to return results in</param>
-            <param name="timeoutMS">a integer representing the number of milliseconds to wait for results</param>
-            <returns>A list of inventory items matching search criteria within folder</returns>
-            <seealso cref="M:OpenMetaverse.InventoryManager.RequestFolderContents(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventorySortOrder)"/>
-            <remarks>InventoryFolder.DescendentCount will only be accurate if both folders and items are
-            requested</remarks>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestFolderContents(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventorySortOrder)">
+        <member name="M:OpenMetaverse.Messages.Linden.EnableSimulatorMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Request the contents of an inventory folder
+            Deserialize the message
             </summary>
-            <param name="folder">The folder to search</param>
-            <param name="owner">The folder owners <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <param name="folders">true to return <seealso cref="!:InventoryManager.InventoryFolder"/>s contained in folder</param>
-            <param name="items">true to return <seealso cref="!:InventoryManager.InventoryItem"/>s containd in folder</param>
-            <param name="order">the sort order to return items in</param>
-            <seealso cref="M:OpenMetaverse.InventoryManager.FolderContents(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventorySortOrder,System.Int32)"/>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.FindFolderForType(OpenMetaverse.AssetType)">
+        <member name="T:OpenMetaverse.Messages.Linden.TeleportFailedMessage">
             <summary>
-            Returns the UUID of the folder (category) that defaults to
-            containing 'type'. The folder is not necessarily only for that
-            type
+            A message sent to the client which indicates a teleport request has failed
+            and contains some information on why it failed
             </summary>
-            <remarks>This will return the root folder if one does not exist</remarks>
-            <param name="type"></param>
-            <returns>The UUID of the desired folder if found, the UUID of the RootFolder
-            if not found, or UUID.Zero on failure</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.FindObjectByPath(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.Int32)">
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFailedMessage.ExtraParams">
             <summary>
-            Find an object in inventory using a specific path to search
             </summary>
-            <param name="baseFolder">The folder to begin the search in</param>
-            <param name="inventoryOwner">The object owners <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <param name="path">A string path to search</param>
-            <param name="timeoutMS">milliseconds to wait for a reply</param>
-            <returns>Found items <seealso cref="T:OpenMetaverse.UUID"/> or <seealso cref="F:OpenMetaverse.UUID.Zero"/> if 
-            timeout occurs or item is not found</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestFindObjectByPath(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String)">
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFailedMessage.MessageKey">
+            <summary>A string key of the reason the teleport failed e.g. CouldntTPCloser
+            Which could be used to look up a value in a dictionary or enum</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFailedMessage.AgentID">
+            <summary>The <see cref="T:OpenMetaverse.UUID" /> of the Agent</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.TeleportFailedMessage.Reason">
+            <summary>A string human readable message containing the reason </summary>
+            <remarks>An example: Could not teleport closer to destination</remarks>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.TeleportFailedMessage.Serialize">
             <summary>
-            Find inventory items by path
+            Serialize the object
             </summary>
-            <param name="baseFolder">The folder to begin the search in</param>
-            <param name="inventoryOwner">The object owners <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <param name="path">A string path to search, folders/objects separated by a '/'</param>
-            <remarks>Results are sent to the <seealso cref="!:InventoryManager.OnFindObjectByPath"/> event</remarks>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.LocalFind(OpenMetaverse.UUID,System.String[],System.Int32,System.Boolean)">
+        <member name="M:OpenMetaverse.Messages.Linden.TeleportFailedMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Search inventory Store object for an item or folder
+            Deserialize the message
             </summary>
-            <param name="baseFolder">The folder to begin the search in</param>
-            <param name="path">An array which creates a path to search</param>
-            <param name="level">Number of levels below baseFolder to conduct searches</param>
-            <param name="firstOnly">if True, will stop searching after first match is found</param>
-            <returns>A list of inventory items found</returns>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.Move(OpenMetaverse.InventoryBase,OpenMetaverse.InventoryFolder)">
+        <member name="M:OpenMetaverse.Messages.Linden.LandStatReplyMessage.Serialize">
             <summary>
-            Move an inventory item or folder to a new location
+            Serialize the object
             </summary>
-            <param name="item">The <seealso cref="T:InventoryBase"/> item or folder to move</param>
-            <param name="newParent">The <seealso cref="T:InventoryFolder"/> to move item or folder to</param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.Move(OpenMetaverse.InventoryBase,OpenMetaverse.InventoryFolder,System.String)">
+        <member name="M:OpenMetaverse.Messages.Linden.LandStatReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Move an inventory item or folder to a new location and change its name
+            Deserialize the message
             </summary>
-            <param name="item">The <seealso cref="T:InventoryBase"/> item or folder to move</param>
-            <param name="newParent">The <seealso cref="T:InventoryFolder"/> to move item or folder to</param>
-            <param name="newName">The name to change the item or folder to</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.MoveFolder(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String)">
+        <member name="T:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage">
             <summary>
-            Move and rename a folder
+            Contains a list of prim owner information for a specific parcel in a simulator
             </summary>
-            <param name="folderID">The source folders <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <param name="newparentID">The destination folders <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <param name="newName">The name to change the folder to</param>
+            <remarks>
+            A Simulator will always return at least 1 entry
+            If agent does not have proper permission the OwnerID will be UUID.Zero
+            If agent does not have proper permission OR there are no primitives on parcel
+            the DataBlocksExtended map will not be sent from the simulator
+            </remarks>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.UpdateFolderProperties(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.AssetType)">
+        <member name="T:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner">
             <summary>
-            Update folder properties
+            Prim ownership information for a specified owner on a single parcel
             </summary>
-            <param name="folderID"><seealso cref="T:OpenMetaverse.UUID"/> of the folder to update</param>
-            <param name="parentID">Sets folder's parent to <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <param name="name">Folder name</param>
-            <param name="type">Folder type</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.MoveFolder(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.OwnerID">
+            <summary>The <see cref="T:OpenMetaverse.UUID" /> of the prim owner,
+            UUID.Zero if agent has no permission to view prim owner information</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.Count">
+            <summary>The total number of prims</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.IsGroupOwned">
+            <summary>True if the OwnerID is a <see cref="T:OpenMetaverse.Group" /></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.OnlineStatus">
+            <summary>True if the owner is online
+            <remarks>This is no longer used by the LL Simulators</remarks></summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner.TimeStamp">
+            <summary>The date the most recent prim was rezzed</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwnersBlock">
+            <summary>An Array of <see cref="T:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.PrimOwner" /> objects</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.Serialize">
             <summary>
-            Move a folder
+            Serialize the object
             </summary>
-            <param name="folderID">The source folders <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <param name="newParentID">The destination folders <seealso cref="T:OpenMetaverse.UUID"/></param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.MoveFolders(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.UUID})">
+        <member name="M:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Move multiple folders, the keys in the Dictionary parameter,
-            to a new parents, the value of that folder's key.
+            Deserialize the message
             </summary>
-            <param name="foldersNewParents">A Dictionary containing the 
-            <seealso cref="T:OpenMetaverse.UUID"/> of the source as the key, and the 
-            <seealso cref="T:OpenMetaverse.UUID"/> of the destination as the value</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.MoveItem(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage">
             <summary>
-            Move an inventory item to a new folder
+            The details of a single parcel in a region, also contains some regionwide globals
             </summary>
-            <param name="itemID">The <seealso cref="T:OpenMetaverse.UUID"/> of the source item to move</param>
-            <param name="folderID">The <seealso cref="T:OpenMetaverse.UUID"/> of the destination folder</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.MoveItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.LocalID">
+            <summary>Simulator-local ID of this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AABBMax">
+            <summary>Maximum corner of the axis-aligned bounding box for this
+            parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AABBMin">
+            <summary>Minimum corner of the axis-aligned bounding box for this
+            parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Area">
+            <summary>Total parcel land area</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AuctionID">
             <summary>
-            Move and rename an inventory item
             </summary>
-            <param name="itemID">The <seealso cref="T:OpenMetaverse.UUID"/> of the source item to move</param>
-            <param name="folderID">The <seealso cref="T:OpenMetaverse.UUID"/> of the destination folder</param>
-            <param name="newName">The name to change the folder to</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.MoveItems(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.UUID})">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AuthBuyerID">
+            <summary>Key of authorized buyer</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Bitmap">
+            <summary>Bitmap describing land layout in 4x4m squares across the
+            entire region</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Category">
             <summary>
-            Move multiple inventory items to new locations
             </summary>
-            <param name="itemsNewParents">A Dictionary containing the 
-            <seealso cref="T:OpenMetaverse.UUID"/> of the source item as the key, and the 
-            <seealso cref="T:OpenMetaverse.UUID"/> of the destination folder as the value</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RemoveDescendants(OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ClaimDate">
+            <summary>Date land was claimed</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ClaimPrice">
+            <summary>Appears to always be zero</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Desc">
+            <summary>Parcel Description</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ParcelFlags">
             <summary>
-            Remove descendants of a folder
             </summary>
-            <param name="folder">The <seealso cref="T:OpenMetaverse.UUID"/> of the folder</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RemoveItem(OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.GroupID">
             <summary>
-            Remove a single item from inventory
             </summary>
-            <param name="item">The <seealso cref="T:OpenMetaverse.UUID"/> of the inventory item to remove</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RemoveFolder(OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.GroupPrims">
+            <summary>Total number of primitives owned by the parcel group on
+            this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.IsGroupOwned">
+            <summary>Whether the land is deeded to a group or not</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.LandingType">
             <summary>
-            Remove a folder from inventory
             </summary>
-            <param name="folder">The <seealso cref="T:OpenMetaverse.UUID"/> of the folder to remove</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.Remove(System.Collections.Generic.List{OpenMetaverse.UUID},System.Collections.Generic.List{OpenMetaverse.UUID})">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MaxPrims">
+            <summary>Maximum number of primitives this parcel supports</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaID">
+            <summary>The Asset UUID of the Texture which when applied to a
+            primitive will display the media</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaURL">
+            <summary>A URL which points to any Quicktime supported media type</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaAutoScale">
+            <summary>A byte, if 0x1 viewer should auto scale media to fit object</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MusicURL">
+            <summary>URL For Music Stream</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Name">
+            <summary>Parcel Name</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OtherCleanTime">
+            <summary>Autoreturn value in minutes for others' objects</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OtherCount">
             <summary>
-            Remove multiple items or folders from inventory
             </summary>
-            <param name="items">A List containing the <seealso cref="T:OpenMetaverse.UUID"/>s of items to remove</param>
-            <param name="folders">A List containing the <seealso cref="T:OpenMetaverse.UUID"/>s of the folders to remove</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.EmptyLostAndFound">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OtherPrims">
+            <summary>Total number of other primitives on this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OwnerID">
+            <summary>UUID of the owner of this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OwnerPrims">
+            <summary>Total number of primitives owned by the parcel owner on
+            this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ParcelPrimBonus">
             <summary>
-            Empty the Lost and Found folder
             </summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.EmptyTrash">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.PassHours">
+            <summary>How long is pass valid for</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.PassPrice">
+            <summary>Price for a temporary pass</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.PublicCount">
             <summary>
-            Empty the Trash folder
             </summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestCreateItem(OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.UUID,OpenMetaverse.InventoryType,OpenMetaverse.PermissionMask,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Privacy">
+            <summary>Disallows people outside the parcel from being able to see in</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionDenyAnonymous">
             <summary>
-            
             </summary>
-            <param name="parentFolder"></param>
-            <param name="name"></param>
-            <param name="description"></param>
-            <param name="type"></param>
-            <param name="assetTransactionID">Proper use is to upload the inventory's asset first, then provide the Asset's TransactionID here.</param>
-            <param name="invType"></param>
-            <param name="nextOwnerMask"></param>
-            <param name="callback"></param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestCreateItem(OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.UUID,OpenMetaverse.InventoryType,OpenMetaverse.WearableType,OpenMetaverse.PermissionMask,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionDenyIdentified">
             <summary>
-            
             </summary>
-            <param name="parentFolder"></param>
-            <param name="name"></param>
-            <param name="description"></param>
-            <param name="type"></param>
-            <param name="assetTransactionID">Proper use is to upload the inventory's asset first, then provide the Asset's TransactionID here.</param>
-            <param name="invType"></param>
-            <param name="wearableType"></param>
-            <param name="nextOwnerMask"></param>
-            <param name="callback"></param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CreateFolder(OpenMetaverse.UUID,System.String)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionDenyTransacted">
             <summary>
-            Creates a new inventory folder
             </summary>
-            <param name="parentID">ID of the folder to put this folder in</param>
-            <param name="name">Name of the folder to create</param>
-            <returns>The UUID of the newly created folder</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CreateFolder(OpenMetaverse.UUID,System.String,OpenMetaverse.AssetType)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionDenyAgeUnverified">
+            <summary>True if the region denies access to age unverified users</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionPushOverride">
             <summary>
-            Creates a new inventory folder
             </summary>
-            <param name="parentID">ID of the folder to put this folder in</param>
-            <param name="name">Name of the folder to create</param>
-            <param name="preferredType">Sets this folder as the default folder
-            for new assets of the specified type. Use <code>AssetType.Unknown</code>
-            to create a normal folder, otherwise it will likely create a
-            duplicate of an existing folder type</param>
-            <returns>The UUID of the newly created folder</returns>
-            <remarks>If you specify a preferred type of <code>AsseType.Folder</code>
-            it will create a new root folder which may likely cause all sorts
-            of strange problems</remarks>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestCreateItemFromAsset(System.Byte[],System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.InventoryType,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCreatedFromAssetCallback)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RentPrice">
+            <summary>This field is no longer used</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RequestResult">
+            The result of a request for parcel properties</member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SalePrice">
+            <summary>Sale price of the parcel, only useful if ForSale is set</summary>
+            <remarks>The SalePrice will remain the same after an ownership
+            transfer (sale), so it can be used to see the purchase price after
+            a sale if the new owner has not changed it</remarks>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SelectedPrims">
             <summary>
-            Create an inventory item and upload asset data
+            Number of primitives your avatar is currently
+            selecting and sitting on in this parcel
             </summary>
-            <param name="data">Asset data</param>
-            <param name="name">Inventory item name</param>
-            <param name="description">Inventory item description</param>
-            <param name="assetType">Asset type</param>
-            <param name="invType">Inventory type</param>
-            <param name="folderID">Put newly created inventory in this folder</param>
-            <param name="callback">Delegate that will receive feedback on success or failure</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestCreateItemFromAsset(System.Byte[],System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.InventoryType,OpenMetaverse.UUID,OpenMetaverse.Permissions,OpenMetaverse.InventoryManager.ItemCreatedFromAssetCallback)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SelfCount">
             <summary>
-            Create an inventory item and upload asset data
             </summary>
-            <param name="data">Asset data</param>
-            <param name="name">Inventory item name</param>
-            <param name="description">Inventory item description</param>
-            <param name="assetType">Asset type</param>
-            <param name="invType">Inventory type</param>
-            <param name="folderID">Put newly created inventory in this folder</param>
-            <param name="permissions">Permission of the newly created item 
-            (EveryoneMask, GroupMask, and NextOwnerMask of Permissions struct are supported)</param>
-            <param name="callback">Delegate that will receive feedback on success or failure</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.InventoryBase,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SequenceID">
             <summary>
-            Creates inventory link to another inventory item or folder
+            A number which increments by 1, starting at 0 for each ParcelProperties request.
+            Can be overriden by specifying the sequenceID with the ParcelPropertiesRequest being sent.
+            a Negative number indicates the action in <seealso cref="T:OpenMetaverse.ParcelPropertiesStatus" /> has occurred.
             </summary>
-            <param name="folderID">Put newly created link in folder with this UUID</param>
-            <param name="bse">Inventory item or folder</param>
-            <param name="callback">Method to call upon creation of the link</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.InventoryItem,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SimWideMaxPrims">
+            <summary>Maximum primitives across the entire simulator</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SimWideTotalPrims">
+            <summary>Total primitives across the entire simulator</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SnapSelection">
             <summary>
-            Creates inventory link to another inventory item
             </summary>
-            <param name="folderID">Put newly created link in folder with this UUID</param>
-            <param name="item">Original inventory item</param>
-            <param name="callback">Method to call upon creation of the link</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.InventoryFolder,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SnapshotID">
+            <summary>Key of parcel snapshot</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Status">
+            <summary>Parcel ownership status</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.TotalPrims">
+            <summary>Total number of primitives on this parcel</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.UserLocation">
             <summary>
-            Creates inventory link to another inventory folder
             </summary>
-            <param name="folderID">Put newly created link in folder with this UUID</param>
-            <param name="folder">Original inventory folder</param>
-            <param name="callback">Method to call upon creation of the link</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.InventoryType,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.UserLookAt">
             <summary>
-            Creates inventory link to another inventory item or folder
             </summary>
-            <param name="folderID">Put newly created link in folder with this UUID</param>
-            <param name="itemID">Original item's UUID</param>
-            <param name="name">Name</param>
-            <param name="description">Description</param>
-            <param name="assetType">Asset Type</param>
-            <param name="invType">Inventory Type</param>
-            <param name="transactionID">Transaction UUID</param>
-            <param name="callback">Method to call upon creation of the link</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestCopyItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.InventoryManager.ItemCopiedCallback)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaDesc">
+            <summary>A description of the media</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaHeight">
+            <summary>An Integer which represents the height of the media</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaWidth">
+            <summary>An integer which represents the width of the media</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaLoop">
+            <summary>A boolean, if true the viewer should loop the media</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaType">
+            <summary>A string which contains the mime type of the media</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ObscureMedia">
+            <summary>true to obscure (hide) media url</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ObscureMusic">
+            <summary>true to obscure (hide) music url</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Serialize">
             <summary>
-            
+            Serialize the object
             </summary>
-            <param name="item"></param>
-            <param name="newParent"></param>
-            <param name="newName"></param>
-            <param name="callback"></param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestCopyItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCopiedCallback)">
+        <member name="M:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            
+            Deserialize the message
             </summary>
-            <param name="item"></param>
-            <param name="newParent"></param>
-            <param name="newName"></param>
-            <param name="oldOwnerID"></param>
-            <param name="callback"></param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestCopyItems(System.Collections.Generic.List{OpenMetaverse.UUID},System.Collections.Generic.List{OpenMetaverse.UUID},System.Collections.Generic.List{System.String},OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCopiedCallback)">
+        <member name="T:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage">
+            <summary>A message sent from the viewer to the simulator to updated a specific parcels settings</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.AuthBuyerID">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID" /> of the agent authorized to purchase this
+            parcel of land or a NULL <seealso cref="T:OpenMetaverse.UUID" /> if the sale is authorized to anyone</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaAutoScale">
+            <summary>true to enable auto scaling of the parcel media</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Category">
+            <summary>The category of this parcel used when search is enabled to restrict
+            search results</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Desc">
+            <summary>A string containing the description to set</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.GroupID">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID" /> of the <seealso cref="T:OpenMetaverse.Group" /> which allows for additional
+            powers and restrictions.</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Landing">
+            <summary>The <seealso cref="T:OpenMetaverse.LandingType" /> which specifies how avatars which teleport
+            to this parcel are handled</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.LocalID">
+            <summary>The LocalID of the parcel to update settings on</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaDesc">
+            <summary>A string containing the description of the media which can be played
+            to visitors</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaHeight">
             <summary>
-            
             </summary>
-            <param name="items"></param>
-            <param name="targetFolders"></param>
-            <param name="newNames"></param>
-            <param name="oldOwnerID"></param>
-            <param name="callback"></param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestCopyItemFromNotecard(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCopiedCallback)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaLoop">
             <summary>
-            Request a copy of an asset embedded within a notecard
             </summary>
-            <param name="objectID">Usually UUID.Zero for copying an asset from a notecard</param>
-            <param name="notecardID">UUID of the notecard to request an asset from</param>
-            <param name="folderID">Target folder for asset to go to in your inventory</param>
-            <param name="itemID">UUID of the embedded asset</param>
-            <param name="callback">callback to run when item is copied to inventory</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateItem(OpenMetaverse.InventoryItem)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaID">
             <summary>
-            
             </summary>
-            <param name="item"></param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateItems(System.Collections.Generic.List{OpenMetaverse.InventoryItem})">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaType">
             <summary>
-            
             </summary>
-            <param name="items"></param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateItems(System.Collections.Generic.List{OpenMetaverse.InventoryItem},OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaURL">
             <summary>
-            
             </summary>
-            <param name="items"></param>
-            <param name="transactionID"></param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUploadNotecardAsset(System.Byte[],OpenMetaverse.UUID,OpenMetaverse.InventoryManager.InventoryUploadedAssetCallback)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaWidth">
             <summary>
-            
             </summary>
-            <param name="data"></param>
-            <param name="notecardID"></param>
-            <param name="callback"></param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateNotecardTask(System.Byte[],OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.InventoryUploadedAssetCallback)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MusicURL">
             <summary>
-            Save changes to notecard embedded in object contents
             </summary>
-            <param name="data">Encoded notecard asset data</param>
-            <param name="notecardID">Notecard UUID</param>
-            <param name="taskID">Object's UUID</param>
-            <param name="callback">Called upon finish of the upload with status information</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUploadGestureAsset(System.Byte[],OpenMetaverse.UUID,OpenMetaverse.InventoryManager.InventoryUploadedAssetCallback)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Name">
             <summary>
-            Upload new gesture asset for an inventory gesture item
             </summary>
-            <param name="data">Encoded gesture asset</param>
-            <param name="gestureID">Gesture inventory UUID</param>
-            <param name="callback">Callback whick will be called when upload is complete</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateScriptAgentInventory(System.Byte[],OpenMetaverse.UUID,System.Boolean,OpenMetaverse.InventoryManager.ScriptUpdatedCallback)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.ObscureMedia">
             <summary>
-            Update an existing script in an agents Inventory
             </summary>
-            <param name="data">A byte[] array containing the encoded scripts contents</param>
-            <param name="itemID">the itemID of the script</param>
-            <param name="mono">if true, sets the script content to run on the mono interpreter</param>
-            <param name="callback"></param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateScriptTask(System.Byte[],OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventoryManager.ScriptUpdatedCallback)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.ObscureMusic">
             <summary>
-            Update an existing script in an task Inventory
             </summary>
-            <param name="data">A byte[] array containing the encoded scripts contents</param>
-            <param name="itemID">the itemID of the script</param>
-            <param name="taskID">UUID of the prim containting the script</param>
-            <param name="mono">if true, sets the script content to run on the mono interpreter</param>
-            <param name="running">if true, sets the script to running</param>
-            <param name="callback"></param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestRezFromInventory(OpenMetaverse.Simulator,OpenMetaverse.Quaternion,OpenMetaverse.Vector3,OpenMetaverse.InventoryItem)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.ParcelFlags">
             <summary>
-            Rez an object from inventory
             </summary>
-            <param name="simulator">Simulator to place object in</param>
-            <param name="rotation">Rotation of the object when rezzed</param>
-            <param name="position">Vector of where to place object</param>
-            <param name="item">InventoryItem object containing item details</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestRezFromInventory(OpenMetaverse.Simulator,OpenMetaverse.Quaternion,OpenMetaverse.Vector3,OpenMetaverse.InventoryItem,OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.PassHours">
             <summary>
-            Rez an object from inventory
             </summary>
-            <param name="simulator">Simulator to place object in</param>
-            <param name="rotation">Rotation of the object when rezzed</param>
-            <param name="position">Vector of where to place object</param>
-            <param name="item">InventoryItem object containing item details</param>
-            <param name="groupOwner">UUID of group to own the object</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestRezFromInventory(OpenMetaverse.Simulator,OpenMetaverse.Quaternion,OpenMetaverse.Vector3,OpenMetaverse.InventoryItem,OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.PassPrice">
             <summary>
-            Rez an object from inventory
             </summary>
-            <param name="simulator">Simulator to place object in</param>
-            <param name="rotation">Rotation of the object when rezzed</param>
-            <param name="position">Vector of where to place object</param>
-            <param name="item">InventoryItem object containing item details</param>
-            <param name="groupOwner">UUID of group to own the object</param>        
-            <param name="queryID">User defined queryID to correlate replies</param>
-            <param name="rezSelected">If set to true, the CreateSelected flag
-            will be set on the rezzed object</param>        
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestDeRezToInventory(System.UInt32)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Privacy">
             <summary>
-            DeRez an object from the simulator to the agents Objects folder in the agents Inventory
             </summary>
-            <param name="objectLocalID">The simulator Local ID of the object</param>
-            <remarks>If objectLocalID is a child primitive in a linkset, the entire linkset will be derezzed</remarks>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestDeRezToInventory(System.UInt32,OpenMetaverse.DeRezDestination,OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.SalePrice">
             <summary>
-            DeRez an object from the simulator and return to inventory
             </summary>
-            <param name="objectLocalID">The simulator Local ID of the object</param>
-            <param name="destType">The type of destination from the <seealso cref="T:OpenMetaverse.DeRezDestination"/> enum</param>
-            <param name="destFolder">The destination inventory folders <seealso cref="T:OpenMetaverse.UUID"/> -or- 
-            if DeRezzing object to a tasks Inventory, the Tasks <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <param name="transactionID">The transaction ID for this request which
-            can be used to correlate this request with other packets</param>
-            <remarks>If objectLocalID is a child primitive in a linkset, the entire linkset will be derezzed</remarks>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestRestoreRezFromInventory(OpenMetaverse.Simulator,OpenMetaverse.InventoryItem,OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.SnapshotID">
             <summary>
-            Rez an item from inventory to its previous simulator location
             </summary>
-            <param name="simulator"></param>
-            <param name="item"></param>
-            <param name="queryID"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.GiveItem(OpenMetaverse.UUID,System.String,OpenMetaverse.AssetType,OpenMetaverse.UUID,System.Boolean)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.UserLocation">
             <summary>
-            Give an inventory item to another avatar
             </summary>
-            <param name="itemID">The <seealso cref="T:OpenMetaverse.UUID"/> of the item to give</param>
-            <param name="itemName">The name of the item</param>
-            <param name="assetType">The type of the item from the <seealso cref="T:OpenMetaverse.AssetType"/> enum</param>
-            <param name="recipient">The <seealso cref="T:OpenMetaverse.UUID"/> of the recipient</param>
-            <param name="doEffect">true to generate a beameffect during transfer</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.GiveFolder(OpenMetaverse.UUID,System.String,OpenMetaverse.AssetType,OpenMetaverse.UUID,System.Boolean)">
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.UserLookAt">
             <summary>
-            Give an inventory Folder with contents to another avatar
             </summary>
-            <param name="folderID">The <seealso cref="T:OpenMetaverse.UUID"/> of the Folder to give</param>
-            <param name="folderName">The name of the folder</param>
-            <param name="assetType">The type of the item from the <seealso cref="T:OpenMetaverse.AssetType"/> enum</param>
-            <param name="recipient">The <seealso cref="T:OpenMetaverse.UUID"/> of the recipient</param>
-            <param name="doEffect">true to generate a beameffect during transfer</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.UpdateTaskInventory(System.UInt32,OpenMetaverse.InventoryItem)">
+        <member name="M:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Copy or move an <see cref="T:OpenMetaverse.InventoryItem"/> from agent inventory to a task (primitive) inventory
+            Deserialize the message
             </summary>
-            <param name="objectLocalID">The target object</param>
-            <param name="item">The item to copy or move from inventory</param>
-            <returns></returns>
-            <remarks>For items with copy permissions a copy of the item is placed in the tasks inventory,
-            for no-copy items the object is moved to the tasks inventory</remarks>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.GetTaskInventory(OpenMetaverse.UUID,System.UInt32,System.Int32)">
+        <member name="M:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Serialize">
             <summary>
-            Retrieve a listing of the items contained in a task (Primitive)
+            Serialize the object
             </summary>
-            <param name="objectID">The tasks <seealso cref="T:OpenMetaverse.UUID"/></param>
-            <param name="objectLocalID">The tasks simulator local ID</param>
-            <param name="timeoutMS">milliseconds to wait for reply from simulator</param>
-            <returns>A list containing the inventory items inside the task or null
-            if a timeout occurs</returns>
-            <remarks>This request blocks until the response from the simulator arrives 
-            or timeoutMS is exceeded</remarks>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestTaskInventory(System.UInt32)">
+        <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestBlock">
+            <summary>Base class used for the RemoteParcelRequest message</summary>
+        </member>
+        <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest">
             <summary>
-            Request the contents of a tasks (primitives) inventory from the 
-            current simulator
+            A message sent from the viewer to the simulator to request information
+            on a remote parcel
             </summary>
-            <param name="objectLocalID">The LocalID of the object</param>
-            <seealso cref="E:OpenMetaverse.InventoryManager.TaskInventoryReply"/>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestTaskInventory(System.UInt32,OpenMetaverse.Simulator)">
+        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.Location">
+            <summary>Local sim position of the parcel we are looking up</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.RegionHandle">
+            <summary>Region handle of the parcel we are looking up</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.RegionID">
+            <summary>Region <see cref="T:OpenMetaverse.UUID" /> of the parcel we are looking up</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.Serialize">
             <summary>
-            Request the contents of a tasks (primitives) inventory
+            Serialize the object
             </summary>
-            <param name="objectLocalID">The simulator Local ID of the object</param>
-            <param name="simulator">A reference to the simulator object that contains the object</param>
-            <seealso cref="E:OpenMetaverse.InventoryManager.TaskInventoryReply"/>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.MoveTaskInventory(System.UInt32,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Move an item from a tasks (Primitive) inventory to the specified folder in the avatars inventory
+            Deserialize the message
             </summary>
-            <param name="objectLocalID">LocalID of the object in the simulator</param>
-            <param name="taskItemID">UUID of the task item to move</param>
-            <param name="inventoryFolderID">The ID of the destination folder in this agents inventory</param>
-            <param name="simulator">Simulator Object</param>
-            <remarks>Raises the <see cref="M:OpenMetaverse.InventoryManager.OnTaskItemReceived(OpenMetaverse.TaskItemReceivedEventArgs)"/> event</remarks>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RemoveTaskInventory(System.UInt32,OpenMetaverse.UUID,OpenMetaverse.Simulator)">
+        <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestReply">
             <summary>
-            Remove an item from an objects (Prim) Inventory
+            A message sent from the simulator to the viewer in response to a <see cref="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest" />
+            which will contain parcel information
             </summary>
-            <param name="objectLocalID">LocalID of the object in the simulator</param>
-            <param name="taskItemID">UUID of the task item to remove</param>
-            <param name="simulator">Simulator Object</param>
-            <remarks>You can confirm the removal by comparing the tasks inventory serial before and after the 
-            request with the <see cref="M:OpenMetaverse.InventoryManager.RequestTaskInventory(System.UInt32)"/> request combined with
-            the <seealso cref="E:OpenMetaverse.InventoryManager.TaskInventoryReply"/> event</remarks>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CopyScriptToTask(System.UInt32,OpenMetaverse.InventoryItem,System.Boolean)">
-             <summary>
-             Copy an InventoryScript item from the Agents Inventory into a primitives task inventory
-             </summary>
-             <param name="objectLocalID">An unsigned integer representing a primitive being simulated</param>
-             <param name="item">An <seealso cref="T:OpenMetaverse.InventoryItem"/> which represents a script object from the agents inventory</param>
-             <param name="enableScript">true to set the scripts running state to enabled</param>
-             <returns>A Unique Transaction ID</returns>
-             <example>
-             The following example shows the basic steps necessary to copy a script from the agents inventory into a tasks inventory
-             and assumes the script exists in the agents inventory.
-             <code>
-                uint primID = 95899503; // Fake prim ID
-                UUID scriptID = UUID.Parse("92a7fe8a-e949-dd39-a8d8-1681d8673232"); // Fake Script UUID in Inventory
-            
-                Client.Inventory.FolderContents(Client.Inventory.FindFolderForType(AssetType.LSLText), Client.Self.AgentID, 
-                    false, true, InventorySortOrder.ByName, 10000);
-            
-                Client.Inventory.RezScript(primID, (InventoryItem)Client.Inventory.Store[scriptID]);
-             </code>
-             </example>
+        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestReply.ParcelID">
+            <summary>The grid-wide unique parcel ID</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestGetScriptRunning(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestReply.Serialize">
             <summary>
-            Request the running status of a script contained in a task (primitive) inventory
+            Serialize the object
             </summary>
-            <param name="objectID">The ID of the primitive containing the script</param>
-            <param name="scriptID">The ID of the script</param>
-            <remarks>The <see cref="E:OpenMetaverse.InventoryManager.ScriptRunningReply"/> event can be used to obtain the results of the 
-            request</remarks>
-            <seealso cref="E:OpenMetaverse.InventoryManager.ScriptRunningReply"/>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestSetScriptRunning(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean)">
+        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestReply.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Send a request to set the running state of a script contained in a task (primitive) inventory
+            Deserialize the message
             </summary>
-            <param name="objectID">The ID of the primitive containing the script</param>
-            <param name="scriptID">The ID of the script</param>
-            <param name="running">true to set the script running, false to stop a running script</param>
-            <remarks>To verify the change you can use the <see cref="M:OpenMetaverse.InventoryManager.RequestGetScriptRunning(OpenMetaverse.UUID,OpenMetaverse.UUID)"/> method combined
-            with the <see cref="E:OpenMetaverse.InventoryManager.ScriptRunningReply"/> event</remarks>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.ItemCRC(OpenMetaverse.InventoryItem)">
+        <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestMessage">
             <summary>
-            Create a CRC from an InventoryItem
+            A message containing a request for a remote parcel from a viewer, or a response
+            from the simulator to that request
             </summary>
-            <param name="iitem">The source InventoryItem</param>
-            <returns>A uint representing the source InventoryItem as a CRC</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.DecryptShadowID(OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Messages.Linden.RemoteParcelRequestMessage.Request">
+            <summary>The request or response details block</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestMessage.Serialize">
             <summary>
-            Reverses a cheesy XORing with a fixed UUID to convert a shadow_id to an asset_id
+            Serialize the object
             </summary>
-            <param name="shadowID">Obfuscated shadow_id value</param>
-            <returns>Deobfuscated asset_id value</returns>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.EncryptAssetID(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Messages.Linden.RemoteParcelRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Does a cheesy XORing with a fixed UUID to convert an asset_id to a shadow_id
+            Deserialize the message
             </summary>
-            <param name="assetID">asset_id value to obfuscate</param>
-            <returns>Obfuscated shadow_id value</returns>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CreateInventoryItem(OpenMetaverse.InventoryType,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Messages.Linden.NewFileAgentInventoryMessage.Serialize">
             <summary>
-            Wrapper for creating a new <seealso cref="T:OpenMetaverse.InventoryItem"/> object
+            Serialize the object
             </summary>
-            <param name="type">The type of item from the <seealso cref="T:OpenMetaverse.InventoryType"/> enum</param>
-            <param name="id">The <seealso cref="T:OpenMetaverse.UUID"/> of the newly created object</param>
-            <returns>An <seealso cref="T:OpenMetaverse.InventoryItem"/> object with the type and id passed</returns>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.ParseTaskInventory(System.String)">
+        <member name="M:OpenMetaverse.Messages.Linden.NewFileAgentInventoryMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Parse the results of a RequestTaskInventory() response
+            Deserialize the message
             </summary>
-            <param name="taskData">A string which contains the data from the task reply</param>
-            <returns>A List containing the items contained within the tasks inventory</returns>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.SaveAssetIntoInventoryHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.Messages.Linden.NewFileAgentInventoryVariablePriceMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.InventoryDescendentsHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.Messages.Linden.NewFileAgentInventoryVariablePriceMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.UpdateCreateInventoryItemHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="T:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage">
             <summary>
-            UpdateCreateInventoryItem packets are received when a new inventory item 
-            is created. This may occur when an object that's rezzed in world is
-            taken into inventory, when an item is created using the CreateInventoryItem
-            packet, or when an object is purchased
+            A message sent from the simulator to an agent which contains
+            the groups the agent is in
             </summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.MoveInventoryItemHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="T:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData">
+            <summary>Group Details specific to the agent</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.BulkUpdateInventoryHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.AcceptNotices">
+            <summary>true of the agent accepts group notices</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.FetchInventoryReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.Contribution">
+            <summary>The agents tier contribution to the group</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.ReplyTaskInventoryHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.GroupID">
+            <summary>The Groups <seealso cref="T:OpenMetaverse.UUID" /></summary>
         </member>
-        <member name="E:OpenMetaverse.InventoryManager.ItemReceived">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.GroupInsigniaID">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID" /> of the groups insignia</summary>
         </member>
-        <member name="E:OpenMetaverse.InventoryManager.FolderUpdated">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.GroupName">
+            <summary>The name of the group</summary>
         </member>
-        <member name="E:OpenMetaverse.InventoryManager.InventoryObjectOffered">
-            <summary>Raised when the simulator sends us data containing
-            an inventory object sent by another avatar or primitive</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData.GroupPowers">
+            <summary>The aggregate permissions the agent has in the group for all roles the agent
+            is assigned</summary>
         </member>
-        <member name="E:OpenMetaverse.InventoryManager.TaskItemReceived">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.NewGroupData">
+            <summary>An optional block containing additional agent specific information</summary>
         </member>
-        <member name="E:OpenMetaverse.InventoryManager.FindObjectByPathReply">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.NewGroupData.ListInProfile">
+            <summary>true of the agent allows this group to be
+            listed in their profile</summary>
         </member>
-        <member name="E:OpenMetaverse.InventoryManager.TaskInventoryReply">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.AgentID">
+            <summary>The Agent receiving the message</summary>
         </member>
-        <member name="E:OpenMetaverse.InventoryManager.SaveAssetToInventory">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupDataBlock">
+            <summary>An array containing <seealso cref="T:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.GroupData" /> information
+            for each <see cref="T:OpenMetaverse.Group" /> the agent is a member of</summary>
         </member>
-        <member name="E:OpenMetaverse.InventoryManager.ScriptRunningReply">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.NewGroupDataBlock">
+            <summary>An array containing <seealso cref="T:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.NewGroupData" /> information
+            for each <see cref="T:OpenMetaverse.Group" /> the agent is a member of</summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryManager.Store">
+        <member name="M:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.Serialize">
             <summary>
-            Get this agents Inventory data
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.InventoryManager.ItemCreatedCallback">
+        <member name="M:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Callback for inventory item creation finishing
+            Deserialize the message
             </summary>
-            <param name="success">Whether the request to create an inventory
-            item succeeded or not</param>
-            <param name="item">Inventory item being created. If success is
-            false this will be null</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.InventoryManager.ItemCreatedFromAssetCallback">
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage">
             <summary>
-            Callback for an inventory item being create from an uploaded asset
+            A message sent from the viewer to the simulator which
+            specifies the language and permissions for others to detect
+            the language specified
             </summary>
-            <param name="success">true if inventory item creation was successful</param>
-            <param name="status"></param>
-            <param name="itemID"></param>
-            <param name="assetID"></param>
         </member>
-        <member name="T:OpenMetaverse.InventoryManager.ItemCopiedCallback">
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage.Language">
+            <summary>A string containng the default language
+            to use for the agent</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage.LanguagePublic">
+            <summary>true of others are allowed to
+            know the language setting</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage.Serialize">
             <summary>
-            
+            Serialize the object
             </summary>
-            <param name="item"></param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.InventoryManager.InventoryUploadedAssetCallback">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Reply received when uploading an inventory asset
+            Deserialize the message
             </summary>
-            <param name="success">Has upload been successful</param>
-            <param name="status">Error message if upload failed</param>
-            <param name="itemID">Inventory asset UUID</param>
-            <param name="assetID">New asset UUID</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.InventoryManager.ScriptUpdatedCallback">
+        <member name="T:OpenMetaverse.Messages.Linden.AgentDropGroupMessage">
             <summary>
-            Delegate that is invoked when script upload is completed
+            An EventQueue message sent from the simulator to an agent when the agent
+            leaves a group
             </summary>
-            <param name="uploadSuccess">Has upload succeded (note, there still might be compile errors)</param>
-            <param name="uploadStatus">Upload status message</param>
-            <param name="compileSuccess">Is compilation successful</param>
-            <param name="compileMessages">If compilation failed, list of error messages, null on compilation success</param>
-            <param name="itemID">Script inventory UUID</param>
-            <param name="assetID">Script's new asset UUID</param>
         </member>
-        <member name="P:OpenMetaverse.InventoryObjectOfferedEventArgs.Accept">
-            <summary>Set to true to accept offer, false to decline it</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.AgentData">
+            <summary>An object containing the Agents UUID, and the Groups UUID</summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryObjectOfferedEventArgs.FolderID">
-            <summary>The folder to accept the inventory into, if null default folder for <see cref="P:OpenMetaverse.InventoryObjectOfferedEventArgs.AssetType"/> will be used</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.AgentData.AgentID">
+            <summary>The ID of the Agent leaving the group</summary>
         </member>
-        <member name="T:OpenMetaverse.TaskItemReceivedEventArgs">
+        <member name="F:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.AgentData.GroupID">
+            <summary>The GroupID the Agent is leaving</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.AgentDataBlock">
             <summary>
-            Callback when an inventory object is accepted and received from a
-            task inventory. This is the callback in which you actually get
-            the ItemID, as in ObjectOfferedCallback it is null when received
-            from a task.
+            An Array containing the AgentID and GroupID
             </summary>
         </member>
-        <member name="T:OpenMetaverse.GridLayerType">
+        <member name="M:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.Serialize">
             <summary>
-            Map layer request type
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.GridLayerType.Objects">
-            <summary>Objects and terrain are shown</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridLayerType.Terrain">
-            <summary>Only the terrain is shown, no objects</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridLayerType.LandForSale">
-            <summary>Overlay showing land for sale and for auction</summary>
-        </member>
-        <member name="T:OpenMetaverse.GridItemType">
+        <member name="M:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Type of grid item, such as telehub, event, populator location, etc.
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.GridItemType.Telehub">
-            <summary>Telehub</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridItemType.PgEvent">
-            <summary>PG rated event</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridItemType.MatureEvent">
-            <summary>Mature rated event</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridItemType.Popular">
-            <summary>Popular location</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridItemType.AgentLocations">
-            <summary>Locations of avatar groups in a region</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridItemType.LandForSale">
-            <summary>Land for sale</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridItemType.Classified">
-            <summary>Classified ad</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridItemType.AdultEvent">
-            <summary>Adult rated event</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridItemType.AdultLandForSale">
-            <summary>Adult land for sale</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.AssetUploaderBlock">
+            <summary>Base class for Asset uploads/results via Capabilities</summary>
         </member>
-        <member name="T:OpenMetaverse.GridRegion">
+        <member name="F:OpenMetaverse.Messages.Linden.AssetUploaderBlock.State">
             <summary>
-            Information about a region on the grid map
+            The request state
             </summary>
         </member>
-        <member name="F:OpenMetaverse.GridRegion.X">
-            <summary>Sim X position on World Map</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridRegion.Y">
-            <summary>Sim Y position on World Map</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.AssetUploaderBlock.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.GridRegion.Name">
-            <summary>Sim Name (NOTE: In lowercase!)</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.AssetUploaderBlock.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.GridRegion.Access">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Messages.Linden.UploaderRequestUpload">
+            <summary>
+            A message sent from the viewer to the simulator to request a temporary upload capability
+            which allows an asset to be uploaded
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GridRegion.RegionFlags">
-            <summary>Appears to always be zero (None)</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.UploaderRequestUpload.Url">
+            <summary>The Capability URL sent by the simulator to upload the baked texture to</summary>
         </member>
-        <member name="F:OpenMetaverse.GridRegion.WaterHeight">
-            <summary>Sim's defined Water Height</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.UploaderRequestComplete">
+            <summary>
+            A message sent from the simulator that will inform the agent the upload is complete,
+            and the UUID of the uploaded asset
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GridRegion.Agents">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Messages.Linden.UploaderRequestComplete.AssetID">
+            <summary>The uploaded texture asset ID</summary>
         </member>
-        <member name="F:OpenMetaverse.GridRegion.MapImageID">
-            <summary>UUID of the World Map image</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.UploadBakedTextureMessage">
+            <summary>
+            A message sent from the viewer to the simulator to request a temporary
+            capability URI which is used to upload an agents baked appearance textures
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GridRegion.RegionHandle">
-            <summary>Unique identifier for this region, a combination of the X 
-            and Y position</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.UploadBakedTextureMessage.Request">
+            <summary>Object containing request or response</summary>
         </member>
-        <member name="M:OpenMetaverse.GridRegion.ToString">
+        <member name="M:OpenMetaverse.Messages.Linden.UploadBakedTextureMessage.Serialize">
             <summary>
-            
+            Serialize the object
             </summary>
-            <returns></returns>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.GridRegion.GetHashCode">
+        <member name="M:OpenMetaverse.Messages.Linden.UploadBakedTextureMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            
+            Deserialize the message
             </summary>
-            <returns></returns>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.GridRegion.Equals(System.Object)">
+        <member name="T:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage">
             <summary>
-            
+            A message sent from the simulator which indicates the minimum version required for
+            using voice chat
             </summary>
-            <param name="obj"></param>
-            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.GridLayer">
+        <member name="F:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.MajorVersion">
+            <summary>Major Version Required</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.MinorVersion">
+            <summary>Minor version required</summary>
+        </member>
+        <member name="F:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.RegionName">
+            <summary>The name of the region sending the version requrements</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.Serialize">
             <summary>
-            Visual chunk of the grid map
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.MapItem">
+        <member name="M:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Base class for Map Items
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.MapItem.GlobalX">
-            <summary>The Global X position of the item</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage">
+            <summary>
+            A message sent from the simulator to the viewer containing the
+            voice server URI
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.MapItem.GlobalY">
-            <summary>The Global Y position of the item</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.ParcelID">
+            <summary>The Parcel ID which the voice server URI applies</summary>
         </member>
-        <member name="P:OpenMetaverse.MapItem.LocalX">
-            <summary>Get the Local X position of the item</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.RegionName">
+            <summary>The name of the region</summary>
         </member>
-        <member name="P:OpenMetaverse.MapItem.LocalY">
-            <summary>Get the Local Y position of the item</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.SipChannelUri">
+            <summary>A uri containing the server/channel information
+            which the viewer can utilize to participate in voice conversations</summary>
         </member>
-        <member name="P:OpenMetaverse.MapItem.RegionHandle">
-            <summary>Get the Handle of the region</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.MapAgentLocation">
+        <member name="M:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Represents an agent or group of agents location
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.MapTelehub">
+        <member name="T:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage">
             <summary>
-            Represents a Telehub location
             </summary>
         </member>
-        <member name="T:OpenMetaverse.MapLandForSale">
+        <member name="F:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage.Password">
             <summary>
-            Represents a non-adult parcel of land for sale
             </summary>
         </member>
-        <member name="T:OpenMetaverse.MapAdultLandForSale">
+        <member name="F:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage.Username">
             <summary>
-            Represents an Adult parcel of land for sale
             </summary>
         </member>
-        <member name="T:OpenMetaverse.MapPGEvent">
+        <member name="M:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage.Serialize">
             <summary>
-            Represents a PG Event
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.MapMatureEvent">
+        <member name="M:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Represents a Mature event
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.MapAdultEvent">
+        <member name="T:OpenMetaverse.Messages.Linden.UploadScriptTaskMessage">
             <summary>
-            Represents an Adult event
+            A message sent by the viewer to the simulator to request a temporary
+            capability for a script contained with in a Tasks inventory to be updated
             </summary>
         </member>
-        <member name="T:OpenMetaverse.GridManager">
+        <member name="F:OpenMetaverse.Messages.Linden.UploadScriptTaskMessage.Request">
+            <summary>Object containing request or response</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.UploadScriptTaskMessage.Serialize">
             <summary>
-            Manages grid-wide tasks such as the world map
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_CoarseLocationUpdate">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.UploadScriptTaskMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.GridManager.OnCoarseLocationUpdate(OpenMetaverse.CoarseLocationUpdateEventArgs)">
-            <summary>Raises the CoarseLocationUpdate event</summary>
-            <param name="e">A CoarseLocationUpdateEventArgs object containing the
-            data sent by simulator</param>
+        <member name="T:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage">
+            <summary>
+            A message sent from the simulator to the viewer to indicate
+            a Tasks scripts status.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_CoarseLocationUpdateLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.ItemID">
+            <summary>The Asset ID of the script</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_GridRegion">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.Mono">
+            <summary>True of the script is compiled/ran using the mono interpreter, false indicates it
+            uses the older less efficient lsl2 interprter</summary>
         </member>
-        <member name="M:OpenMetaverse.GridManager.OnGridRegion(OpenMetaverse.GridRegionEventArgs)">
-            <summary>Raises the GridRegion event</summary>
-            <param name="e">A GridRegionEventArgs object containing the
-            data sent by simulator</param>
+        <member name="F:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.ObjectID">
+            <summary>The Task containing the scripts <seealso cref="T:OpenMetaverse.UUID" /></summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_GridRegionLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.Running">
+            <summary>true of the script is in a running state</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_GridLayer">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.GridManager.OnGridLayer(OpenMetaverse.GridLayerEventArgs)">
-            <summary>Raises the GridLayer event</summary>
-            <param name="e">A GridLayerEventArgs object containing the
-            data sent by simulator</param>
+        <member name="M:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_GridLayerLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateGestureAgentInventoryMessage">
+            <summary>
+            A message containing the request/response used for updating a gesture
+            contained with an agents inventory
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_GridItems">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateGestureAgentInventoryMessage.Request">
+            <summary>Object containing request or response</summary>
         </member>
-        <member name="M:OpenMetaverse.GridManager.OnGridItems(OpenMetaverse.GridItemsEventArgs)">
-            <summary>Raises the GridItems event</summary>
-            <param name="e">A GridItemEventArgs object containing the
-            data sent by simulator</param>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateGestureAgentInventoryMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_GridItemsLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateGestureAgentInventoryMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_RegionHandleReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage">
+            <summary>
+            A message request/response which is used to update a notecard contained within
+            a tasks inventory
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.GridManager.OnRegionHandleReply(OpenMetaverse.RegionHandleReplyEventArgs)">
-            <summary>Raises the RegionHandleReply event</summary>
-            <param name="e">A RegionHandleReplyEventArgs object containing the
-            data sent by simulator</param>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage.TaskID">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID" /> of the Task containing the notecard asset to update</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_RegionHandleReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage.ItemID">
+            <summary>The notecard assets <seealso cref="T:OpenMetaverse.UUID" /> contained in the tasks inventory</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.Regions">
-            <summary>A dictionary of all the regions, indexed by region name</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.GridManager.RegionsByHandle">
-            <summary>A dictionary of all the regions, indexed by region handle</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.GridManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateAgentInventoryRequestMessage">
             <summary>
-            Constructor
+            A reusable class containing a message sent from the viewer to the simulator to request a temporary uploader capability
+            which is used to update an asset in an agents inventory
             </summary>
-            <param name="client">Instance of GridClient object to associate with this GridManager instance</param>
         </member>
-        <member name="M:OpenMetaverse.GridManager.RequestMapLayer(OpenMetaverse.GridLayerType)">
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateAgentInventoryRequestMessage.ItemID">
             <summary>
-            
+            The Notecard AssetID to replace
             </summary>
-            <param name="layer"></param>
         </member>
-        <member name="M:OpenMetaverse.GridManager.RequestMapRegion(System.String,OpenMetaverse.GridLayerType)">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentInventoryRequestMessage.Serialize">
             <summary>
-            Request a map layer
+            Serialize the object
             </summary>
-            <param name="regionName">The name of the region</param>
-            <param name="layer">The type of layer</param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.GridManager.RequestMapBlocks(OpenMetaverse.GridLayerType,System.UInt16,System.UInt16,System.UInt16,System.UInt16,System.Boolean)">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentInventoryRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            
+            Deserialize the message
             </summary>
-            <param name="layer"></param>
-            <param name="minX"></param>
-            <param name="minY"></param>
-            <param name="maxX"></param>
-            <param name="maxY"></param>
-            <param name="returnNonExistent"></param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.GridManager.MapItems(System.UInt64,OpenMetaverse.GridItemType,OpenMetaverse.GridLayerType,System.Int32)">
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateNotecardAgentInventoryMessage">
             <summary>
-            
+            A message containing the request/response used for updating a notecard
+            contained with an agents inventory
             </summary>
-            <param name="regionHandle"></param>
-            <param name="item"></param>
-            <param name="layer"></param>
-            <param name="timeoutMS"></param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.GridManager.RequestMapItems(System.UInt64,OpenMetaverse.GridItemType,OpenMetaverse.GridLayerType)">
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateNotecardAgentInventoryMessage.Request">
+            <summary>Object containing request or response</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateNotecardAgentInventoryMessage.Serialize">
             <summary>
-            
+            Serialize the object
             </summary>
-            <param name="regionHandle"></param>
-            <param name="item"></param>
-            <param name="layer"></param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.GridManager.RequestMainlandSims(OpenMetaverse.GridLayerType)">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateNotecardAgentInventoryMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Request data for all mainland (Linden managed) simulators
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.GridManager.RequestRegionHandle(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Messages.Linden.CopyInventoryFromNotecardMessage.Serialize">
             <summary>
-            Request the region handle for the specified region UUID
+            Serialize the object
             </summary>
-            <param name="regionID">UUID of the region to look up</param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.GridManager.GetGridRegion(System.String,OpenMetaverse.GridLayerType,OpenMetaverse.GridRegion@)">
+        <member name="M:OpenMetaverse.Messages.Linden.CopyInventoryFromNotecardMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Get grid region information using the region name, this function
-            will block until it can find the region or gives up
+            Deserialize the message
             </summary>
-            <param name="name">Name of sim you're looking for</param>
-            <param name="layer">Layer that you are requesting</param>
-            <param name="region">Will contain a GridRegion for the sim you're
-            looking for if successful, otherwise an empty structure</param>
-            <returns>True if the GridRegion was successfully fetched, otherwise
-            false</returns>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.GridManager.MapBlockReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="T:OpenMetaverse.Messages.Linden.UploaderScriptRequestError">
+            <summary>
+            A message sent from the simulator to the viewer which indicates
+            an error occurred while attempting to update a script in an agents or tasks
+            inventory
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.GridManager.MapItemReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.Messages.Linden.UploaderScriptRequestError.Compiled">
+            <summary>true of the script was successfully compiled by the simulator</summary>
         </member>
-        <member name="M:OpenMetaverse.GridManager.SimulatorViewerTimeMessageHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.Messages.Linden.UploaderScriptRequestError.Error">
+            <summary>A string containing the error which occured while trying
+            to update the script</summary>
         </member>
-        <member name="M:OpenMetaverse.GridManager.CoarseLocationHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.Messages.Linden.UploaderScriptRequestError.AssetID">
+            <summary>A new AssetID assigned to the script</summary>
         </member>
-        <member name="M:OpenMetaverse.GridManager.RegionHandleReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage">
+            <summary>
+            A message sent from the viewer to the simulator
+            requesting the update of an existing script contained
+            within a tasks inventory
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.GridManager.CoarseLocationUpdate">
-            <summary>Raised when the simulator sends a <see cref="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket"/> 
-            containing the location of agents in the simulator</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.ScriptRunning">
+            <summary>if true, set the script mode to running</summary>
         </member>
-        <member name="E:OpenMetaverse.GridManager.GridRegion">
-            <summary>Raised when the simulator sends a Region Data in response to 
-            a Map request</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.ItemID">
+            <summary>The scripts InventoryItem ItemID to update</summary>
         </member>
-        <member name="E:OpenMetaverse.GridManager.GridLayer">
-            <summary>Raised when the simulator sends GridLayer object containing
-            a map tile coordinates and texture information</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.Target">
+            <summary>A lowercase string containing either "mono" or "lsl2" which
+            specifies the script is compiled and ran on the mono runtime, or the older
+            lsl runtime</summary>
         </member>
-        <member name="E:OpenMetaverse.GridManager.GridItems">
-            <summary>Raised when the simulator sends GridItems object containing
-            details on events, land sales at a specific location</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.TaskID">
+            <summary>The tasks <see cref="T:OpenMetaverse.UUID" /> which contains the script to update</summary>
         </member>
-        <member name="E:OpenMetaverse.GridManager.RegionHandleReply">
-            <summary>Raised in response to a Region lookup</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="P:OpenMetaverse.GridManager.SunPhase">
-            <summary>Unknown</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="P:OpenMetaverse.GridManager.SunDirection">
-            <summary>Current direction of the sun</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage">
+            <summary>
+            A message containing either the request or response used in updating a script inside
+            a tasks inventory
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.GridManager.SunAngVelocity">
-            <summary>Current angular velocity of the sun</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage.Request">
+            <summary>Object containing request or response</summary>
         </member>
-        <member name="P:OpenMetaverse.GridManager.WorldTime">
-            <summary>Current world time</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.LoginStatus">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.Failed">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Messages.Linden.UploaderRequestScriptComplete">
+            <summary>
+            Response from the simulator to notify the viewer the upload is completed, and
+            the UUID of the script asset and its compiled status
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.None">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Messages.Linden.UploaderRequestScriptComplete.AssetID">
+            <summary>The uploaded texture asset ID</summary>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.ConnectingToLogin">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Messages.Linden.UploaderRequestScriptComplete.Compiled">
+            <summary>true of the script was compiled successfully</summary>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.ReadingResponse">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage">
+            <summary>
+            A message sent from a viewer to the simulator requesting a temporary uploader capability
+            used to update a script contained in an agents inventory
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.ConnectingToSim">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage.ItemID">
+            <summary>The existing asset if of the script in the agents inventory to replace</summary>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.Redirecting">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage.Target">
+            <summary>The language of the script</summary>
+            <remarks>Defaults to lsl version 2, "mono" might be another possible option</remarks>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.Success">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.LoginParams">
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Login Request Parameters
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.URI">
-            <summary>The URL of the Login Server</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.UpdateScriptAgentMessage">
+            <summary>
+            A message containing either the request or response used in updating a script inside
+            an agents inventory
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.Timeout">
-            <summary>The number of milliseconds to wait before a login is considered
-            failed due to timeout</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptAgentMessage.Request">
+            <summary>Object containing request or response</summary>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.MethodName">
-            <summary>The request method</summary>
-            <remarks>login_to_simulator is currently the only supported method</remarks>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptAgentMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.FirstName">
-            <summary>The Agents First name</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptAgentMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.LastName">
-            <summary>The Agents Last name</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.SendPostcardMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.Password">
-            <summary>A md5 hashed password</summary>
-            <remarks>plaintext password will be automatically hashed</remarks>
+        <member name="M:OpenMetaverse.Messages.Linden.SendPostcardMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.Start">
-            <summary>The agents starting location once logged in</summary>
-            <remarks>Either "last", "home", or a string encoded URI 
-            containing the simulator name and x/y/z coordinates e.g: uri:hooper&amp;128&amp;152&amp;17</remarks>
+        <member name="T:OpenMetaverse.Messages.Linden.MapLayerMessageBase">
+            <summary>Base class for Map Layers via Capabilities</summary>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.Channel">
-            <summary>A string containing the client software channel information</summary>
-            <example>Second Life Release</example>
+        <member name="F:OpenMetaverse.Messages.Linden.MapLayerMessageBase.Flags">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.Version">
-            <summary>The client software version information</summary>
-            <remarks>The official viewer uses: Second Life Release n.n.n.n 
-            where n is replaced with the current version of the viewer</remarks>
+        <member name="M:OpenMetaverse.Messages.Linden.MapLayerMessageBase.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.Platform">
-            <summary>A string containing the platform information the agent is running on</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.MapLayerMessageBase.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.MAC">
-            <summary>A string hash of the network cards Mac Address</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.MapLayerRequestVariant">
+            <summary>
+            Sent by an agent to the capabilities server to request map layers
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.ViewerDigest">
-            <summary>Unknown or deprecated</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.MapLayerReplyVariant">
+            <summary>
+            A message sent from the simulator to the viewer which contains an array of map images and their grid coordinates
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.ID0">
-            <summary>A string hash of the first disk drives ID used to identify this clients uniqueness</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData">
+            <summary>
+            An object containing map location details
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.UserAgent">
-            <summary>A string containing the viewers Software, this is not directly sent to the login server but 
-            instead is used to generate the Version string</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.ImageID">
+            <summary>The Asset ID of the regions tile overlay</summary>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.Author">
-            <summary>A string representing the software creator. This is not directly sent to the login server but
-            is used by the library to generate the Version information</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.Bottom">
+            <summary>The grid location of the southern border of the map tile</summary>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.AgreeToTos">
-            <summary>If true, this agent agrees to the Terms of Service of the grid its connecting to</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.Left">
+            <summary>The grid location of the western border of the map tile</summary>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.ReadCritical">
-            <summary>Unknown</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.Right">
+            <summary>The grid location of the eastern border of the map tile</summary>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.Options">
-            <summary>An array of string sent to the login server to enable various options</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerData.Top">
+            <summary>The grid location of the northern border of the map tile</summary>
         </member>
-        <member name="F:OpenMetaverse.LoginParams.LoginID">
-            <summary>A randomly generated ID to distinguish between login attempts. This value is only used
-            internally in the library and is never sent over the wire</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.LayerDataBlocks">
+            <summary>An array containing LayerData items</summary>
         </member>
-        <member name="M:OpenMetaverse.LoginParams.#ctor">
+        <member name="M:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.Serialize">
             <summary>
-            Default constuctor, initializes sane default values
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.LoginParams.#ctor(OpenMetaverse.GridClient,System.String,System.String,System.String,System.String,System.String)">
+        <member name="M:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Instantiates new LoginParams object and fills in the values
+            Deserialize the message
             </summary>
-            <param name="client">Instance of GridClient to read settings from</param>
-            <param name="firstName">Login first name</param>
-            <param name="lastName">Login last name</param>
-            <param name="password">Password</param>
-            <param name="channel">Login channnel (application name)</param>
-            <param name="version">Client version, should be application name + version number</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.LoginParams.#ctor(OpenMetaverse.GridClient,System.String,System.String,System.String,System.String,System.String,System.String)">
+        <member name="F:OpenMetaverse.Messages.Linden.MapLayerMessage.Request">
+            <summary>Object containing request or response</summary>
+        </member>
+        <member name="M:OpenMetaverse.Messages.Linden.MapLayerMessage.Serialize">
             <summary>
-            Instantiates new LoginParams object and fills in the values
+            Serialize the object
             </summary>
-            <param name="client">Instance of GridClient to read settings from</param>
-            <param name="firstName">Login first name</param>
-            <param name="lastName">Login last name</param>
-            <param name="password">Password</param>
-            <param name="channel">Login channnel (application name)</param>
-            <param name="version">Client version, should be application name + version number</param>
-            <param name="loginURI">URI of the login server</param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.LoginResponseData">
+        <member name="M:OpenMetaverse.Messages.Linden.MapLayerMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            The decoded data returned from the login server after a successful login
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.LoginResponseData.Login">
-            <summary>true, false, indeterminate</summary>
-        </member>
-        <member name="F:OpenMetaverse.LoginResponseData.Message">
-            <summary>Login message of the day</summary>
-        </member>
-        <member name="F:OpenMetaverse.LoginResponseData.AgentAccess">
-            <summary>M or PG, also agent_region_access and agent_access_max</summary>
-        </member>
-        <member name="M:OpenMetaverse.LoginResponseData.Parse(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="T:OpenMetaverse.Messages.Linden.ProductInfoRequestMessage">
             <summary>
-            Parse LLSD Login Reply Data
+            New as of 1.23 RC1, no details yet.
             </summary>
-            <param name="reply">An <seealso cref="T:OpenMetaverse.StructuredData.OSDMap"/> 
-            contaning the login response data</param>
-            <remarks>XML-RPC logins do not require this as XML-RPC.NET 
-            automatically populates the struct properly using attributes</remarks>
         </member>
-        <member name="T:OpenMetaverse.StatusCode">
+        <member name="M:OpenMetaverse.Messages.Linden.ProductInfoRequestMessage.Serialize">
             <summary>
-            
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.StatusCode.OK">
-            <summary>OK</summary>
-        </member>
-        <member name="F:OpenMetaverse.StatusCode.Done">
-            <summary>Transfer completed</summary>
-        </member>
-        <member name="F:OpenMetaverse.StatusCode.Skip">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.StatusCode.Abort">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.StatusCode.Error">
-            <summary>Unknown error occurred</summary>
-        </member>
-        <member name="F:OpenMetaverse.StatusCode.UnknownSource">
-            <summary>Equivalent to a 404 error</summary>
-        </member>
-        <member name="F:OpenMetaverse.StatusCode.InsufficientPermissions">
-            <summary>Client does not have permission for that resource</summary>
-        </member>
-        <member name="F:OpenMetaverse.StatusCode.Unknown">
-            <summary>Unknown status</summary>
-        </member>
-        <member name="T:OpenMetaverse.ChannelType">
+        <member name="M:OpenMetaverse.Messages.Linden.ProductInfoRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.ChannelType.Unknown">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Messages.Linden.SearchStatRequestMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.ChannelType.Misc">
-            <summary>Unknown</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.SearchStatRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.ChannelType.Asset">
-            <summary>Virtually all asset transfers use this channel</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestBlock.Method">
+            <summary>A string containing the method used</summary>
         </member>
-        <member name="T:OpenMetaverse.SourceType">
+        <member name="T:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference">
             <summary>
-            
+            A request sent from an agent to the Simulator to begin a new conference.
+            Contains a list of Agents which will be included in the conference
             </summary>
         </member>
-        <member name="F:OpenMetaverse.SourceType.Unknown">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference.AgentsBlock">
+            <summary>An array containing the <see cref="T:OpenMetaverse.UUID" /> of the agents invited to this conference</summary>
         </member>
-        <member name="F:OpenMetaverse.SourceType.Asset">
-            <summary>Asset from the asset server</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference.SessionID">
+            <summary>The conferences Session ID</summary>
         </member>
-        <member name="F:OpenMetaverse.SourceType.SimInventoryItem">
-            <summary>Inventory item</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.SourceType.SimEstate">
-            <summary>Estate asset, such as an estate covenant</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestStartConference.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.TargetType">
+        <member name="T:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate">
             <summary>
-            
+            A moderation request sent from a conference moderator
+            Contains an agent and an optional action to take
             </summary>
         </member>
-        <member name="F:OpenMetaverse.TargetType.Unknown">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.SessionID">
+            <summary>The Session ID</summary>
         </member>
-        <member name="F:OpenMetaverse.TargetType.File">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.AgentID">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.TargetType.VFile">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.RequestKey">
+            <summary>A list containing Key/Value pairs, known valid values:
+            key: text value: true/false - allow/disallow specified agents ability to use text in session
+            key: voice value: true/false - allow/disallow specified agents ability to use voice in session
+            </summary>
+            <remarks>"text" or "voice"</remarks>
         </member>
-        <member name="T:OpenMetaverse.ImageType">
+        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.RequestValue">
             <summary>
-            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ImageType.Normal">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.ImageType.Baked">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.ImageCodec">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Image file format
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.Transfer">
+        <member name="T:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation">
             <summary>
-            
+            A message sent from the agent to the simulator which tells the
+            simulator we've accepted a conference invitation
             </summary>
         </member>
-        <member name="P:OpenMetaverse.Transfer.TimeSinceLastPacket">
-            <summary>Number of milliseconds passed since the last transfer
-            packet was received</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation.SessionID">
+            <summary>The conference SessionID</summary>
         </member>
-        <member name="T:OpenMetaverse.AssetDownload">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation.Serialize">
             <summary>
-            
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.XferDownload">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.ImageDownload">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestMessage.Serialize">
             <summary>
-            
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.AssetUpload">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatSessionRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            
+            Deserialize the message
             </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.ImageRequest">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatterboxSessionEventReplyMessage.Serialize">
             <summary>
-            
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.ImageRequest.#ctor(OpenMetaverse.UUID,OpenMetaverse.ImageType,System.Single,System.Int32)">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatterboxSessionEventReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            
+            Deserialize the message
             </summary>
-            <param name="imageid"></param>
-            <param name="type"></param>
-            <param name="priority"></param>
-            <param name="discardLevel"></param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.AssetManager">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxSessionStartReplyMessage.Serialize">
             <summary>
-            
+            Serialize the object
             </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.TRANSFER_HEADER_TIMEOUT">
-            <summary>Number of milliseconds to wait for a transfer header packet if out of order data was received</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxSessionStartReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_XferReceivedEvent">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.FromAgentID">
+            <summary>Key of sender</summary>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.OnXferReceived(OpenMetaverse.XferReceivedEventArgs)">
-            <summary>Raises the XferReceived event</summary>
-            <param name="e">A XferReceivedEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.FromAgentName">
+            <summary>Name of sender</summary>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_XferReceivedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.ToAgentID">
+            <summary>Key of destination avatar</summary>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_AssetUploadedEvent">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.ParentEstateID">
+            <summary>ID of originating estate</summary>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.OnAssetUploaded(OpenMetaverse.AssetUploadEventArgs)">
-            <summary>Raises the AssetUploaded event</summary>
-            <param name="e">A AssetUploadedEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.RegionID">
+            <summary>Key of originating region</summary>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_AssetUploadedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Position">
+            <summary>Coordinates in originating region</summary>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_UploadProgressEvent">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Dialog">
+            <summary>Instant message type</summary>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.OnUploadProgress(OpenMetaverse.AssetUploadEventArgs)">
-            <summary>Raises the UploadProgress event</summary>
-            <param name="e">A UploadProgressEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.GroupIM">
+            <summary>Group IM session toggle</summary>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_UploadProgressLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.IMSessionID">
+            <summary>Key of IM session, for Group Messages, the groups UUID</summary>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_InitiateDownloadEvent">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Timestamp">
+            <summary>Timestamp of the instant message</summary>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.OnInitiateDownload(OpenMetaverse.InitiateDownloadEventArgs)">
-            <summary>Raises the InitiateDownload event</summary>
-            <param name="e">A InitiateDownloadEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Message">
+            <summary>Instant message text</summary>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_InitiateDownloadLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Offline">
+            <summary>Whether this message is held for offline avatars</summary>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_ImageReceiveProgressEvent">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.BinaryBucket">
+            <summary>Context specific packed data</summary>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.OnImageReceiveProgress(OpenMetaverse.ImageReceiveProgressEventArgs)">
-            <summary>Raises the ImageReceiveProgress event</summary>
-            <param name="e">A ImageReceiveProgressEventArgs object containing the
-            data returned from the simulator</param>
+        <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Voice">
+            <summary>Is this invitation for voice group/conference chat</summary>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_ImageReceiveProgressLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.Cache">
-            <summary>Texture download cache</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="T:OpenMetaverse.Messages.Linden.ChatterBoxSessionAgentListUpdatesMessage">
             <summary>
-            Default constructor
+            Sent from the simulator to the viewer.
+            When an agent initially joins a session the AgentUpdatesBlock object will contain a list of session members including
+            a boolean indicating they can use voice chat in this session, a boolean indicating they are allowed to moderate
+            this session, and lastly a string which indicates another agent is entering the session with the Transition set to "ENTER"
+            During the session lifetime updates on individuals are sent. During the update the booleans sent during the initial join are
+            excluded with the exception of the Transition field. This indicates a new user entering or exiting the session with
+            the string "ENTER" or "LEAVE" respectively.
             </summary>
-            <param name="client">A reference to the GridClient object</param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestAsset(OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.AssetManager.AssetReceivedCallback)">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxSessionAgentListUpdatesMessage.Serialize">
             <summary>
-            Request an asset download
+            Serialize the object
             </summary>
-            <param name="assetID">Asset UUID</param>
-            <param name="type">Asset type, must be correct for the transfer to succeed</param>
-            <param name="priority">Whether to give this transfer an elevated priority</param>
-            <param name="callback">The callback to fire when the simulator responds with the asset data</param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestAsset(OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.SourceType,OpenMetaverse.AssetManager.AssetReceivedCallback)">
+        <member name="M:OpenMetaverse.Messages.Linden.ChatterBoxSessionAgentListUpdatesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Request an asset download
+            Deserialize the message
             </summary>
-            <param name="assetID">Asset UUID</param>
-            <param name="type">Asset type, must be correct for the transfer to succeed</param>
-            <param name="priority">Whether to give this transfer an elevated priority</param>
-            <param name="sourceType">Source location of the requested asset</param>
-            <param name="callback">The callback to fire when the simulator responds with the asset data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestAsset(OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.SourceType,OpenMetaverse.UUID,OpenMetaverse.AssetManager.AssetReceivedCallback)">
+        <member name="T:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage">
             <summary>
-            Request an asset download
+            An EventQueue message sent when the agent is forcibly removed from a chatterbox session
             </summary>
-            <param name="assetID">Asset UUID</param>
-            <param name="type">Asset type, must be correct for the transfer to succeed</param>
-            <param name="priority">Whether to give this transfer an elevated priority</param>
-            <param name="sourceType">Source location of the requested asset</param>
-            <param name="transactionID">UUID of the transaction</param>
-            <param name="callback">The callback to fire when the simulator responds with the asset data</param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestAssetXfer(System.String,System.Boolean,System.Boolean,OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean)">
+        <member name="F:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage.Reason">
             <summary>
-            Request an asset download through the almost deprecated Xfer system
+            A string containing the reason the agent was removed
             </summary>
-            <param name="filename">Filename of the asset to request</param>
-            <param name="deleteOnCompletion">Whether or not to delete the asset
-            off the server after it is retrieved</param>
-            <param name="useBigPackets">Use large transfer packets or not</param>
-            <param name="vFileID">UUID of the file to request, if filename is
-            left empty</param>
-            <param name="vFileType">Asset type of <code>vFileID</code>, or
-            <code>AssetType.Unknown</code> if filename is not empty</param>
-            <param name="fromCache">Sets the FilePath in the request to Cache
-            (4) if true, otherwise Unknown (0) is used</param>
-            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestInventoryAsset(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.AssetManager.AssetReceivedCallback)">
+        <member name="F:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage.SessionID">
             <summary>
-            
+            The ChatterBoxSession's SessionID
             </summary>
-            <param name="assetID">Use UUID.Zero if you do not have the 
-            asset ID but have all the necessary permissions</param>
-            <param name="itemID">The item ID of this asset in the inventory</param>
-            <param name="taskID">Use UUID.Zero if you are not requesting an 
-            asset from an object inventory</param>
-            <param name="ownerID">The owner of this asset</param>
-            <param name="type">Asset type</param>
-            <param name="priority">Whether to prioritize this asset download or not</param>
-            <param name="callback"></param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.SetPendingAssetUploadData(OpenMetaverse.AssetUpload)">
+        <member name="M:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage.Serialize">
             <summary>
-            Used to force asset data into the PendingUpload property, ie: for raw terrain uploads
+            Serialize the object
             </summary>
-            <param name="assetData">An AssetUpload object containing the data to upload to the simulator</param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.Assets.Asset,System.Boolean)">
+        <member name="M:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Request an asset be uploaded to the simulator
+            Deserialize the message
             </summary>
-            <param name="asset">The <seealso cref="T:OpenMetaverse.Assets.Asset"/> Object containing the asset data</param>
-            <param name="storeLocal">If True, the asset once uploaded will be stored on the simulator
-            in which the client was connected in addition to being stored on the asset server</param>
-            <returns>The <seealso cref="T:OpenMetaverse.UUID"/> of the transfer, can be used to correlate the upload with
-            events being fired</returns>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.AssetType,System.Byte[],System.Boolean)">
+        <member name="M:OpenMetaverse.Messages.Linden.EventQueueAck.Serialize">
             <summary>
-            Request an asset be uploaded to the simulator
+            Serialize the object
             </summary>
-            <param name="type">The <seealso cref="T:OpenMetaverse.AssetType"/> of the asset being uploaded</param>
-            <param name="data">A byte array containing the encoded asset data</param>
-            <param name="storeLocal">If True, the asset once uploaded will be stored on the simulator
-            in which the client was connected in addition to being stored on the asset server</param>
-            <returns>The <seealso cref="T:OpenMetaverse.UUID"/> of the transfer, can be used to correlate the upload with
-            events being fired</returns>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.UUID@,OpenMetaverse.AssetType,System.Byte[],System.Boolean)">
+        <member name="M:OpenMetaverse.Messages.Linden.EventQueueAck.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Request an asset be uploaded to the simulator
+            Deserialize the message
             </summary>
-            <param name="assetID"></param>
-            <param name="type">Asset type to upload this data as</param>
-            <param name="data">A byte array containing the encoded asset data</param>
-            <param name="storeLocal">If True, the asset once uploaded will be stored on the simulator
-            in which the client was connected in addition to being stored on the asset server</param>
-            <returns>The <seealso cref="T:OpenMetaverse.UUID"/> of the transfer, can be used to correlate the upload with
-            events being fired</returns>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.UUID@,OpenMetaverse.AssetType,System.Byte[],System.Boolean,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Messages.Linden.EventQueueEvent.Serialize">
             <summary>
-            Initiate an asset upload
+            Serialize the object
             </summary>
-            <param name="assetID">The ID this asset will have if the
-            upload succeeds</param>
-            <param name="type">Asset type to upload this data as</param>
-            <param name="data">Raw asset data to upload</param>
-            <param name="storeLocal">Whether to store this asset on the local
-            simulator or the grid-wide asset server</param>
-            <param name="transactionID">The tranaction id for the upload <see cref="!:RequestCreateItem"/></param>
-            <returns>The transaction ID of this transfer</returns>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.ImageType,System.Single,System.Int32,System.UInt32,OpenMetaverse.TextureDownloadCallback,System.Boolean)">
-             <summary>
-             Request a texture asset from the simulator using the <see cref="T:OpenMetaverse.TexturePipeline"/> system to 
-             manage the requests and re-assemble the image from the packets received from the simulator
-             </summary>
-             <param name="textureID">The <see cref="T:OpenMetaverse.UUID"/> of the texture asset to download</param>
-             <param name="imageType">The <see cref="T:OpenMetaverse.ImageType"/> of the texture asset. 
-             Use <see cref="F:OpenMetaverse.ImageType.Normal"/> for most textures, or <see cref="F:OpenMetaverse.ImageType.Baked"/> for baked layer texture assets</param>
-             <param name="priority">A float indicating the requested priority for the transfer. Higher priority values tell the simulator
-             to prioritize the request before lower valued requests. An image already being transferred using the <see cref="T:OpenMetaverse.TexturePipeline"/> can have
-             its priority changed by resending the request with the new priority value</param>
-             <param name="discardLevel">Number of quality layers to discard.
-             This controls the end marker of the data sent. Sending with value -1 combined with priority of 0 cancels an in-progress
-             transfer.</param>
-             <remarks>A bug exists in the Linden Simulator where a -1 will occasionally be sent with a non-zero priority
-             indicating an off-by-one error.</remarks>
-             <param name="packetStart">The packet number to begin the request at. A value of 0 begins the request
-             from the start of the asset texture</param>
-             <param name="callback">The <see cref="T:OpenMetaverse.TextureDownloadCallback"/> callback to fire when the image is retrieved. The callback
-             will contain the result of the request and the texture asset data</param>
-             <param name="progress">If true, the callback will be fired for each chunk of the downloaded image. 
-             The callback asset parameter will contain all previously received chunks of the texture asset starting 
-             from the beginning of the request</param>
-             <example>
-             Request an image and fire a callback when the request is complete
-             <code>
-             Client.Assets.RequestImage(UUID.Parse("c307629f-e3a1-4487-5e88-0d96ac9d4965"), ImageType.Normal, TextureDownloader_OnDownloadFinished);
-             
-             private void TextureDownloader_OnDownloadFinished(TextureRequestState state, AssetTexture asset)
-             {
-                 if(state == TextureRequestState.Finished)
-                 {
-                   Console.WriteLine("Texture {0} ({1} bytes) has been successfully downloaded", 
-                     asset.AssetID,
-                     asset.AssetData.Length); 
-                 }
-             }
-             </code>
-             Request an image and use an inline anonymous method to handle the downloaded texture data
-             <code>
-             Client.Assets.RequestImage(UUID.Parse("c307629f-e3a1-4487-5e88-0d96ac9d4965"), ImageType.Normal, delegate(TextureRequestState state, AssetTexture asset) 
-                                                     {
-                                                         if(state == TextureRequestState.Finished)
-                                                         {
-                                                             Console.WriteLine("Texture {0} ({1} bytes) has been successfully downloaded", 
-                                                             asset.AssetID,
-                                                             asset.AssetData.Length); 
-                                                         }
-                                                     }
-             );
-             </code>
-             Request a texture, decode the texture to a bitmap image and apply it to a imagebox 
-             <code>
-             Client.Assets.RequestImage(UUID.Parse("c307629f-e3a1-4487-5e88-0d96ac9d4965"), ImageType.Normal, TextureDownloader_OnDownloadFinished);
-             
-             private void TextureDownloader_OnDownloadFinished(TextureRequestState state, AssetTexture asset)
-             {
-                 if(state == TextureRequestState.Finished)
-                 {
-                     ManagedImage imgData;
-                     Image bitmap;
-            
-                     if (state == TextureRequestState.Finished)
-                     {
-                         OpenJPEG.DecodeToImage(assetTexture.AssetData, out imgData, out bitmap);
-                         picInsignia.Image = bitmap;
-                     }               
-                 }
-             }
-             </code>
-             </example>
+        <member name="M:OpenMetaverse.Messages.Linden.EventQueueEvent.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.TextureDownloadCallback)">
+        <member name="M:OpenMetaverse.Messages.Linden.EventQueueGetMessage.Serialize">
             <summary>
-            Overload: Request a texture asset from the simulator using the <see cref="T:OpenMetaverse.TexturePipeline"/> system to 
-            manage the requests and re-assemble the image from the packets received from the simulator
+            Serialize the object
             </summary>
-            <param name="textureID">The <see cref="T:OpenMetaverse.UUID"/> of the texture asset to download</param>
-            <param name="callback">The <see cref="T:OpenMetaverse.TextureDownloadCallback"/> callback to fire when the image is retrieved. The callback
-            will contain the result of the request and the texture asset data</param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.ImageType,OpenMetaverse.TextureDownloadCallback)">
+        <member name="M:OpenMetaverse.Messages.Linden.EventQueueGetMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Overload: Request a texture asset from the simulator using the <see cref="T:OpenMetaverse.TexturePipeline"/> system to 
-            manage the requests and re-assemble the image from the packets received from the simulator
+            Deserialize the message
             </summary>
-            <param name="textureID">The <see cref="T:OpenMetaverse.UUID"/> of the texture asset to download</param>
-            <param name="imageType">The <see cref="T:OpenMetaverse.ImageType"/> of the texture asset. 
-            Use <see cref="F:OpenMetaverse.ImageType.Normal"/> for most textures, or <see cref="F:OpenMetaverse.ImageType.Baked"/> for baked layer texture assets</param>
-            <param name="callback">The <see cref="T:OpenMetaverse.TextureDownloadCallback"/> callback to fire when the image is retrieved. The callback
-            will contain the result of the request and the texture asset data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.ImageType,OpenMetaverse.TextureDownloadCallback,System.Boolean)">
+        <member name="M:OpenMetaverse.Messages.Linden.ViewerStatsMessage.Serialize">
             <summary>
-            Overload: Request a texture asset from the simulator using the <see cref="T:OpenMetaverse.TexturePipeline"/> system to 
-            manage the requests and re-assemble the image from the packets received from the simulator
+            Serialize the object
             </summary>
-            <param name="textureID">The <see cref="T:OpenMetaverse.UUID"/> of the texture asset to download</param>
-            <param name="imageType">The <see cref="T:OpenMetaverse.ImageType"/> of the texture asset. 
-            Use <see cref="F:OpenMetaverse.ImageType.Normal"/> for most textures, or <see cref="F:OpenMetaverse.ImageType.Baked"/> for baked layer texture assets</param>
-            <param name="callback">The <see cref="T:OpenMetaverse.TextureDownloadCallback"/> callback to fire when the image is retrieved. The callback
-            will contain the result of the request and the texture asset data</param>
-            <param name="progress">If true, the callback will be fired for each chunk of the downloaded image. 
-            The callback asset parameter will contain all previously received chunks of the texture asset starting 
-            from the beginning of the request</param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestImageCancel(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Messages.Linden.ViewerStatsMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Cancel a texture request
+            Deserialize the message
             </summary>
-            <param name="textureID">The texture assets <see cref="T:OpenMetaverse.UUID"/></param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestMesh(OpenMetaverse.UUID,OpenMetaverse.AssetManager.MeshDownloadCallback)">
+        <member name="T:OpenMetaverse.Messages.Linden.PlacesReplyMessage">
             <summary>
-            Requests download of a mesh asset
             </summary>
-            <param name="meshID">UUID of the mesh asset</param>
-            <param name="callback">Callback when the request completes</param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.FireImageProgressEvent(OpenMetaverse.UUID,System.Int32,System.Int32)">
+        <member name="M:OpenMetaverse.Messages.Linden.PlacesReplyMessage.Serialize">
             <summary>
-            Lets TexturePipeline class fire the progress event
+            Serialize the object
             </summary>
-            <param name="texureID">The texture ID currently being downloaded</param>
-            <param name="transferredBytes">the number of bytes transferred</param>
-            <param name="totalBytes">the total number of bytes expected</param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.TransferInfoHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.Messages.Linden.PlacesReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.TransferPacketHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentInformationMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.InitiateDownloadPacketHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.Messages.Linden.UpdateAgentInformationMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestXferHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.Messages.Linden.DirLandReplyMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.ConfirmXferPacketHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.Messages.Linden.DirLandReplyMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.AssetUploadCompleteHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="T:OpenMetaverse.Messages.Linden.ObjectPhysicsPropertiesMessage">
+            <summary>
+            Event Queue message describing physics engine attributes of a list of objects
+            Sim sends these when object is selected
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.SendXferPacketHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectPhysicsPropertiesMessage.ObjectPhysicsProperties">
+            <summary> Array with the list of physics properties</summary>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.AbortXferHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectPhysicsPropertiesMessage.Serialize">
+            <summary>
+            Serializes the message
+            </summary>
+            <returns>Serialized OSD</returns>
         </member>
-        <member name="E:OpenMetaverse.AssetManager.XferReceived">
-            <summary>Raised when the simulator responds sends </summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectPhysicsPropertiesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deseializes the message
+            </summary>
+            <param name="map">Incoming data to deserialize</param>
         </member>
-        <member name="E:OpenMetaverse.AssetManager.AssetUploaded">
-            <summary>Raised during upload completes</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage">
+            <summary>
+            A message sent from the viewer to the simulator which
+            specifies that the user has changed current URL
+            of the specific media on a prim face
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.AssetManager.UploadProgress">
-            <summary>Raised during upload with progres update</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.URL">
+            <summary>
+            New URL
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.AssetManager.InitiateDownload">
-            <summary>Fired when the simulator sends an InitiateDownloadPacket, used to download terrain .raw files</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.PrimID">
+            <summary>
+            Prim UUID where navigation occured
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.AssetManager.ImageReceiveProgress">
-            <summary>Fired when a texture is in the process of being downloaded by the TexturePipeline class</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.Face">
+            <summary>
+            Face index
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.AssetManager.AssetReceivedCallback">
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.Serialize">
             <summary>
-            Callback used for various asset download requests
+            Serialize the object
             </summary>
-            <param name="transfer">Transfer information</param>
-            <param name="asset">Downloaded asset, null on fail</param>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="T:OpenMetaverse.AssetManager.BakedTextureUploadedCallback">
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Callback used upon competition of baked texture upload
+            Deserialize the message
             </summary>
-            <param name="newAssetID">Asset UUID of the newly uploaded baked texture</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="T:OpenMetaverse.AssetManager.MeshDownloadCallback">
+        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaBlock">
+            <summary>Base class used for the ObjectMedia message</summary>
+        </member>
+        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaRequest">
             <summary>
-            A callback that fires upon the completition of the RequestMesh call
+            Message used to retrive prim media data
             </summary>
-            <param name="success">Was the download successfull</param>
-            <param name="assetMesh">Resulting mesh or null on problems</param>
         </member>
-        <member name="P:OpenMetaverse.XferReceivedEventArgs.Xfer">
-            <summary>Xfer data</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaRequest.PrimID">
+            <summary>
+            Prim UUID
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.AssetUploadEventArgs.Upload">
-            <summary>Upload data</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaRequest.Verb">
+            <summary>
+            Requested operation, either GET or UPDATE
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.InitiateDownloadEventArgs.SimFileName">
-            <summary>Filename used on the simulator</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaRequest.Serialize">
+            <summary>
+            Serialize object
+            </summary>
+            <returns>Serialized object as OSDMap</returns>
         </member>
-        <member name="P:OpenMetaverse.InitiateDownloadEventArgs.ViewerFileName">
-            <summary>Filename used by the client</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaRequest.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="P:OpenMetaverse.ImageReceiveProgressEventArgs.ImageID">
-            <summary>UUID of the image that is in progress</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaResponse">
+            <summary>
+            Message used to update prim media data
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.ImageReceiveProgressEventArgs.Received">
-            <summary>Number of bytes received so far</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaResponse.PrimID">
+            <summary>
+            Prim UUID
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.ImageReceiveProgressEventArgs.Total">
-            <summary>Image size in bytes</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaResponse.FaceMedia">
+            <summary>
+            Array of media entries indexed by face number
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Animations">
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaResponse.Version">
             <summary>
-            Static pre-defined animations available to all agents
+            Media version string
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.AFRAID">
-            <summary>Agent with afraid expression on face</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaResponse.Serialize">
+            <summary>
+            Serialize object
+            </summary>
+            <returns>Serialized object as OSDMap</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.AIM_BAZOOKA_R">
-            <summary>Agent aiming a bazooka (right handed)</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaResponse.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.Animations.AIM_BOW_L">
-            <summary>Agent aiming a bow (left handed)</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaUpdate">
+            <summary>
+            Message used to update prim media data
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.AIM_HANDGUN_R">
-            <summary>Agent aiming a hand gun (right handed)</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.PrimID">
+            <summary>
+            Prim UUID
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.AIM_RIFLE_R">
-            <summary>Agent aiming a rifle (right handed)</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.FaceMedia">
+            <summary>
+            Array of media entries indexed by face number
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.ANGRY">
-            <summary>Agent with angry expression on face</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.Verb">
+            <summary>
+            Requested operation, either GET or UPDATE
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.AWAY">
-            <summary>Agent hunched over (away)</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.Serialize">
+            <summary>
+            Serialize object
+            </summary>
+            <returns>Serialized object as OSDMap</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.BACKFLIP">
-            <summary>Agent doing a backflip</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaUpdate.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.Animations.BELLY_LAUGH">
-            <summary>Agent laughing while holding belly</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaMessage">
+            <summary>
+            Message for setting or getting per face MediaEntry
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.BLOW_KISS">
-            <summary>Agent blowing a kiss</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectMediaMessage.Request">
+            <summary>The request or response details block</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.BORED">
-            <summary>Agent with bored expression on face</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaMessage.Serialize">
+            <summary>
+            Serialize the object
+            </summary>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.BOW">
-            <summary>Agent bowing to audience</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectMediaMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserialize the message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.Animations.BRUSH">
-            <summary>Agent brushing himself/herself off</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.ObjectResourcesDetail">
+            <summary>Details about object resource usage</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.BUSY">
-            <summary>Agent in busy mode</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.ID">
+            <summary>Object UUID</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.CLAP">
-            <summary>Agent clapping hands</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.Name">
+            <summary>Object name</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.COURTBOW">
-            <summary>Agent doing a curtsey bow</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.GroupOwned">
+            <summary>Indicates if object is group owned</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.CROUCH">
-            <summary>Agent crouching</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.Location">
+            <summary>Locatio of the object</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.CROUCHWALK">
-            <summary>Agent crouching while walking</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.OwnerID">
+            <summary>Object owner</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.CRY">
-            <summary>Agent crying</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.Resources">
+            <summary>Resource usage, keys are resource names, values are resource usage for that specific resource</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.CUSTOMIZE">
-            <summary>Agent unanimated with arms out (e.g. setting appearance)</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserializes object from OSD
+            </summary>
+            <param name="obj">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.Animations.CUSTOMIZE_DONE">
-            <summary>Agent re-animated after set appearance finished</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ObjectResourcesDetail.FromOSD(OpenMetaverse.StructuredData.OSD)">
+            <summary>
+            Makes an instance based on deserialized data
+            </summary>
+            <param name="osd">
+                <see cref="T:OpenMetaverse.StructuredData.OSD" /> serialized data</param>
+            <returns>Instance containg deserialized data</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.DANCE1">
-            <summary>Agent dancing</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.ParcelResourcesDetail">
+            <summary>Details about parcel resource usage</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.DANCE2">
-            <summary>Agent dancing</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.ID">
+            <summary>Parcel UUID</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.DANCE3">
-            <summary>Agent dancing</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.LocalID">
+            <summary>Parcel local ID</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.DANCE4">
-            <summary>Agent dancing</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.Name">
+            <summary>Parcel name</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.DANCE5">
-            <summary>Agent dancing</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.GroupOwned">
+            <summary>Indicates if parcel is group owned</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.DANCE6">
-            <summary>Agent dancing</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.OwnerID">
+            <summary>Parcel owner</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.DANCE7">
-            <summary>Agent dancing</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.Objects">
+            <summary>Array of <see cref="T:OpenMetaverse.Messages.Linden.ObjectResourcesDetail" /> containing per object resource usage</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.DANCE8">
-            <summary>Agent dancing</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserializes object from OSD
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.Animations.DEAD">
-            <summary>Agent on ground unanimated</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.ParcelResourcesDetail.FromOSD(OpenMetaverse.StructuredData.OSD)">
+            <summary>
+            Makes an instance based on deserialized data
+            </summary>
+            <param name="osd">
+                <see cref="T:OpenMetaverse.StructuredData.OSD" /> serialized data</param>
+            <returns>Instance containg deserialized data</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.DRINK">
-            <summary>Agent boozing it up</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.BaseResourcesInfo">
+            <summary>Resource usage base class, both agent and parcel resource
+            usage contains summary information</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.EMBARRASSED">
-            <summary>Agent with embarassed expression on face</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.BaseResourcesInfo.SummaryAvailable">
+            <summary>Summary of available resources, keys are resource names,
+            values are resource usage for that specific resource</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_AFRAID">
-            <summary>Agent with afraid expression on face</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.BaseResourcesInfo.SummaryUsed">
+            <summary>Summary resource usage, keys are resource names,
+            values are resource usage for that specific resource</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_ANGER">
-            <summary>Agent with angry expression on face</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.BaseResourcesInfo.Serialize">
+            <summary>
+            Serializes object
+            </summary>
+            <returns>
+                <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> serialized data</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_BORED">
-            <summary>Agent with bored expression on face</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.BaseResourcesInfo.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserializes object from OSD
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_CRY">
-            <summary>Agent crying</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage">
+            <summary>Agent resource usage</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_DISDAIN">
-            <summary>Agent showing disdain (dislike) for something</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage.Attachments">
+            <summary>Per attachment point object resource usage</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_EMBARRASSED">
-            <summary>Agent with embarassed expression on face</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserializes object from OSD
+            </summary>
+            <param name="osd">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_FROWN">
-            <summary>Agent with frowning expression on face</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage.FromOSD(OpenMetaverse.StructuredData.OSD)">
+            <summary>
+            Makes an instance based on deserialized data
+            </summary>
+            <param name="osd">
+                <see cref="T:OpenMetaverse.StructuredData.OSD" /> serialized data</param>
+            <returns>Instance containg deserialized data</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_KISS">
-            <summary>Agent with kissy face</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.AttachmentResourcesMessage.GetMessageHandler(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Detects which class handles deserialization of this message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <returns>Object capable of decoding this message</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_LAUGH">
-            <summary>Agent expressing laughgter</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.LandResourcesRequest">
+            <summary>Request message for parcel resource usage</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_OPEN_MOUTH">
-            <summary>Agent with open mouth</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.LandResourcesRequest.ParcelID">
+            <summary>UUID of the parel to request resource usage info</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_REPULSED">
-            <summary>Agent with repulsed expression on face</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesRequest.Serialize">
+            <summary>
+            Serializes object
+            </summary>
+            <returns>
+                <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> serialized data</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_SAD">
-            <summary>Agent expressing sadness</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesRequest.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserializes object from OSD
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_SHRUG">
-            <summary>Agent shrugging shoulders</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.LandResourcesMessage">
+            <summary>Response message for parcel resource usage</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_SMILE">
-            <summary>Agent with a smile</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.LandResourcesMessage.ScriptResourceDetails">
+            <summary>URL where parcel resource usage details can be retrieved</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_SURPRISE">
-            <summary>Agent expressing surprise</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.LandResourcesMessage.ScriptResourceSummary">
+            <summary>URL where parcel resource usage summary can be retrieved</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_TONGUE_OUT">
-            <summary>Agent sticking tongue out</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesMessage.Serialize">
+            <summary>
+            Serializes object
+            </summary>
+            <returns>
+                <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> serialized data</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_TOOTHSMILE">
-            <summary>Agent with big toothy smile</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserializes object from OSD
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_WINK">
-            <summary>Agent winking</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesMessage.GetMessageHandler(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Detects which class handles deserialization of this message
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <returns>Object capable of decoding this message</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_WORRY">
-            <summary>Agent expressing worry</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.LandResourcesInfo">
+            <summary>Parcel resource usage</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.FALLDOWN">
-            <summary>Agent falling down</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.LandResourcesInfo.Parcels">
+            <summary>Array of <see cref="T:OpenMetaverse.Messages.Linden.ParcelResourcesDetail" /> containing per percal resource usage</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.FEMALE_WALK">
-            <summary>Agent walking (feminine version)</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.LandResourcesInfo.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Deserializes object from OSD
+            </summary>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
         </member>
-        <member name="F:OpenMetaverse.Animations.FINGER_WAG">
-            <summary>Agent wagging finger (disapproval)</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.GetDisplayNamesMessage">
+            <summary>
+            Reply to request for bunch if display names
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.FIST_PUMP">
-            <summary>I'm not sure I want to know</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.GetDisplayNamesMessage.Agents">
+            <summary> Current display name </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.FLY">
-            <summary>Agent in superman position</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.GetDisplayNamesMessage.BadIDs">
+            <summary> Following UUIDs failed to return a valid display name </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.FLYSLOW">
-            <summary>Agent in superman position</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.GetDisplayNamesMessage.Serialize">
+            <summary>
+            Serializes the message
+            </summary>
+            <returns>OSD containting the messaage</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.HELLO">
-            <summary>Agent greeting another</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.SetDisplayNameMessage">
+            <summary>
+            Message sent when requesting change of the display name
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.HOLD_BAZOOKA_R">
-            <summary>Agent holding bazooka (right handed)</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.SetDisplayNameMessage.OldDisplayName">
+            <summary> Current display name </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.HOLD_BOW_L">
-            <summary>Agent holding a bow (left handed)</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.SetDisplayNameMessage.NewDisplayName">
+            <summary> Desired new display name </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.HOLD_HANDGUN_R">
-            <summary>Agent holding a handgun (right handed)</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.SetDisplayNameMessage.Serialize">
+            <summary>
+            Serializes the message
+            </summary>
+            <returns>OSD containting the messaage</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.HOLD_RIFLE_R">
-            <summary>Agent holding a rifle (right handed)</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.SetDisplayNameReplyMessage">
+            <summary>
+            Message recieved in response to request to change display name
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.HOLD_THROW_R">
-            <summary>Agent throwing an object (right handed)</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.SetDisplayNameReplyMessage.DisplayName">
+            <summary> New display name </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.HOVER">
-            <summary>Agent in static hover</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.SetDisplayNameReplyMessage.Reason">
+            <summary> String message indicating the result of the operation </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.HOVER_DOWN">
-            <summary>Agent hovering downward</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.SetDisplayNameReplyMessage.Status">
+            <summary> Numerical code of the result, 200 indicates success </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.HOVER_UP">
-            <summary>Agent hovering upward</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.SetDisplayNameReplyMessage.Serialize">
+            <summary>
+            Serializes the message
+            </summary>
+            <returns>OSD containting the messaage</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.IMPATIENT">
-            <summary>Agent being impatient</summary>
+        <member name="T:OpenMetaverse.Messages.Linden.DisplayNameUpdateMessage">
+            <summary>
+            Message recieved when someone nearby changes their display name
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.JUMP">
-            <summary>Agent jumping</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.DisplayNameUpdateMessage.OldDisplayName">
+            <summary> Previous display name, empty string if default </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.JUMP_FOR_JOY">
-            <summary>Agent jumping with fervor</summary>
+        <member name="F:OpenMetaverse.Messages.Linden.DisplayNameUpdateMessage.DisplayName">
+            <summary> New display name </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.KISS_MY_BUTT">
-            <summary>Agent point to lips then rear end</summary>
+        <member name="M:OpenMetaverse.Messages.Linden.DisplayNameUpdateMessage.Serialize">
+            <summary>
+            Serializes the message
+            </summary>
+            <returns>OSD containting the messaage</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.LAND">
-            <summary>Agent landing from jump, finished flight, etc</summary>
+        <member name="M:OpenMetaverse.Messages.MessageUtils.DecodeEvent(System.String,OpenMetaverse.StructuredData.OSDMap)">
+            <summary>
+            Return a decoded capabilities message as a strongly typed object
+            </summary>
+            <param name="eventName">A string containing the name of the capabilities message key</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> to decode</param>
+            <returns>A strongly typed object containing the decoded information from the capabilities message, or null
+            if no existing Message object exists for the specified event</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.LAUGH_SHORT">
-            <summary>Agent laughing</summary>
+        <member name="T:OpenMetaverse.MediaPermission">
+            <summary>
+            Permissions for control of object media
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.MEDIUM_LAND">
-            <summary>Agent landing from jump, finished flight, etc</summary>
+        <member name="T:OpenMetaverse.MediaControls">
+            <summary>
+            Style of cotrols that shold be displayed to the user
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.MOTORCYCLE_SIT">
-            <summary>Agent sitting on a motorcycle</summary>
+        <member name="T:OpenMetaverse.MediaEntry">
+            <summary>
+            Class representing media data for a single face
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.MUSCLE_BEACH">
-            <summary></summary>
+        <member name="F:OpenMetaverse.MediaEntry.EnableAlterntiveImage">
+            <summary>Is display of the alternative image enabled</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.NO">
-            <summary>Agent moving head side to side</summary>
+        <member name="F:OpenMetaverse.MediaEntry.AutoLoop">
+            <summary>Should media auto loop</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.NO_UNHAPPY">
-            <summary>Agent moving head side to side with unhappy expression</summary>
+        <member name="F:OpenMetaverse.MediaEntry.AutoPlay">
+            <summary>Shoule media be auto played</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.NYAH_NYAH">
-            <summary>Agent taunting another</summary>
+        <member name="F:OpenMetaverse.MediaEntry.AutoScale">
+            <summary>Auto scale media to prim face</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.ONETWO_PUNCH">
-            <summary></summary>
+        <member name="F:OpenMetaverse.MediaEntry.AutoZoom">
+            <summary>Should viewer automatically zoom in on the face when clicked</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.PEACE">
-            <summary>Agent giving peace sign</summary>
+        <member name="F:OpenMetaverse.MediaEntry.InteractOnFirstClick">
+            <summary>Should viewer interpret first click as interaction with the media
+            or when false should the first click be treated as zoom in commadn</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.POINT_ME">
-            <summary>Agent pointing at self</summary>
+        <member name="F:OpenMetaverse.MediaEntry.Controls">
+            <summary>Style of controls viewer should display when
+            viewer media on this face</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.POINT_YOU">
-            <summary>Agent pointing at another</summary>
+        <member name="F:OpenMetaverse.MediaEntry.HomeURL">
+            <summary>Starting URL for the media</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.PRE_JUMP">
-            <summary>Agent preparing for jump (bending knees)</summary>
+        <member name="F:OpenMetaverse.MediaEntry.CurrentURL">
+            <summary>Currently navigated URL</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.PUNCH_LEFT">
-            <summary>Agent punching with left hand</summary>
+        <member name="F:OpenMetaverse.MediaEntry.Height">
+            <summary>Media height in pixes</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.PUNCH_RIGHT">
-            <summary>Agent punching with right hand</summary>
+        <member name="F:OpenMetaverse.MediaEntry.Width">
+            <summary>Media width in pixels</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.REPULSED">
-            <summary>Agent acting repulsed</summary>
+        <member name="F:OpenMetaverse.MediaEntry.ControlPermissions">
+            <summary>Who can controls the media</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.ROUNDHOUSE_KICK">
-            <summary>Agent trying to be Chuck Norris</summary>
+        <member name="F:OpenMetaverse.MediaEntry.InteractPermissions">
+            <summary>Who can interact with the media</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.RPS_COUNTDOWN">
-            <summary>Rocks, Paper, Scissors 1, 2, 3</summary>
+        <member name="F:OpenMetaverse.MediaEntry.EnableWhiteList">
+            <summary>Is URL whitelist enabled</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.RPS_PAPER">
-            <summary>Agent with hand flat over other hand</summary>
+        <member name="F:OpenMetaverse.MediaEntry.WhiteList">
+            <summary>Array of URLs that are whitelisted</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.RPS_ROCK">
-            <summary>Agent with fist over other hand</summary>
+        <member name="M:OpenMetaverse.MediaEntry.GetOSD">
+            <summary>
+            Serialize to OSD
+            </summary>
+            <returns>OSDMap with the serialized data</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.RPS_SCISSORS">
-            <summary>Agent with two fingers spread over other hand</summary>
+        <member name="M:OpenMetaverse.MediaEntry.FromOSD(OpenMetaverse.StructuredData.OSD)">
+            <summary>
+            Deserialize from OSD data
+            </summary>
+            <param name="osd">Serialized OSD data</param>
+            <returns>Deserialized object</returns>
         </member>
-        <member name="F:OpenMetaverse.Animations.RUN">
-            <summary>Agent running</summary>
+        <member name="T:OpenMetaverse.Primitive">
+            <summary>
+            Particle system specific enumerators, flags and methods.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SAD">
-            <summary>Agent appearing sad</summary>
+        <member name="M:OpenMetaverse.Primitive.#ctor">
+            <summary>
+            Default constructor
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SALUTE">
-            <summary>Agent saluting</summary>
+        <member name="T:OpenMetaverse.Primitive.ParticleSystem">
+            <summary>
+            Complete structure for the particle system
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SHOOT_BOW_L">
-            <summary>Agent shooting bow (left handed)</summary>
+        <member name="M:OpenMetaverse.Primitive.ParticleSystem.#ctor(System.Byte[],System.Int32)">
+            <summary>
+            Decodes a byte[] array into a ParticleSystem Object
+            </summary>
+            <param name="data">ParticleSystem object</param>
+            <param name="pos">Start position for BitPacker</param>
         </member>
-        <member name="F:OpenMetaverse.Animations.SHOUT">
-            <summary>Agent cupping mouth as if shouting</summary>
+        <member name="T:OpenMetaverse.Primitive.ParticleSystem.SourcePattern">
+            <summary>
+            Particle source pattern
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SHRUG">
-            <summary>Agent shrugging shoulders</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.None">
+            <summary>None</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SIT">
-            <summary>Agent in sit position</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.Drop">
+            <summary>Drop particles from source position with no force</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SIT_FEMALE">
-            <summary>Agent in sit position (feminine)</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.Explode">
+            <summary>"Explode" particles in all directions</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SIT_GENERIC">
-            <summary>Agent in sit position (generic)</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.Angle">
+            <summary>Particles shoot across a 2D area</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SIT_GROUND">
-            <summary>Agent sitting on ground</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.AngleCone">
+            <summary>Particles shoot across a 3D Cone</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SIT_GROUND_staticRAINED">
-            <summary>Agent sitting on ground</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.AngleConeEmpty">
+            <summary>Inverse of AngleCone (shoot particles everywhere except the 3D cone defined</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SIT_TO_STAND">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags">
+            <summary>
+            Particle Data Flags
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SLEEP">
-            <summary>Agent sleeping on side</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.None">
+            <summary>None</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SMOKE_IDLE">
-            <summary>Agent smoking</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.InterpColor">
+            <summary>Interpolate color and alpha from start to end</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SMOKE_INHALE">
-            <summary>Agent inhaling smoke</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.InterpScale">
+            <summary>Interpolate scale from start to end</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SMOKE_THROW_DOWN">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Bounce">
+            <summary>Bounce particles off particle sources Z height</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SNAPSHOT">
-            <summary>Agent taking a picture</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Wind">
+            <summary>velocity of particles is dampened toward the simulators wind</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.STAND">
-            <summary>Agent standing</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.FollowSrc">
+            <summary>Particles follow the source</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.STANDUP">
-            <summary>Agent standing up</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.FollowVelocity">
+            <summary>Particles point towards the direction of source's velocity</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.STAND_1">
-            <summary>Agent standing</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.TargetPos">
+            <summary>Target of the particles</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.STAND_2">
-            <summary>Agent standing</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.TargetLinear">
+            <summary>Particles are sent in a straight line</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.STAND_3">
-            <summary>Agent standing</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Emissive">
+            <summary>Particles emit a glow</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.STAND_4">
-            <summary>Agent standing</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Beam">
+            <summary>used for point/grab/touch</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.STRETCH">
-            <summary>Agent stretching</summary>
+        <member name="T:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags">
+            <summary>
+            Particle Flags Enum
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.STRIDE">
-            <summary>Agent in stride (fast walk)</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags.None">
+            <summary>None</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SURF">
-            <summary>Agent surfing</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags.ObjectRelative">
+            <summary>Acceleration and velocity for particles are
+            relative to the object rotation</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SURPRISE">
-            <summary>Agent acting surprised</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags.UseNewAngle">
+            <summary>Particles use new 'correct' angle parameters</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.SWORD_STRIKE">
-            <summary>Agent striking with a sword</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartFlags">
+            <summary>Particle Flags</summary>
+            <remarks>There appears to be more data packed in to this area
+            for many particle systems. It doesn't appear to be flag values
+            and serialization breaks unless there is a flag for every
+            possible bit so it is left as an unsigned integer</remarks>
         </member>
-        <member name="F:OpenMetaverse.Animations.TALK">
-            <summary>Agent talking (lips moving)</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.Pattern">
+            <summary>
+                <seealso cref="T:SourcePattern" /> pattern of particles</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.TANTRUM">
-            <summary>Agent throwing a tantrum</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.MaxAge">
+            <summary>A <see langword="float" /> representing the maximimum age (in seconds) particle will be displayed</summary>
+            <remarks>Maximum value is 30 seconds</remarks>
         </member>
-        <member name="F:OpenMetaverse.Animations.THROW_R">
-            <summary>Agent throwing an object (right handed)</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.StartAge">
+            <summary>A <see langword="float" /> representing the number of seconds,
+            from when the particle source comes into view,
+            or the particle system's creation, that the object will emits particles;
+            after this time period no more particles are emitted</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.TRYON_SHIRT">
-            <summary>Agent trying on a shirt</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.InnerAngle">
+            <summary>A <see langword="float" /> in radians that specifies where particles will not be created</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.TURNLEFT">
-            <summary>Agent turning to the left</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.OuterAngle">
+            <summary>A <see langword="float" /> in radians that specifies where particles will be created</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.TURNRIGHT">
-            <summary>Agent turning to the right</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BurstRate">
+            <summary>A <see langword="float" /> representing the number of seconds between burts.</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.TYPE">
-            <summary>Agent typing</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BurstRadius">
+            <summary>A <see langword="float" /> representing the number of meters
+            around the center of the source where particles will be created.</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.WALK">
-            <summary>Agent walking</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BurstSpeedMin">
+            <summary>A <see langword="float" /> representing in seconds, the minimum speed between bursts of new particles
+            being emitted</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.WHISPER">
-            <summary>Agent whispering</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BurstSpeedMax">
+            <summary>A <see langword="float" /> representing in seconds the maximum speed of new particles being emitted.</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.WHISTLE">
-            <summary>Agent whispering with fingers in mouth</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.BurstPartCount">
+            <summary>A <see langword="byte" /> representing the maximum number of particles emitted per burst</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.WINK">
-            <summary>Agent winking</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.AngularVelocity">
+            <summary>A <see cref="T:Vector3" /> which represents the velocity (speed) from the source which particles are emitted</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.WINK_HOLLYWOOD">
-            <summary>Agent winking</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartAcceleration">
+            <summary>A <see cref="T:Vector3" /> which represents the Acceleration from the source which particles are emitted</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.WORRY">
-            <summary>Agent worried</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.Texture">
+            <summary>The <see cref="T:UUID" /> Key of the texture displayed on the particle</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.YES">
-            <summary>Agent nodding yes</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.Target">
+            <summary>The <see cref="T:UUID" /> Key of the specified target object or avatar particles will follow</summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.YES_HAPPY">
-            <summary>Agent nodding yes with happy face</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartDataFlags">
+            <summary>Flags of particle from <seealso cref="T:ParticleDataFlags" /></summary>
         </member>
-        <member name="F:OpenMetaverse.Animations.YOGA_FLOAT">
-            <summary>Agent floating with legs and arms crossed</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartMaxAge">
+            <summary>Max Age particle system will emit particles for</summary>
         </member>
-        <member name="M:OpenMetaverse.Animations.ToDictionary">
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartStartColor">
+            <summary>The <see cref="T:Color4" /> the particle has at the beginning of its lifecycle</summary>
+        </member>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartEndColor">
+            <summary>The <see cref="T:Color4" /> the particle has at the ending of its lifecycle</summary>
+        </member>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartStartScaleX">
+            <summary>A <see langword="float" /> that represents the starting X size of the particle</summary>
+            <remarks>Minimum value is 0, maximum value is 4</remarks>
+        </member>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartStartScaleY">
+            <summary>A <see langword="float" /> that represents the starting Y size of the particle</summary>
+            <remarks>Minimum value is 0, maximum value is 4</remarks>
+        </member>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartEndScaleX">
+            <summary>A <see langword="float" /> that represents the ending X size of the particle</summary>
+            <remarks>Minimum value is 0, maximum value is 4</remarks>
+        </member>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartEndScaleY">
+            <summary>A <see langword="float" /> that represents the ending Y size of the particle</summary>
+            <remarks>Minimum value is 0, maximum value is 4</remarks>
+        </member>
+        <member name="M:OpenMetaverse.Primitive.ParticleSystem.GetBytes">
             <summary>
-            A dictionary containing all pre-defined animations
+            Generate byte[] array from particle data
             </summary>
-            <returns>A dictionary containing the pre-defined animations, 
-            where the key is the animations ID, and the value is a string
-            containing a name to identify the purpose of the animation</returns>
+            <returns>Byte array</returns>
         </member>
-        <member name="T:OpenMetaverse.Rendering.LindenMesh.LODMesh">
+        <member name="T:OpenMetaverse.Primitive.ConstructionData">
             <summary>
-            Level of Detail mesh
+            Parameters used to construct a visual representation of a primitive
             </summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetPrim">
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.profileCurve">
             <summary>
-            A linkset asset, containing a parent primitive and zero or more children
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetPrim.#ctor">
-            <summary>Initializes a new instance of an AssetPrim object</summary>
-        </member>
-        <member name="M:OpenMetaverse.Assets.AssetPrim.#ctor(OpenMetaverse.UUID,System.Byte[])">
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathCurve">
             <summary>
-            Initializes a new instance of an AssetPrim object
             </summary>
-            <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
-            <param name="assetData">A byte array containing the raw asset data</param>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetPrim.Encode">
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathEnd">
             <summary>
-            
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetPrim.Decode">
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathRadiusOffset">
             <summary>
-            
             </summary>
-            <returns></returns>
-        </member>
-        <member name="P:OpenMetaverse.Assets.AssetPrim.AssetType">
-            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetPrim.ProfileShape">
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathSkew">
             <summary>
-            Only used internally for XML serialization/deserialization
             </summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.PrimObject">
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathScaleX">
             <summary>
-            The deserialized form of a single primitive in a linkset asset
             </summary>
         </member>
-        <member name="T:OpenMetaverse.SoundManager">
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathScaleY">
             <summary>
-            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.SoundManager.m_AttachedSound">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.SoundManager.OnAttachedSound(OpenMetaverse.AttachedSoundEventArgs)">
-            <summary>Raises the AttachedSound Event</summary>
-             <param name="e">A AttachedSoundEventArgs object containing
-             the data sent from the simulator</param>
-        </member>
-        <member name="F:OpenMetaverse.SoundManager.m_AttachedSoundLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.SoundManager.m_AttachedSoundGainChange">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.SoundManager.OnAttachedSoundGainChange(OpenMetaverse.AttachedSoundGainChangeEventArgs)">
-            <summary>Raises the AttachedSoundGainChange Event</summary>
-             <param name="e">A AttachedSoundGainChangeEventArgs object containing
-             the data sent from the simulator</param>
-        </member>
-        <member name="F:OpenMetaverse.SoundManager.m_AttachedSoundGainChangeLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.SoundManager.m_SoundTrigger">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.SoundManager.OnSoundTrigger(OpenMetaverse.SoundTriggerEventArgs)">
-            <summary>Raises the SoundTrigger Event</summary>
-             <param name="e">A SoundTriggerEventArgs object containing
-             the data sent from the simulator</param>
-        </member>
-        <member name="F:OpenMetaverse.SoundManager.m_SoundTriggerLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.SoundManager.m_PreloadSound">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="M:OpenMetaverse.SoundManager.OnPreloadSound(OpenMetaverse.PreloadSoundEventArgs)">
-            <summary>Raises the PreloadSound Event</summary>
-             <param name="e">A PreloadSoundEventArgs object containing
-             the data sent from the simulator</param>
-        </member>
-        <member name="F:OpenMetaverse.SoundManager.m_PreloadSoundLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="M:OpenMetaverse.SoundManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathShearX">
             <summary>
-            Construct a new instance of the SoundManager class, used for playing and receiving
-            sound assets
             </summary>
-            <param name="client">A reference to the current GridClient instance</param>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.PlaySound(OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathShearY">
             <summary>
-            Plays a sound in the current region at full volume from avatar position
             </summary>
-            <param name="soundID">UUID of the sound to be played</param>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,OpenMetaverse.Vector3)">
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTaperX">
             <summary>
-            Plays a sound in the current region at full volume
             </summary>
-            <param name="soundID">UUID of the sound to be played.</param>
-            <param name="position">position for the sound to be played at. Normally the avatar.</param>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,OpenMetaverse.Vector3,System.Single)">
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTaperY">
             <summary>
-            Plays a sound in the current region
             </summary>
-            <param name="soundID">UUID of the sound to be played.</param>
-            <param name="position">position for the sound to be played at. Normally the avatar.</param>
-            <param name="gain">volume of the sound, from 0.0 to 1.0</param>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,OpenMetaverse.Simulator,OpenMetaverse.Vector3,System.Single)">
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathBegin">
             <summary>
-            Plays a sound in the specified sim
             </summary>
-            <param name="soundID">UUID of the sound to be played.</param>
-            <param name="sim">UUID of the sound to be played.</param>
-            <param name="position">position for the sound to be played at. Normally the avatar.</param>
-            <param name="gain">volume of the sound, from 0.0 to 1.0</param>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,System.UInt64,OpenMetaverse.Vector3,System.Single)">
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTwist">
             <summary>
-            Play a sound asset
             </summary>
-            <param name="soundID">UUID of the sound to be played.</param>
-            <param name="handle">handle id for the sim to be played in.</param>
-            <param name="position">position for the sound to be played at. Normally the avatar.</param>
-            <param name="gain">volume of the sound, from 0.0 to 1.0</param>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.AttachedSoundHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-        </member>
-        <member name="M:OpenMetaverse.SoundManager.AttachedSoundGainChangeHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-        </member>
-        <member name="M:OpenMetaverse.SoundManager.PreloadSoundHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-        </member>
-        <member name="M:OpenMetaverse.SoundManager.SoundTriggerHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-        </member>
-        <member name="E:OpenMetaverse.SoundManager.AttachedSound">
-            <summary>Raised when the simulator sends us data containing
-            sound</summary>
-        </member>
-        <member name="E:OpenMetaverse.SoundManager.AttachedSoundGainChange">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
-        </member>
-        <member name="E:OpenMetaverse.SoundManager.SoundTrigger">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
-        </member>
-        <member name="E:OpenMetaverse.SoundManager.PreloadSound">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
-        </member>
-        <member name="T:OpenMetaverse.AttachedSoundEventArgs">
-            <summary>Provides data for the <see cref="E:OpenMetaverse.SoundManager.AttachedSound"/> event</summary>
-            <remarks>The <see cref="E:OpenMetaverse.SoundManager.AttachedSound"/> event occurs when the simulator sends
-            the sound data which emits from an agents attachment</remarks>
-            <example>
-            The following code example shows the process to subscribe to the <see cref="E:OpenMetaverse.SoundManager.AttachedSound"/> event
-            and a stub to handle the data passed from the simulator
-            <code>
-                // Subscribe to the AttachedSound event
-                Client.Sound.AttachedSound += Sound_AttachedSound;
-                
-                // process the data raised in the event here
-                private void Sound_AttachedSound(object sender, AttachedSoundEventArgs e)
-                {
-                    // ... Process AttachedSoundEventArgs here ...
-                }
-            </code>
-            </example>
-        </member>
-        <member name="M:OpenMetaverse.AttachedSoundEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,System.Single,OpenMetaverse.SoundFlags)">
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTwistBegin">
             <summary>
-            Construct a new instance of the SoundTriggerEventArgs class
             </summary>
-            <param name="sim">Simulator where the event originated</param>
-            <param name="soundID">The sound asset id</param>
-            <param name="ownerID">The ID of the owner</param>
-            <param name="objectID">The ID of the object</param>
-            <param name="gain">The volume level</param>
-            <param name="flags">The <see cref="T:OpenMetaverse.SoundFlags"/></param>
-        </member>
-        <member name="P:OpenMetaverse.AttachedSoundEventArgs.Simulator">
-            <summary>Simulator where the event originated</summary>
-        </member>
-        <member name="P:OpenMetaverse.AttachedSoundEventArgs.SoundID">
-            <summary>Get the sound asset id</summary>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundEventArgs.OwnerID">
-            <summary>Get the ID of the owner</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathRevolutions">
+            <summary>
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundEventArgs.ObjectID">
-            <summary>Get the ID of the Object</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.ProfileBegin">
+            <summary>
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundEventArgs.Gain">
-            <summary>Get the volume level</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.ProfileEnd">
+            <summary>
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundEventArgs.Flags">
-            <summary>Get the <see cref="T:OpenMetaverse.SoundFlags"/></summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.ProfileHollow">
+            <summary>
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.AttachedSoundGainChangeEventArgs">
-            <summary>Provides data for the <see cref="E:OpenMetaverse.SoundManager.AttachedSoundGainChange"/> event</summary>
-            <remarks>The <see cref="E:OpenMetaverse.SoundManager.AttachedSoundGainChange"/> event occurs when an attached sound
-            changes its volume level</remarks>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.Material">
+            <summary>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AttachedSoundGainChangeEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,System.Single)">
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.State">
             <summary>
-            Construct a new instance of the AttachedSoundGainChangedEventArgs class
             </summary>
-            <param name="sim">Simulator where the event originated</param>
-            <param name="objectID">The ID of the Object</param>
-            <param name="gain">The new volume level</param>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundGainChangeEventArgs.Simulator">
-            <summary>Simulator where the event originated</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PCode">
+            <summary>
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundGainChangeEventArgs.ObjectID">
-            <summary>Get the ID of the Object</summary>
+        <member name="P:OpenMetaverse.Primitive.ConstructionData.AttachmentPoint">
+            <summary>Attachment point to an avatar</summary>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundGainChangeEventArgs.Gain">
-            <summary>Get the volume level</summary>
+        <member name="P:OpenMetaverse.Primitive.ConstructionData.ProfileCurve">
+            <summary>
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.SoundTriggerEventArgs">
-             <summary>Provides data for the <see cref="E:OpenMetaverse.SoundManager.SoundTrigger"/> event</summary>
-             <remarks><para>The <see cref="E:OpenMetaverse.SoundManager.SoundTrigger"/> event occurs when the simulator forwards
-             a request made by yourself or another agent to play either an asset sound or a built in sound</para>
-             
-             <para>Requests to play sounds where the <see cref="P:OpenMetaverse.SoundTriggerEventArgs.SoundID"/> is not one of the built-in
-             <see cref="T:OpenMetaverse.Sounds"/> will require sending a request to download the sound asset before it can be played</para>
-             </remarks>
-             <example>
-             The following code example uses the <see cref="P:OpenMetaverse.SoundTriggerEventArgs.OwnerID"/>, <see cref="P:OpenMetaverse.SoundTriggerEventArgs.SoundID"/> 
-             and <see cref="P:OpenMetaverse.SoundTriggerEventArgs.Gain"/>
-             properties to display some information on a sound request on the <see cref="T:System.Console"/> window.
-             <code>
-                 // subscribe to the event
-                 Client.Sound.SoundTrigger += Sound_SoundTrigger;
-            
-                 // play the pre-defined BELL_TING sound
-                 Client.Sound.SendSoundTrigger(Sounds.BELL_TING);
-                 
-                 // handle the response data
-                 private void Sound_SoundTrigger(object sender, SoundTriggerEventArgs e)
-                 {
-                     Console.WriteLine("{0} played the sound {1} at volume {2}",
-                         e.OwnerID, e.SoundID, e.Gain);
-                 }    
-             </code>
-             </example>
+        <member name="P:OpenMetaverse.Primitive.ConstructionData.ProfileHole">
+            <summary>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.SoundTriggerEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,System.Single,System.UInt64,OpenMetaverse.Vector3)">
+        <member name="P:OpenMetaverse.Primitive.ConstructionData.PathBeginScale">
             <summary>
-            Construct a new instance of the SoundTriggerEventArgs class
             </summary>
-            <param name="sim">Simulator where the event originated</param>
-            <param name="soundID">The sound asset id</param>
-            <param name="ownerID">The ID of the owner</param>
-            <param name="objectID">The ID of the object</param>
-            <param name="parentID">The ID of the objects parent</param>
-            <param name="gain">The volume level</param>
-            <param name="regionHandle">The regionhandle</param>
-            <param name="position">The source position</param>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.Simulator">
-            <summary>Simulator where the event originated</summary>
+        <member name="P:OpenMetaverse.Primitive.ConstructionData.PathEndScale">
+            <summary>
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.SoundID">
-            <summary>Get the sound asset id</summary>
+        <member name="M:OpenMetaverse.Primitive.ConstructionData.GetHashCode">
+            <summary>
+            Calculdates hash code for prim construction data
+            </summary>
+            <returns>The has</returns>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.OwnerID">
-            <summary>Get the ID of the owner</summary>
+        <member name="T:OpenMetaverse.Primitive.FlexibleData">
+            <summary>
+            Information on the flexible properties of a primitive
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.ObjectID">
-            <summary>Get the ID of the Object</summary>
+        <member name="M:OpenMetaverse.Primitive.FlexibleData.#ctor">
+            <summary>
+            Default constructor
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.ParentID">
-            <summary>Get the ID of the objects parent</summary>
+        <member name="M:OpenMetaverse.Primitive.FlexibleData.#ctor(System.Byte[],System.Int32)">
+            <summary>
+            </summary>
+            <param name="data">
+            </param>
+            <param name="pos">
+            </param>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.Gain">
-            <summary>Get the volume level</summary>
+        <member name="F:OpenMetaverse.Primitive.FlexibleData.Softness">
+            <summary>
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.RegionHandle">
-            <summary>Get the regionhandle</summary>
+        <member name="F:OpenMetaverse.Primitive.FlexibleData.Gravity">
+            <summary>
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.Position">
-            <summary>Get the source position</summary>
+        <member name="F:OpenMetaverse.Primitive.FlexibleData.Drag">
+            <summary>
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.PreloadSoundEventArgs">
-            <summary>Provides data for the <see cref="E:OpenMetaverse.AvatarManager.AvatarAppearance"/> event</summary>
-            <remarks>The <see cref="E:OpenMetaverse.AvatarManager.AvatarAppearance"/> event occurs when the simulator sends
-            the appearance data for an avatar</remarks>
-            <example>
-            The following code example uses the <see cref="P:OpenMetaverse.AvatarAppearanceEventArgs.AvatarID"/> and <see cref="P:OpenMetaverse.AvatarAppearanceEventArgs.VisualParams"/>
-            properties to display the selected shape of an avatar on the <see cref="T:System.Console"/> window.
-            <code>
-                // subscribe to the event
-                Client.Avatars.AvatarAppearance += Avatars_AvatarAppearance;
-            
-                // handle the data when the event is raised
-                void Avatars_AvatarAppearance(object sender, AvatarAppearanceEventArgs e)
-                {
-                    Console.WriteLine("The Agent {0} is using a {1} shape.", e.AvatarID, (e.VisualParams[31] &gt; 0) : "male" ? "female")
-                }
-            </code>
-            </example>
+        <member name="F:OpenMetaverse.Primitive.FlexibleData.Wind">
+            <summary>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.PreloadSoundEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="F:OpenMetaverse.Primitive.FlexibleData.Tension">
             <summary>
-            Construct a new instance of the PreloadSoundEventArgs class
             </summary>
-            <param name="sim">Simulator where the event originated</param>
-            <param name="soundID">The sound asset id</param>
-            <param name="ownerID">The ID of the owner</param>
-            <param name="objectID">The ID of the object</param>
         </member>
-        <member name="P:OpenMetaverse.PreloadSoundEventArgs.Simulator">
-            <summary>Simulator where the event originated</summary>
+        <member name="F:OpenMetaverse.Primitive.FlexibleData.Force">
+            <summary>
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.PreloadSoundEventArgs.SoundID">
-            <summary>Get the sound asset id</summary>
+        <member name="M:OpenMetaverse.Primitive.FlexibleData.GetBytes">
+            <summary>
+            </summary>
+            <returns>
+            </returns>
         </member>
-        <member name="P:OpenMetaverse.PreloadSoundEventArgs.OwnerID">
-            <summary>Get the ID of the owner</summary>
+        <member name="M:OpenMetaverse.Primitive.FlexibleData.GetOSD">
+            <summary>
+            </summary>
+            <returns>
+            </returns>
         </member>
-        <member name="P:OpenMetaverse.PreloadSoundEventArgs.ObjectID">
-            <summary>Get the ID of the Object</summary>
+        <member name="T:OpenMetaverse.Primitive.LightData">
+            <summary>
+            Information on the light properties of a primitive
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.NameValue">
+        <member name="M:OpenMetaverse.Primitive.LightData.#ctor">
             <summary>
-            A Name Value pair with additional settings, used in the protocol
-            primarily to transmit avatar names and active group in object packets
+            Default constructor
             </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.Name">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Primitive.LightData.#ctor(System.Byte[],System.Int32)">
+            <summary>
+            </summary>
+            <param name="data">
+            </param>
+            <param name="pos">
+            </param>
         </member>
-        <member name="F:OpenMetaverse.NameValue.Type">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.LightData.Color">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.Class">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.LightData.Intensity">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.Sendto">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.LightData.Radius">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.Value">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.LightData.Cutoff">
+            <summary>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.NameValue.#ctor(System.String,OpenMetaverse.NameValue.ValueType,OpenMetaverse.NameValue.ClassType,OpenMetaverse.NameValue.SendtoType,System.Object)">
+        <member name="F:OpenMetaverse.Primitive.LightData.Falloff">
             <summary>
-            Constructor that takes all the fields as parameters
             </summary>
-            <param name="name"></param>
-            <param name="valueType"></param>
-            <param name="classType"></param>
-            <param name="sendtoType"></param>
-            <param name="value"></param>
         </member>
-        <member name="M:OpenMetaverse.NameValue.#ctor(System.String)">
+        <member name="M:OpenMetaverse.Primitive.LightData.GetBytes">
             <summary>
-            Constructor that takes a single line from a NameValue field
             </summary>
-            <param name="data"></param>
+            <returns>
+            </returns>
         </member>
-        <member name="T:OpenMetaverse.NameValue.ValueType">
-            <summary>Type of the value</summary>
+        <member name="M:OpenMetaverse.Primitive.LightData.ToString">
+            <summary>
+            </summary>
+            <returns>
+            </returns>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.Unknown">
-            <summary>Unknown</summary>
+        <member name="T:OpenMetaverse.Primitive.SculptData">
+            <summary>
+            Information on the sculpt properties of a sculpted primitive
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.String">
-            <summary>String value</summary>
+        <member name="M:OpenMetaverse.Primitive.SculptData.#ctor">
+            <summary>
+            Default constructor
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.F32">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Primitive.SculptData.#ctor(System.Byte[],System.Int32)">
+            <summary>
+            </summary>
+            <param name="data">
+            </param>
+            <param name="pos">
+            </param>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.S32">
-            <summary></summary>
+        <member name="P:OpenMetaverse.Primitive.SculptData.Invert">
+            <summary>
+            Render inside out (inverts the normals).
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.VEC3">
-            <summary></summary>
+        <member name="P:OpenMetaverse.Primitive.SculptData.Mirror">
+            <summary>
+            Render an X axis mirror of the sculpty.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.U32">
-            <summary></summary>
+        <member name="T:OpenMetaverse.Primitive.ObjectProperties">
+            <summary>
+            Extended properties to describe an object
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.CAMERA">
-            <summary>Deprecated</summary>
+        <member name="M:OpenMetaverse.Primitive.ObjectProperties.#ctor">
+            <summary>
+            Default constructor
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.Asset">
-            <summary>String value, but designated as an asset</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.ObjectID">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.U64">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.CreatorID">
+            <summary>
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.NameValue.ClassType">
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.OwnerID">
             <summary>
-            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ClassType.Unknown">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.GroupID">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ClassType.ReadOnly">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.CreationDate">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ClassType.ReadWrite">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Permissions">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ClassType.Callback">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.OwnershipCost">
+            <summary>
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.NameValue.SendtoType">
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.SaleType">
             <summary>
-            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.SendtoType.Unknown">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.SalePrice">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.SendtoType.Sim">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.AggregatePerms">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.SendtoType.DataSim">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.AggregatePermTextures">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.SendtoType.SimViewer">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.AggregatePermTexturesOwner">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.SendtoType.DataSimViewer">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Category">
+            <summary>
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.EstateTask">
-            <summary>Describes tasks returned in LandStatReply</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.InventorySerial">
+            <summary>
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.EstateTools">
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.ItemID">
             <summary>
-            Estate level administration and utilities
             </summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.GroundTextures">
-            <summary>Textures for each of the four terrain height levels</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.FolderID">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.GroundTextureLimits">
-            <summary>Upper/lower texture boundaries for each corner of the sim</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.FromTaskID">
+            <summary>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.#ctor(OpenMetaverse.GridClient)">
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.LastOwnerID">
             <summary>
-            Constructor for EstateTools class
             </summary>
-            <param name="client"></param>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_TopCollidersReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Name">
+            <summary>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.OnTopCollidersReply(OpenMetaverse.TopCollidersReplyEventArgs)">
-            <summary>Raises the TopCollidersReply event</summary>
-            <param name="e">A TopCollidersReplyEventArgs object containing the
-            data returned from the data server</param>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Description">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_TopCollidersReply_Lock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.TouchName">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_TopScriptsReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.SitName">
+            <summary>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.OnTopScriptsReply(OpenMetaverse.TopScriptsReplyEventArgs)">
-            <summary>Raises the TopScriptsReply event</summary>
-            <param name="e">A TopScriptsReplyEventArgs object containing the
-            data returned from the data server</param>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.TextureIDs">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_TopScriptsReply_Lock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.Primitive.ObjectProperties.SetFamilyProperties(OpenMetaverse.Primitive.ObjectProperties)">
+            <summary>
+            Set the properties that are set in an ObjectPropertiesFamily packet
+            </summary>
+            <param name="props">
+                <seealso cref="T:OpenMetaverse.Primitive.ObjectProperties" /> that has
+            been partially filled by an ObjectPropertiesFamily packet</param>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateUsersReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Primitive.PhysicsProperties">
+            <summary>
+            Describes physics attributes of the prim
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.OnEstateUsersReply(OpenMetaverse.EstateUsersReplyEventArgs)">
-            <summary>Raises the EstateUsersReply event</summary>
-            <param name="e">A EstateUsersReplyEventArgs object containing the
-            data returned from the data server</param>
+        <member name="F:OpenMetaverse.Primitive.PhysicsProperties.LocalID">
+            <summary>Primitive's local ID</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateUsersReply_Lock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Primitive.PhysicsProperties.Density">
+            <summary>Density (1000 for normal density)</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateGroupsReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Primitive.PhysicsProperties.Friction">
+            <summary>Friction</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.OnEstateGroupsReply(OpenMetaverse.EstateGroupsReplyEventArgs)">
-            <summary>Raises the EstateGroupsReply event</summary>
-            <param name="e">A EstateGroupsReplyEventArgs object containing the
-            data returned from the data server</param>
+        <member name="F:OpenMetaverse.Primitive.PhysicsProperties.GravityMultiplier">
+            <summary>Gravity multiplier (1 for normal gravity) </summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateGroupsReply_Lock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Primitive.PhysicsProperties.PhysicsShapeType">
+            <summary>Type of physics representation of this primitive in the simulator</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateManagersReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Primitive.PhysicsProperties.Restitution">
+            <summary>Restitution</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.OnEstateManagersReply(OpenMetaverse.EstateManagersReplyEventArgs)">
-            <summary>Raises the EstateManagersReply event</summary>
-            <param name="e">A EstateManagersReplyEventArgs object containing the
-            data returned from the data server</param>
+        <member name="M:OpenMetaverse.Primitive.PhysicsProperties.FromOSD(OpenMetaverse.StructuredData.OSD)">
+            <summary>
+            Creates PhysicsProperties from OSD
+            </summary>
+            <param name="osd">OSDMap with incoming data</param>
+            <returns>Deserialized PhysicsProperties object</returns>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateManagersReply_Lock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.Primitive.PhysicsProperties.GetOSD">
+            <summary>
+            Serializes PhysicsProperties to OSD
+            </summary>
+            <returns>OSDMap with serialized PhysicsProperties data</returns>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateBansReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Primitive.TextureAnimMode">
+            <summary>
+            Texture animation mode
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.OnEstateBansReply(OpenMetaverse.EstateBansReplyEventArgs)">
-            <summary>Raises the EstateBansReply event</summary>
-            <param name="e">A EstateBansReplyEventArgs object containing the
-            data returned from the data server</param>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.ANIM_OFF">
+            <summary>Disable texture animation</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateBansReply_Lock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.ANIM_ON">
+            <summary>Enable texture animation</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateCovenantReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.LOOP">
+            <summary>Loop when animating textures</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.OnEstateCovenantReply(OpenMetaverse.EstateCovenantReplyEventArgs)">
-            <summary>Raises the EstateCovenantReply event</summary>
-            <param name="e">A EstateCovenantReplyEventArgs object containing the
-            data returned from the data server</param>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.REVERSE">
+            <summary>Animate in reverse direction</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateCovenantReply_Lock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.PING_PONG">
+            <summary>Animate forward then reverse</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateUpdateInfoReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.SMOOTH">
+            <summary>Slide texture smoothly instead of frame-stepping</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.OnEstateUpdateInfoReply(OpenMetaverse.EstateUpdateInfoReplyEventArgs)">
-            <summary>Raises the EstateUpdateInfoReply event</summary>
-            <param name="e">A EstateUpdateInfoReplyEventArgs object containing the
-            data returned from the data server</param>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.ROTATE">
+            <summary>Rotate texture instead of using frames</summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateUpdateInfoReply_Lock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.SCALE">
+            <summary>Scale texture instead of using frames</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)">
+        <member name="T:OpenMetaverse.Primitive.TextureEntryFace">
             <summary>
-            Requests estate information such as top scripts and colliders
+            A single textured face. Don't instantiate this class yourself, use the
+            methods in TextureEntry
             </summary>
-            <param name="parcelLocalID"></param>
-            <param name="reportType"></param>
-            <param name="requestFlags"></param>
-            <param name="filter"></param>
-        </member>
-        <member name="M:OpenMetaverse.EstateTools.RequestInfo">
-            <summary>Requests estate settings, including estate manager and access/ban lists</summary>
-        </member>
-        <member name="M:OpenMetaverse.EstateTools.RequestTopScripts">
-            <summary>Requests the "Top Scripts" list for the current region</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.RequestTopColliders">
-            <summary>Requests the "Top Colliders" list for the current region</summary>
-        </member>
-        <member name="M:OpenMetaverse.EstateTools.SetTerrainVariables(System.Single,System.Single,System.Single,System.Boolean,System.Boolean,System.Single)">
+        <member name="M:OpenMetaverse.Primitive.TextureEntryFace.#ctor(OpenMetaverse.Primitive.TextureEntryFace)">
             <summary>
-            Set several estate specific configuration variables
+            Contains the definition for individual faces
             </summary>
-            <param name="WaterHeight">The Height of the waterlevel over the entire estate. Defaults to 20</param>
-            <param name="TerrainRaiseLimit">The maximum height change allowed above the baked terrain. Defaults to 4</param>
-            <param name="TerrainLowerLimit">The minimum height change allowed below the baked terrain. Defaults to -4</param>
-            <param name="UseEstateSun">true to use</param>
-            <param name="FixedSun">if True forces the sun position to the position in SunPosition</param>
-            <param name="SunPosition">The current position of the sun on the estate, or when FixedSun is true the static position
-            the sun will remain. <remarks>6.0 = Sunrise, 30.0 = Sunset</remarks></param>
+            <param name="defaultTexture">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.SimWideReturn(OpenMetaverse.UUID,OpenMetaverse.EstateTools.EstateReturnFlags,System.Boolean)">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.material">
             <summary>
-            Request return of objects owned by specified avatar 
             </summary>
-            <param name="Target">The Agents <see cref="T:OpenMetaverse.UUID"/> owning the primitives to return</param>
-            <param name="flag">specify the coverage and type of objects to be included in the return</param>
-            <param name="EstateWide">true to perform return on entire estate</param>
-        </member>
-        <member name="M:OpenMetaverse.EstateTools.EstateOwnerMessage(System.String,System.String)">
-            <summary></summary>
-            <param name="method"></param>
-            <param name="param"></param>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.EstateOwnerMessage(System.String,System.Collections.Generic.List{System.String})">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.media">
             <summary>
-            Used for setting and retrieving various estate panel settings
             </summary>
-            <param name="method">EstateOwnerMessage Method field</param>
-            <param name="listParams">List of parameters to include</param>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.KickUser(OpenMetaverse.UUID)">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.RGBA">
             <summary>
-            Kick an avatar from an estate
             </summary>
-            <param name="userID">Key of Agent to remove</param>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.BanUser(OpenMetaverse.UUID,System.Boolean)">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.RepeatU">
             <summary>
-            Ban an avatar from an estate</summary>
-            <param name="userID">Key of Agent to remove</param>
-            <param name="allEstates">Ban user from this estate and all others owned by the estate owner</param>
-        </member>
-        <member name="M:OpenMetaverse.EstateTools.UnbanUser(OpenMetaverse.UUID,System.Boolean)">
-            <summary>Unban an avatar from an estate</summary>
-            <param name="userID">Key of Agent to remove</param>
-             /// <param name="allEstates">Unban user from this estate and all others owned by the estate owner</param>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.EstateMessage(System.String)">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.RepeatV">
             <summary>
-            Send a message dialog to everyone in an entire estate
             </summary>
-            <param name="message">Message to send all users in the estate</param>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.SimulatorMessage(System.String)">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.OffsetU">
             <summary>
-            Send a message dialog to everyone in a simulator
             </summary>
-            <param name="message">Message to send all users in the simulator</param>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.TeleportHomeUser(OpenMetaverse.UUID)">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.OffsetV">
             <summary>
-            Send an avatar back to their home location
             </summary>
-            <param name="pest">Key of avatar to send home</param>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.RestartRegion">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.Rotation">
             <summary>
-            Begin the region restart process
             </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.CancelRestart">
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.Glow">
             <summary>
-            Cancels a region restart
             </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.SetRegionInfo(System.Boolean,System.Boolean,System.Boolean,System.Boolean,System.Boolean,System.Boolean,System.Single,System.Single,System.Boolean)">
-            <summary>Estate panel "Region" tab settings</summary>
-        </member>
-        <member name="M:OpenMetaverse.EstateTools.SetRegionDebug(System.Boolean,System.Boolean,System.Boolean)">
-            <summary>Estate panel "Debug" tab settings</summary>
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.Bump">
+            <summary>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.SetRegionTerrain(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID)">
-            <summary>Used for setting the region's terrain textures for its four height levels</summary>
-            <param name="low"></param>
-            <param name="midLow"></param>
-            <param name="midHigh"></param>
-            <param name="high"></param>
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.MediaFlags">
+            <summary>In the future this will specify whether a webpage is
+            attached to this face</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.SetRegionTerrainHeights(System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single,System.Single)">
-            <summary>Used for setting sim terrain texture heights</summary> 
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.TextureID">
+            <summary>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.RequestCovenant">
-            <summary>Requests the estate covenant</summary>
+        <member name="M:OpenMetaverse.Primitive.TextureEntryFace.ToString">
+            <summary>
+            </summary>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.UploadTerrain(System.Byte[],System.String)">
+        <member name="T:OpenMetaverse.Primitive.TextureEntry">
             <summary>
-            Upload a terrain RAW file
+            Represents all of the texturable faces for an object
             </summary>
-            <param name="fileData">A byte array containing the encoded terrain data</param>
-            <param name="fileName">The name of the file being uploaded</param>
-            <returns>The Id of the transfer request</returns>
+            <remarks>Grid objects have infinite faces, with each face
+            using the properties of the default face unless set otherwise. So if
+            you have a TextureEntry with a default texture uuid of X, and face 18
+            has a texture UUID of Y, every face would be textured with X except for
+            face 18 that uses Y. In practice however, primitives utilize a maximum
+            of nine faces</remarks>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.TeleportHomeAllUsers">
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.#ctor(OpenMetaverse.UUID)">
             <summary>
-            Teleports all users home in current Estate
+            Constructor that takes a default texture UUID
             </summary>
+            <param name="defaultTextureID">Texture UUID to use as the default texture</param>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.RemoveEstateManager(OpenMetaverse.UUID,System.Boolean)">
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.#ctor(OpenMetaverse.Primitive.TextureEntryFace)">
             <summary>
-            Remove estate manager</summary>
-            <param name="userID">Key of Agent to Remove</param>
-            <param name="allEstates">removes manager to this estate and all others owned by the estate owner</param>
+            Constructor that takes a <code>TextureEntryFace</code> for the
+            default face
+            </summary>
+            <param name="defaultFace">Face to use as the default face</param>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.AddEstateManager(OpenMetaverse.UUID,System.Boolean)">
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.#ctor(System.Byte[],System.Int32,System.Int32)">
             <summary>
-            Add estate manager</summary>
-            <param name="userID">Key of Agent to Add</param>
-            <param name="allEstates">Add agent as manager to this estate and all others owned by the estate owner</param>
+            Constructor that creates the TextureEntry class from a byte array
+            </summary>
+            <param name="data">Byte array containing the TextureEntry field</param>
+            <param name="pos">Starting position of the TextureEntry field in
+            the byte array</param>
+            <param name="length">Length of the TextureEntry field, in bytes</param>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.AddAllowedUser(OpenMetaverse.UUID,System.Boolean)">
+        <member name="F:OpenMetaverse.Primitive.TextureEntry.DefaultTexture">
             <summary>
-            Add's an agent to the estate Allowed list</summary>
-            <param name="userID">Key of Agent to Add</param>
-            <param name="allEstates">Add agent as an allowed reisdent to All estates if true</param>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.RemoveAllowedUser(OpenMetaverse.UUID,System.Boolean)">
+        <member name="F:OpenMetaverse.Primitive.TextureEntry.FaceTextures">
             <summary>
-            Removes an agent from the estate Allowed list</summary>
-            <param name="userID">Key of Agent to Remove</param>
-            <param name="allEstates">Removes agent as an allowed reisdent from All estates if true</param>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.AddAllowedGroup(OpenMetaverse.UUID,System.Boolean)">
-            
-             <summary>
-             Add's a group to the estate Allowed list</summary>
-             <param name="groupID">Key of Group to Add</param>
-             <param name="allEstates">Add Group as an allowed group to All estates if true</param>
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.CreateFace(System.UInt32)">
+            <summary>
+            This will either create a new face if a custom face for the given
+            index is not defined, or return the custom face for that index if
+            it already exists
+            </summary>
+            <param name="index">The index number of the face to create or
+            retrieve</param>
+            <returns>A TextureEntryFace containing all the properties for that
+            face</returns>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.RemoveAllowedGroup(OpenMetaverse.UUID,System.Boolean)">
-            
-             <summary>
-             Removes a group from the estate Allowed list</summary>
-             <param name="groupID">Key of Group to Remove</param>
-             <param name="allEstates">Removes Group as an allowed Group from All estates if true</param>
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.GetFace(System.UInt32)">
+            <summary>
+            </summary>
+            <param name="index">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.EstateCovenantReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.GetOSD">
+            <summary>
+            </summary>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.EstateOwnerMessageHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.GetBytes">
+            <summary>
+            </summary>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.LandStatReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.ToString">
+            <summary>
+            </summary>
+            <returns>
+            </returns>
         </member>
-        <member name="E:OpenMetaverse.EstateTools.TopCollidersReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)"/> request.</summary>
+        <member name="T:OpenMetaverse.Primitive.TextureAnimation">
+            <summary>
+            Controls the texture animation of a particular prim
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.EstateTools.TopScriptsReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)"/> request.</summary>
+        <member name="M:OpenMetaverse.Primitive.TextureAnimation.#ctor(System.Byte[],System.Int32)">
+            <summary>
+            </summary>
+            <param name="data">
+            </param>
+            <param name="pos">
+            </param>
         </member>
-        <member name="E:OpenMetaverse.EstateTools.EstateUsersReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)"/> request.</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Flags">
+            <summary>
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.EstateTools.EstateGroupsReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)"/> request.</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Face">
+            <summary>
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.EstateTools.EstateManagersReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)"/> request.</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimation.SizeX">
+            <summary>
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.EstateTools.EstateBansReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)"/> request.</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimation.SizeY">
+            <summary>
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.EstateTools.EstateCovenantReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)"/> request.</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Start">
+            <summary>
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.EstateTools.EstateUpdateInfoReply">
-            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)"/> request.</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Length">
+            <summary>
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.EstateTools.LandStatReportType">
-            <summary>Used in the ReportType field of a LandStatRequest</summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Rate">
+            <summary>
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.EstateTools.EstateAccessDelta">
-            <summary>Used by EstateOwnerMessage packets</summary>
+        <member name="M:OpenMetaverse.Primitive.TextureAnimation.GetBytes">
+            <summary>
+            </summary>
+            <returns>
+            </returns>
         </member>
-        <member name="T:OpenMetaverse.EstateTools.EstateAccessReplyDelta">
-            <summary>Used by EstateOwnerMessage packets</summary>
+        <member name="F:OpenMetaverse.Primitive.MediaVersion">
+            <summary>
+            Current version of the media data for the prim
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.EstateTools.EstateReturnFlags">
+        <member name="F:OpenMetaverse.Primitive.FaceMedia">
             <summary>
-            
+            Array of media entries indexed by face number
             </summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.EstateReturnFlags.None">
-            <summary>No flags set</summary>
+        <member name="F:OpenMetaverse.Primitive.ParticleSys">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.EstateReturnFlags.ReturnScripted">
-            <summary>Only return targets scripted objects</summary>
+        <member name="F:OpenMetaverse.Primitive.ID">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.EstateReturnFlags.ReturnOnOthersLand">
-            <summary>Only return targets objects if on others land</summary>
+        <member name="F:OpenMetaverse.Primitive.GroupID">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.EstateTools.EstateReturnFlags.ReturnScriptedAndOnOthers">
-            <summary>Returns target's scripted objects and objects on other parcels</summary>
+        <member name="F:OpenMetaverse.Primitive.LocalID">
+            <summary>
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.EstateTools.GroundTextureSettings">
-            <summary>Ground texture settings for each corner of the region</summary>
+        <member name="F:OpenMetaverse.Primitive.ParentID">
+            <summary>
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.EstateTools.GroundTextureHeight">
-            <summary>Used by GroundTextureHeightSettings</summary>
+        <member name="F:OpenMetaverse.Primitive.RegionHandle">
+            <summary>
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.EstateTools.GroundTextureHeightSettings">
-            <summary>The high and low texture thresholds for each corner of the sim</summary>
+        <member name="F:OpenMetaverse.Primitive.Flags">
+            <summary>
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.TopCollidersReplyEventArgs">
-            <summary>Raised on LandStatReply when the report type is for "top colliders"</summary>
+        <member name="F:OpenMetaverse.Primitive.TreeSpecies">
+            <summary>Foliage type for this primitive. Only applicable if this
+            primitive is foliage</summary>
         </member>
-        <member name="M:OpenMetaverse.TopCollidersReplyEventArgs.#ctor(System.Int32,System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.EstateTask})">
-            <summary>Construct a new instance of the TopCollidersReplyEventArgs class</summary>
-            <param name="objectCount">The number of returned items in LandStatReply</param>
-            <param name="tasks">Dictionary of Object UUIDs to tasks returned in LandStatReply</param>
+        <member name="F:OpenMetaverse.Primitive.ScratchPad">
+            <summary>Unknown</summary>
         </member>
-        <member name="P:OpenMetaverse.TopCollidersReplyEventArgs.ObjectCount">
+        <member name="F:OpenMetaverse.Primitive.Position">
             <summary>
-            The number of returned items in LandStatReply
             </summary>
         </member>
-        <member name="P:OpenMetaverse.TopCollidersReplyEventArgs.Tasks">
+        <member name="F:OpenMetaverse.Primitive.Scale">
             <summary>
-            A Dictionary of Object UUIDs to tasks returned in LandStatReply
             </summary>
         </member>
-        <member name="T:OpenMetaverse.TopScriptsReplyEventArgs">
-            <summary>Raised on LandStatReply when the report type is for "top Scripts"</summary>
+        <member name="F:OpenMetaverse.Primitive.Rotation">
+            <summary>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.TopScriptsReplyEventArgs.#ctor(System.Int32,System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.EstateTask})">
-            <summary>Construct a new instance of the TopScriptsReplyEventArgs class</summary>
-            <param name="objectCount">The number of returned items in LandStatReply</param>
-            <param name="tasks">Dictionary of Object UUIDs to tasks returned in LandStatReply</param>
+        <member name="F:OpenMetaverse.Primitive.Velocity">
+            <summary>
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.TopScriptsReplyEventArgs.ObjectCount">
+        <member name="F:OpenMetaverse.Primitive.AngularVelocity">
             <summary>
-            The number of scripts returned in LandStatReply
             </summary>
         </member>
-        <member name="P:OpenMetaverse.TopScriptsReplyEventArgs.Tasks">
+        <member name="F:OpenMetaverse.Primitive.Acceleration">
             <summary>
-            A Dictionary of Object UUIDs to tasks returned in LandStatReply
             </summary>
         </member>
-        <member name="T:OpenMetaverse.EstateBansReplyEventArgs">
-            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
+        <member name="F:OpenMetaverse.Primitive.CollisionPlane">
+            <summary>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateBansReplyEventArgs.#ctor(System.UInt32,System.Int32,System.Collections.Generic.List{OpenMetaverse.UUID})">
-            <summary>Construct a new instance of the EstateBansReplyEventArgs class</summary>
-            <param name="estateID">The estate's identifier on the grid</param>
-            <param name="count">The number of returned items in LandStatReply</param>
-            <param name="banned">User UUIDs banned</param>
+        <member name="F:OpenMetaverse.Primitive.Flexible">
+            <summary>
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateBansReplyEventArgs.EstateID">
+        <member name="F:OpenMetaverse.Primitive.Light">
             <summary>
-            The identifier of the estate
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateBansReplyEventArgs.Count">
+        <member name="F:OpenMetaverse.Primitive.Sculpt">
             <summary>
-            The number of returned itmes
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateBansReplyEventArgs.Banned">
+        <member name="F:OpenMetaverse.Primitive.ClickAction">
             <summary>
-            List of UUIDs of Banned Users
             </summary>
         </member>
-        <member name="T:OpenMetaverse.EstateUsersReplyEventArgs">
-            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
+        <member name="F:OpenMetaverse.Primitive.Sound">
+            <summary>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateUsersReplyEventArgs.#ctor(System.UInt32,System.Int32,System.Collections.Generic.List{OpenMetaverse.UUID})">
-            <summary>Construct a new instance of the EstateUsersReplyEventArgs class</summary>
-            <param name="estateID">The estate's identifier on the grid</param>
-            <param name="count">The number of users</param>
-            <param name="allowedUsers">Allowed users UUIDs</param>
+        <member name="F:OpenMetaverse.Primitive.OwnerID">
+            <summary>Identifies the owner if audio or a particle system is
+            active</summary>
         </member>
-        <member name="P:OpenMetaverse.EstateUsersReplyEventArgs.EstateID">
+        <member name="F:OpenMetaverse.Primitive.SoundFlags">
             <summary>
-            The identifier of the estate
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateUsersReplyEventArgs.Count">
+        <member name="F:OpenMetaverse.Primitive.SoundGain">
             <summary>
-            The number of returned items
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateUsersReplyEventArgs.AllowedUsers">
+        <member name="F:OpenMetaverse.Primitive.SoundRadius">
             <summary>
-            List of UUIDs of Allowed Users
             </summary>
         </member>
-        <member name="T:OpenMetaverse.EstateGroupsReplyEventArgs">
-            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
-        </member>
-        <member name="M:OpenMetaverse.EstateGroupsReplyEventArgs.#ctor(System.UInt32,System.Int32,System.Collections.Generic.List{OpenMetaverse.UUID})">
-            <summary>Construct a new instance of the EstateGroupsReplyEventArgs class</summary>
-            <param name="estateID">The estate's identifier on the grid</param>
-            <param name="count">The number of Groups</param>
-            <param name="allowedGroups">Allowed Groups UUIDs</param>
+        <member name="F:OpenMetaverse.Primitive.Text">
+            <summary>
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateGroupsReplyEventArgs.EstateID">
+        <member name="F:OpenMetaverse.Primitive.TextColor">
             <summary>
-            The identifier of the estate
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateGroupsReplyEventArgs.Count">
+        <member name="F:OpenMetaverse.Primitive.MediaURL">
             <summary>
-            The number of returned items
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateGroupsReplyEventArgs.AllowedGroups">
+        <member name="F:OpenMetaverse.Primitive.Joint">
             <summary>
-            List of UUIDs of Allowed Groups
             </summary>
         </member>
-        <member name="T:OpenMetaverse.EstateManagersReplyEventArgs">
-            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
+        <member name="F:OpenMetaverse.Primitive.JointPivot">
+            <summary>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateManagersReplyEventArgs.#ctor(System.UInt32,System.Int32,System.Collections.Generic.List{OpenMetaverse.UUID})">
-            <summary>Construct a new instance of the EstateManagersReplyEventArgs class</summary>
-            <param name="estateID">The estate's identifier on the grid</param>
-            <param name="count">The number of Managers</param>
-            <param name="managers"> Managers UUIDs</param>
+        <member name="F:OpenMetaverse.Primitive.JointAxisOrAnchor">
+            <summary>
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateManagersReplyEventArgs.EstateID">
+        <member name="F:OpenMetaverse.Primitive.NameValues">
             <summary>
-            The identifier of the estate
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateManagersReplyEventArgs.Count">
+        <member name="F:OpenMetaverse.Primitive.PrimData">
             <summary>
-            The number of returned items
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateManagersReplyEventArgs.Managers">
+        <member name="F:OpenMetaverse.Primitive.Properties">
             <summary>
-            List of UUIDs of the Estate's Managers
             </summary>
         </member>
-        <member name="T:OpenMetaverse.EstateCovenantReplyEventArgs">
-            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
+        <member name="F:OpenMetaverse.Primitive.PhysicsProps">
+            <summary>Objects physics engine propertis</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateCovenantReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Int64,System.String,OpenMetaverse.UUID)">
-            <summary>Construct a new instance of the EstateCovenantReplyEventArgs class</summary>
-            <param name="covenantID">The Covenant ID</param>
-            <param name="timestamp">The timestamp</param>
-            <param name="estateName">The estate's name</param>
-            <param name="estateOwnerID">The Estate Owner's ID (can be a GroupID)</param>
+        <member name="F:OpenMetaverse.Primitive.Tag">
+            <summary>Extra data about primitive</summary>
         </member>
-        <member name="P:OpenMetaverse.EstateCovenantReplyEventArgs.CovenantID">
+        <member name="F:OpenMetaverse.Primitive.IsAttachment">
+            <summary>Indicates if prim is attached to an avatar</summary>
+        </member>
+        <member name="F:OpenMetaverse.Primitive.Textures">
             <summary>
-            The Covenant
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateCovenantReplyEventArgs.Timestamp">
+        <member name="F:OpenMetaverse.Primitive.TextureAnim">
             <summary>
-            The timestamp
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateCovenantReplyEventArgs.EstateName">
+        <member name="P:OpenMetaverse.Primitive.Type">
+            <summary>Uses basic heuristics to estimate the primitive shape</summary>
+        </member>
+        <member name="M:OpenMetaverse.Primitive.PackPathTwist(System.Single)">
             <summary>
-            The Estate name
+            Packs PathTwist, PathTwistBegin, PathRadiusOffset, and PathSkew
+            parameters in to signed eight bit values
             </summary>
+            <param name="pathTwist">Floating point parameter to pack</param>
+            <returns>Signed eight bit value containing the packed parameter</returns>
         </member>
-        <member name="P:OpenMetaverse.EstateCovenantReplyEventArgs.EstateOwnerID">
+        <member name="M:OpenMetaverse.Primitive.UnpackPathTwist(System.SByte)">
             <summary>
-            The Estate Owner's ID (can be a GroupID)
+            Unpacks PathTwist, PathTwistBegin, PathRadiusOffset, and PathSkew
+            parameters from signed eight bit integers to floating point values
             </summary>
+            <param name="pathTwist">Signed eight bit value to unpack</param>
+            <returns>Unpacked floating point value</returns>
         </member>
-        <member name="T:OpenMetaverse.EstateUpdateInfoReplyEventArgs">
-            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
-        </member>
-        <member name="M:OpenMetaverse.EstateUpdateInfoReplyEventArgs.#ctor(System.String,OpenMetaverse.UUID,System.UInt32,System.Boolean)">
-            <summary>Construct a new instance of the EstateUpdateInfoReplyEventArgs class</summary>
-            <param name="estateName">The estate's name</param>
-            <param name="estateOwner">The Estate Owners ID (can be a GroupID)</param>
-            <param name="estateID">The estate's identifier on the grid</param>
-            <param name="denyNoPaymentInfo"></param>
-        </member>
-        <member name="P:OpenMetaverse.EstateUpdateInfoReplyEventArgs.EstateName">
+        <member name="T:OpenMetaverse.Bumpiness">
             <summary>
-            The estate's name
+            The type of bump-mapping applied to a face
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateUpdateInfoReplyEventArgs.EstateOwner">
+        <member name="F:OpenMetaverse.Bumpiness.None">
             <summary>
-            The Estate Owner's ID (can be a GroupID)
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateUpdateInfoReplyEventArgs.EstateID">
+        <member name="F:OpenMetaverse.Bumpiness.Brightness">
             <summary>
-            The identifier of the estate on the grid
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateUpdateInfoReplyEventArgs.DenyNoPaymentInfo">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Bumpiness.Darkness">
+            <summary>
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.AvatarGroup">
+        <member name="F:OpenMetaverse.Bumpiness.Woodgrain">
             <summary>
-            Holds group information for Avatars such as those you might find in a profile
             </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarGroup.AcceptNotices">
-            <summary>true of Avatar accepts group notices</summary>
+        <member name="F:OpenMetaverse.Bumpiness.Bark">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarGroup.GroupID">
-            <summary>Groups Key</summary>
+        <member name="F:OpenMetaverse.Bumpiness.Bricks">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarGroup.GroupInsigniaID">
-            <summary>Texture Key for groups insignia</summary>
+        <member name="F:OpenMetaverse.Bumpiness.Checker">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarGroup.GroupName">
-            <summary>Name of the group</summary>
+        <member name="F:OpenMetaverse.Bumpiness.Concrete">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarGroup.GroupPowers">
-            <summary>Powers avatar has in the group</summary>
+        <member name="F:OpenMetaverse.Bumpiness.Crustytile">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarGroup.GroupTitle">
-            <summary>Avatars Currently selected title</summary>
+        <member name="F:OpenMetaverse.Bumpiness.Cutstone">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarGroup.ListInProfile">
-            <summary>true of Avatar has chosen to list this in their profile</summary>
+        <member name="F:OpenMetaverse.Bumpiness.Discs">
+            <summary>
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Animation">
+        <member name="F:OpenMetaverse.Bumpiness.Gravel">
             <summary>
-            Contains an animation currently being played by an agent
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Animation.AnimationID">
-            <summary>The ID of the animation asset</summary>
+        <member name="F:OpenMetaverse.Bumpiness.Petridish">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animation.AnimationSequence">
-            <summary>A number to indicate start order of currently playing animations</summary>
-            <remarks>On Linden Grids this number is unique per region, with OpenSim it is per client</remarks>
+        <member name="F:OpenMetaverse.Bumpiness.Siding">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.Animation.AnimationSourceObjectID">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Bumpiness.Stonetile">
+            <summary>
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.ProfilePick">
+        <member name="F:OpenMetaverse.Bumpiness.Stucco">
             <summary>
-            Holds group information on an individual profile pick
             </summary>
         </member>
-        <member name="T:OpenMetaverse.AvatarManager">
+        <member name="F:OpenMetaverse.Bumpiness.Suction">
             <summary>
-            Retrieve friend status notifications, and retrieve avatar names and
-            profiles
             </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAnimation">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.Bumpiness.Weave">
+            <summary>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnAvatarAnimation(OpenMetaverse.AvatarAnimationEventArgs)">
-            <summary>Raises the AvatarAnimation Event</summary>
-             <param name="e">An AvatarAnimationEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="T:OpenMetaverse.Shininess">
+            <summary>
+            The level of shininess applied to a face
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAnimationLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Shininess.None">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAppearance">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.Shininess.Low">
+            <summary>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnAvatarAppearance(OpenMetaverse.AvatarAppearanceEventArgs)">
-            <summary>Raises the AvatarAppearance Event</summary>
-             <param name="e">A AvatarAppearanceEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.Shininess.Medium">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAppearanceLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Shininess.High">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_UUIDNameReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.MappingType">
+            <summary>
+            The texture mapping style used for a face
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnUUIDNameReply(OpenMetaverse.UUIDNameReplyEventArgs)">
-            <summary>Raises the UUIDNameReply Event</summary>
-             <param name="e">A UUIDNameReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.MappingType.Default">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_UUIDNameReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.MappingType.Planar">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarInterestsReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.MappingType.Spherical">
+            <summary>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnAvatarInterestsReply(OpenMetaverse.AvatarInterestsReplyEventArgs)">
-            <summary>Raises the AvatarInterestsReply Event</summary>
-             <param name="e">A AvatarInterestsReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.MappingType.Cylindrical">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarInterestsReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.TextureAttributes">
+            <summary>
+            Flags in the TextureEntry block that describe which properties are
+            set
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPropertiesReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.None">
+            <summary>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnAvatarPropertiesReply(OpenMetaverse.AvatarPropertiesReplyEventArgs)">
-            <summary>Raises the AvatarPropertiesReply Event</summary>
-             <param name="e">A AvatarPropertiesReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.TextureAttributes.TextureID">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPropertiesReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.RGBA">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarGroupsReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.RepeatU">
+            <summary>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnAvatarGroupsReply(OpenMetaverse.AvatarGroupsReplyEventArgs)">
-            <summary>Raises the AvatarGroupsReply Event</summary>
-             <param name="e">A AvatarGroupsReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.TextureAttributes.RepeatV">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarGroupsReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.OffsetU">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPickerReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.OffsetV">
+            <summary>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnAvatarPickerReply(OpenMetaverse.AvatarPickerReplyEventArgs)">
-            <summary>Raises the AvatarPickerReply Event</summary>
-             <param name="e">A AvatarPickerReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.TextureAttributes.Rotation">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPickerReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.Material">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectPointAt">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.Media">
+            <summary>
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnViewerEffectPointAt(OpenMetaverse.ViewerEffectPointAtEventArgs)">
-            <summary>Raises the ViewerEffectPointAt Event</summary>
-             <param name="e">A ViewerEffectPointAtEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.TextureAttributes.Glow">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectPointAtLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.All">
+            <summary>
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectLookAt">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Rendering.LindenMesh.LODMesh">
+            <summary>
+            Level of Detail mesh
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnViewerEffectLookAt(OpenMetaverse.ViewerEffectLookAtEventArgs)">
-            <summary>Raises the ViewerEffectLookAt Event</summary>
-             <param name="e">A ViewerEffectLookAtEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="T:OpenMetaverse.Rendering.FacetedMesh">
+            <summary>
+            Contains all mesh faces that belong to a prim
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectLookAtLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Rendering.FacetedMesh.Faces">
+            <summary>List of primitive faces</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffect">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="M:OpenMetaverse.Rendering.FacetedMesh.TryDecodeFromAsset(OpenMetaverse.Primitive,OpenMetaverse.Assets.AssetMesh,OpenMetaverse.Rendering.DetailLevel,OpenMetaverse.Rendering.FacetedMesh@)">
+            <summary>
+            Decodes mesh asset into FacetedMesh
+            </summary>
+            <param name="prim">Mesh primitive</param>
+            <param name="meshAsset">Asset retrieved from the asset server</param>
+            <param name="LOD">Level of detail</param>
+            <param name="mesh">Resulting decoded FacetedMesh</param>
+            <returns>True if mesh asset decoding was successful</returns>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnViewerEffect(OpenMetaverse.ViewerEffectEventArgs)">
-            <summary>Raises the ViewerEffect Event</summary>
-             <param name="e">A ViewerEffectEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.#ctor">
+            <summary>
+            Constructor for default logging settings
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.Enabled">
+            <summary>Enable logging</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPicksReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.Folder">
+            <summary>The folder where any logs will be created</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnAvatarPicksReply(OpenMetaverse.AvatarPicksReplyEventArgs)">
-            <summary>Raises the AvatarPicksReply Event</summary>
-             <param name="e">A AvatarPicksReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="F:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.FileNamePrefix">
+            <summary>This will be prepended to beginning of each log file</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPicksReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.FileNameSuffix">
+            <summary>The suffix or extension to be appended to each log file</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_PickInfoReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="F:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.LogLevel">
+            <summary>
+            0: NONE - No logging
+            1: ERROR - Log errors only
+            2: WARNING - Log errors and warnings
+            3: INFO - Log errors, warnings and info
+            4: DEBUG - Log errors, warnings, info and debug
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnPickInfoReply(OpenMetaverse.PickInfoReplyEventArgs)">
-            <summary>Raises the PickInfoReply Event</summary>
-             <param name="e">A PickInfoReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="T:OpenMetaverse.Voice.VoiceGateway.AudioPropertiesEventArgs">
+            Audio Properties Events are sent after audio capture is started. These events are used to display a microphone VU meter</member>
+        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnVoiceResponse">
+            <summary>
+            Event for most mundane request reposnses.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_PickInfoReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnConnectorCreateResponse">
+            <summary>Response to Connector.Create request</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarClassifiedReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnAuxGetCaptureDevicesResponse">
+            <summary>Response to Aux.GetCaptureDevices request</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnAvatarClassifiedReply(OpenMetaverse.AvatarClassifiedReplyEventArgs)">
-            <summary>Raises the AvatarClassifiedReply Event</summary>
-             <param name="e">A AvatarClassifiedReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnAuxGetRenderDevicesResponse">
+            <summary>Response to Aux.GetRenderDevices request</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarClassifiedReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnAuxAudioPropertiesEvent">
+            <summary>Audio Properties Events are sent after audio capture is started.
+            These events are used to display a microphone VU meter</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_ClassifiedInfoReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnAccountLoginResponse">
+            <summary>Response to Account.Login request</summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.OnClassifiedInfoReply(OpenMetaverse.ClassifiedInfoReplyEventArgs)">
-            <summary>Raises the ClassifiedInfoReply Event</summary>
-             <param name="e">A ClassifiedInfoReplyEventArgs object containing
-             the data sent from the simulator</param>
+        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnAccountLoginStateChangeEvent">
+            <summary>This event message is sent whenever the login state of the
+            particular Account has transitioned from one value to another</summary>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_ClassifiedInfoReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="P:OpenMetaverse.Voice.VoiceGateway.CaptureDevices">
+            <summary>
+            List of audio input devices
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="P:OpenMetaverse.Voice.VoiceGateway.PlaybackDevices">
             <summary>
-            Represents other avatars
+            List of audio output devices
             </summary>
-            <param name="client"></param>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestTrackAgent(OpenMetaverse.UUID)">
-            <summary>Tracks the specified avatar on your map</summary>
-            <param name="preyID">Avatar ID to track</param>
+        <member name="P:OpenMetaverse.Voice.VoiceGateway.TestMode">
+            <summary>
+            Set audio test mode
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarName(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AccountLogin(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Boolean)">
             <summary>
-            Request a single avatar name
+            This is used to login a specific user account(s). It may only be called after
+            Connector initialization has completed successfully
             </summary>
-            <param name="id">The avatar key to retrieve a name for</param>
+            <param name="ConnectorHandle">Handle returned from successful Connector �create� request</param>
+            <param name="AccountName">User's account name</param>
+            <param name="AccountPassword">User's account password</param>
+            <param name="AudioSessionAnswerMode">Values may be �AutoAnswer� or �VerifyAnswer�</param>
+            <param name="AccountURI">""</param>
+            <param name="ParticipantPropertyFrequency">This is an integer that specifies how often
+            the daemon will send participant property events while in a channel. If this is not set
+            the default will be �on state change�, which means that the events will be sent when
+            the participant starts talking, stops talking, is muted, is unmuted.
+            The valid values are:
+            0 � Never
+            5 � 10 times per second
+            10 � 5 times per second
+            50 � 1 time per second
+            100 � on participant state change (this is the default)</param>
+            <param name="EnableBuddiesAndPresence">false</param>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarNames(System.Collections.Generic.List{OpenMetaverse.UUID})">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AccountLogout(System.String)">
             <summary>
-            Request a list of avatar names
+            This is used to logout a user session. It should only be called with a valid AccountHandle.
             </summary>
-            <param name="ids">The avatar keys to retrieve names for</param>
+            <param name="AccountHandle">Handle returned from successful Connector �login� request</param>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarProperties(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxGetCaptureDevices">
             <summary>
-            Start a request for Avatar Properties
+            This is used to get a list of audio devices that can be used for capture (input) of voice.
             </summary>
-            <param name="avatarid"></param>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarNameSearch(System.String,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxGetRenderDevices">
             <summary>
-            Search for an avatar (first name, last name)
+            This is used to get a list of audio devices that can be used for render (playback) of voice.
             </summary>
-            <param name="name">The name to search for</param>
-            <param name="queryID">An ID to associate with this query</param>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarPicks(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxSetRenderDevice(System.String)">
             <summary>
-            Start a request for Avatar Picks
+            This command is used to select the render device.
             </summary>
-            <param name="avatarid">UUID of the avatar</param>
+            <param name="RenderDeviceSpecifier">The name of the device as returned by the Aux.GetRenderDevices command.</param>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarClassified(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxSetCaptureDevice(System.String)">
             <summary>
-            Start a request for Avatar Classifieds
+            This command is used to select the capture device.
             </summary>
-            <param name="avatarid">UUID of the avatar</param>
+            <param name="CaptureDeviceSpecifier">The name of the device as returned by the Aux.GetCaptureDevices command.</param>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestPickInfo(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxCaptureAudioStart(System.Int32)">
             <summary>
-            Start a request for details of a specific profile pick
+            This command is used to start the audio capture process which will cause
+            AuxAudioProperty Events to be raised. These events can be used to display a
+            microphone VU meter for the currently selected capture device. This command
+            should not be issued if the user is on a call.
             </summary>
-            <param name="avatarid">UUID of the avatar</param>
-            <param name="pickid">UUID of the profile pick</param>
+            <param name="Duration">(unused but required)</param>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestClassifiedInfo(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxCaptureAudioStop">
             <summary>
-            Start a request for details of a specific profile classified
+            This command is used to stop the audio capture process.
             </summary>
-            <param name="avatarid">UUID of the avatar</param>
-            <param name="classifiedid">UUID of the profile classified</param>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.UUIDNameReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxSetMicLevel(System.Int32)">
+            <summary>
+            This command is used to set the mic volume while in the audio tuning process.
+            Once an acceptable mic level is attained, the application must issue a
+            connector set mic volume command to have that level be used while on voice
+            calls.
+            </summary>
+            <param name="Level">the microphone volume (-100 to 100 inclusive)</param>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.AvatarAnimationHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxSetSpeakerLevel(System.Int32)">
+            <summary>
+            This command is used to set the speaker volume while in the audio tuning
+            process. Once an acceptable speaker level is attained, the application must
+            issue a connector set speaker volume command to have that level be used while
+            on voice calls.
+            </summary>
+            <param name="Level">the speaker volume (-100 to 100 inclusive)</param>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.AvatarAppearanceHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectorCreate(System.String,System.String,System.UInt16,System.UInt16,OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings)">
+            <summary>
+            This is used to initialize and stop the Connector as a whole. The Connector
+            Create call must be completed successfully before any other requests are made
+            (typically during application initialization). The shutdown should be called
+            when the application is shutting down to gracefully release resources
+            </summary>
+            <param name="ClientName">A string value indicting the Application name</param>
+            <param name="AccountManagementServer">URL for the management server</param>
+            <param name="Logging">LoggingSettings</param>
+            <param name="MaximumPort">
+            </param>
+            <param name="MinimumPort">
+            </param>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.AvatarPropertiesHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectorInitiateShutdown(System.String)">
+            <summary>
+            Shutdown Connector -- Should be called when the application is shutting down
+            to gracefully release resources
+            </summary>
+            <param name="ConnectorHandle">Handle returned from successful Connector �create� request</param>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.AvatarInterestsHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectorMuteLocalMic(System.String,System.Boolean)">
+            <summary>
+            Mute or unmute the microphone
+            </summary>
+            <param name="ConnectorHandle">Handle returned from successful Connector �create� request</param>
+            <param name="Mute">true (mute) or false (unmute)</param>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.AvatarGroupsReplyMessageHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectorMuteLocalSpeaker(System.String,System.Boolean)">
             <summary>
-            Crossed region handler for message that comes across the EventQueue. Sent to an agent
-            when the agent crosses a sim border into a new region.
+            Mute or unmute the speaker
             </summary>
-            <param name="capsKey">The message key</param>
-            <param name="message">the IMessage object containing the deserialized data sent from the simulator</param>
-            <param name="simulator">The <see cref="T:OpenMetaverse.Simulator"/> which originated the packet</param>
+            <param name="ConnectorHandle">Handle returned from successful Connector �create� request</param>
+            <param name="Mute">true (mute) or false (unmute)</param>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.AvatarGroupsReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectorSetLocalMicVolume(System.String,System.Int32)">
+            <summary>
+            Set microphone volume
+            </summary>
+            <param name="ConnectorHandle">Handle returned from successful Connector �create� request</param>
+            <param name="Value">The level of the audio, a number between -100 and 100 where
+            0 represents �normal� speaking volume</param>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.AvatarPickerReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectorSetLocalSpeakerVolume(System.String,System.Int32)">
+            <summary>
+            Set local speaker volume
+            </summary>
+            <param name="ConnectorHandle">Handle returned from successful Connector �create� request</param>
+            <param name="Value">The level of the audio, a number between -100 and 100 where
+            0 represents �normal� speaking volume</param>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.ViewerEffectHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.Start">
+            <summary>
+            Start up the Voice service.
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.AvatarPicksReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnVoiceResponse(System.Object,OpenMetaverse.Voice.VoiceGateway.VoiceResponseEventArgs)">
+            <summary>
+            Handle miscellaneous request status
+            </summary>
+            <param name="sender">
+            </param>
+            <param name="e">
+            </param>
+            ///<remarks>If something goes wrong, we log it.</remarks></member>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.Dispose">
+            <summary>
+            Cleanup oject resources
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.PickInfoReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.Network_EventQueueRunning(System.Object,OpenMetaverse.EventQueueRunningEventArgs)">
+            <summary>
+            Request voice cap when changing regions
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.AvatarClassifiedReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnSessionStateChangeEvent(System.Object,OpenMetaverse.Voice.VoiceGateway.SessionStateChangeEventArgs)">
+            <summary>
+            Handle a change in session state
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.ClassifiedInfoReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
-            <summary>Process an incoming packet and raise the appropriate events</summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.CloseSession(System.String)">
+            <summary>
+            Close a voice session
+            </summary>
+            <param name="sessionHandle">
+            </param>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.AvatarAnimation">
-            <summary>Raised when the simulator sends us data containing
-            an agents animation playlist</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.FindSession(System.String,System.Boolean)">
+            <summary>
+            Locate a Session context from its handle
+            </summary>
+            <remarks>Creates the session context if it does not exist.</remarks>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.AvatarAppearance">
-            <summary>Raised when the simulator sends us data containing
-            the appearance information for an agent</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.cClient_OnComplete(OpenMetaverse.Http.CapsClient,OpenMetaverse.StructuredData.OSD,System.Exception)">
+            <summary>
+            Handle completion of main voice cap request.
+            </summary>
+            <param name="client">
+            </param>
+            <param name="result">
+            </param>
+            <param name="error">
+            </param>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.UUIDNameReply">
-            <summary>Raised when the simulator sends us data containing
-            agent names/id values</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnDaemonRunning">
+            <summary>
+            Daemon has started so connect to it.
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.AvatarInterestsReply">
-            <summary>Raised when the simulator sends us data containing
-            the interests listed in an agents profile</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnDaemonConnected">
+            <summary>
+            The daemon TCP connection is open.
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.AvatarPropertiesReply">
-            <summary>Raised when the simulator sends us data containing
-            profile property information for an agent</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnConnectorCreateResponse(System.Object,OpenMetaverse.Voice.VoiceGateway.VoiceConnectorEventArgs)">
+            <summary>
+            Handle creation of the Connector.
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.AvatarGroupsReply">
-            <summary>Raised when the simulator sends us data containing
-            the group membership an agent is a member of</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnAuxGetRenderDevicesResponse(System.Object,OpenMetaverse.Voice.VoiceGateway.VoiceDevicesEventArgs)">
+            <summary>
+            Handle response to audio output device query
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.AvatarPickerReply">
-            <summary>Raised when the simulator sends us data containing
-            name/id pair</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnAuxGetCaptureDevicesResponse(System.Object,OpenMetaverse.Voice.VoiceGateway.VoiceDevicesEventArgs)">
+            <summary>
+            Handle response to audio input device query
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.ViewerEffectPointAt">
-            <summary>Raised when the simulator sends us data containing
-            the objects and effect when an agent is pointing at</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.ParcelChanged">
+            <summary>
+            Set voice channel for new parcel
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.ViewerEffectLookAt">
-            <summary>Raised when the simulator sends us data containing
-            the objects and effect when an agent is looking at</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.RequestParcelInfo(System.Uri)">
+            <summary>
+            Request info from a parcel capability Uri.
+            </summary>
+            <param name="cap">
+            </param>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.ViewerEffect">
-            <summary>Raised when the simulator sends us data containing
-            an agents viewer effect information</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.pCap_OnComplete(OpenMetaverse.Http.CapsClient,OpenMetaverse.StructuredData.OSD,System.Exception)">
+            <summary>
+            Receive parcel voice cap
+            </summary>
+            <param name="client">
+            </param>
+            <param name="result">
+            </param>
+            <param name="error">
+            </param>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.AvatarPicksReply">
-            <summary>Raised when the simulator sends us data containing
-            the top picks from an agents profile</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.UpdatePosition(OpenMetaverse.AgentManager)">
+            <summary>
+            Tell Vivox where we are standing
+            </summary>
+            <remarks>This has to be called when we move or turn.</remarks>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.PickInfoReply">
-            <summary>Raised when the simulator sends us data containing
-            the Pick details</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.PosUpdating(System.Boolean)">
+            <summary>
+            Start and stop updating out position.
+            </summary>
+            <param name="go">
+            </param>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.AvatarClassifiedReply">
-            <summary>Raised when the simulator sends us data containing
-            the classified ads an agent has placed</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.StartDaemon(System.String,System.String)">
+            <summary>
+            Starts a thread that keeps the daemon running
+            </summary>
+            <param name="path">
+            </param>
+            <param name="args">
+            </param>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.ClassifiedInfoReply">
-            <summary>Raised when the simulator sends us data containing
-            the details of a classified ad</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.StopDaemon">
+            <summary>
+            Stops the daemon and the thread keeping it running
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.AvatarAnimationEventArgs">
-             <summary>Provides data for the <see cref="E:OpenMetaverse.AvatarManager.AvatarAnimation"/> event</summary>
-             <remarks>The <see cref="E:OpenMetaverse.AvatarManager.AvatarAnimation"/> event occurs when the simulator sends
-             the animation playlist for an agent</remarks>
-             <example>
-             The following code example uses the <see cref="P:OpenMetaverse.AvatarAnimationEventArgs.AvatarID"/> and <see cref="P:OpenMetaverse.AvatarAnimationEventArgs.Animations"/>
-             properties to display the animation playlist of an avatar on the <see cref="T:System.Console"/> window.
-             <code>
-                 // subscribe to the event
-                 Client.Avatars.AvatarAnimation += Avatars_AvatarAnimation;
-                 
-                 private void Avatars_AvatarAnimation(object sender, AvatarAnimationEventArgs e)
-                 {
-                     // create a dictionary of "known" animations from the Animations class using System.Reflection
-                     Dictionary&lt;UUID, string&gt; systemAnimations = new Dictionary&lt;UUID, string&gt;();
-                     Type type = typeof(Animations);
-                     System.Reflection.FieldInfo[] fields = type.GetFields(System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static);
-                     foreach (System.Reflection.FieldInfo field in fields)
-                     {
-                         systemAnimations.Add((UUID)field.GetValue(type), field.Name);
-                     }
-            
-                     // find out which animations being played are known animations and which are assets
-                     foreach (Animation animation in e.Animations)
-                     {
-                         if (systemAnimations.ContainsKey(animation.AnimationID))
-                         {
-                             Console.WriteLine("{0} is playing {1} ({2}) sequence {3}", e.AvatarID,
-                                 systemAnimations[animation.AnimationID], animation.AnimationSequence);
-                         }
-                         else
-                         {
-                             Console.WriteLine("{0} is playing {1} (Asset) sequence {2}", e.AvatarID,
-                                 animation.AnimationID, animation.AnimationSequence);
-                         }
-                     }
-                 }
-             </code>
-             </example>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectToDaemon(System.String,System.Int32)">
+            <summary>
+            </summary>
+            <param name="address">
+            </param>
+            <param name="port">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.AvatarAnimationEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.Animation})">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.SessionCreate(System.String,System.String,System.String,System.String,System.Boolean,System.Boolean,System.String)">
             <summary>
-            Construct a new instance of the AvatarAnimationEventArgs class
+            Create a Session
+            Sessions typically represent a connection to a media session with one or more
+            participants. This is used to generate an �outbound� call to another user or
+            channel. The specifics depend on the media types involved. A session handle is
+            required to control the local user functions within the session (or remote
+            users if the current account has rights to do so). Currently creating a
+            session automatically connects to the audio media, there is no need to call
+            Session.Connect at this time, this is reserved for future use.
             </summary>
-            <param name="avatarID">The ID of the agent</param>
-            <param name="anims">The list of animations to start</param>
+            <param name="AccountHandle">Handle returned from successful Connector �create� request</param>
+            <param name="URI">This is the URI of the terminating point of the session (ie who/what is being called)</param>
+            <param name="Name">This is the display name of the entity being called (user or channel)</param>
+            <param name="Password">Only needs to be supplied when the target URI is password protected</param>
+            <param name="PasswordHashAlgorithm">This indicates the format of the password as passed in. This can either be
+            �ClearText� or �SHA1UserName�. If this element does not exist, it is assumed to be �ClearText�. If it is
+            �SHA1UserName�, the password as passed in is the SHA1 hash of the password and username concatenated together,
+            then base64 encoded, with the final �=� character stripped off.</param>
+            <param name="JoinAudio">
+            </param>
+            <param name="JoinText">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="P:OpenMetaverse.AvatarAnimationEventArgs.AvatarID">
-            <summary>Get the ID of the agent</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.SessionConnect(System.String,System.String)">
+            <summary>
+            Used to accept a call
+            </summary>
+            <param name="SessionHandle">SessionHandle such as received from SessionNewEvent</param>
+            <param name="AudioMedia">"default"</param>
+            <returns>
+            </returns>
         </member>
-        <member name="P:OpenMetaverse.AvatarAnimationEventArgs.Animations">
-            <summary>Get the list of animations to start</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.SessionRenderAudioStart(System.String,System.Boolean)">
+            <summary>
+            This command is used to start the audio render process, which will then play
+            the passed in file through the selected audio render device. This command
+            should not be issued if the user is on a call.
+            </summary>
+            <param name="SoundFilePath">The fully qualified path to the sound file.</param>
+            <param name="Loop">True if the file is to be played continuously and false if it is should be played once.</param>
+            <returns>
+            </returns>
         </member>
-        <member name="T:OpenMetaverse.AvatarAppearanceEventArgs">
-            <summary>Provides data for the <see cref="E:OpenMetaverse.AvatarManager.AvatarAppearance"/> event</summary>
-            <remarks>The <see cref="E:OpenMetaverse.AvatarManager.AvatarAppearance"/> event occurs when the simulator sends
-            the appearance data for an avatar</remarks>
-            <example>
-            The following code example uses the <see cref="P:OpenMetaverse.AvatarAppearanceEventArgs.AvatarID"/> and <see cref="P:OpenMetaverse.AvatarAppearanceEventArgs.VisualParams"/>
-            properties to display the selected shape of an avatar on the <see cref="T:System.Console"/> window.
-            <code>
-                // subscribe to the event
-                Client.Avatars.AvatarAppearance += Avatars_AvatarAppearance;
-            
-                // handle the data when the event is raised
-                void Avatars_AvatarAppearance(object sender, AvatarAppearanceEventArgs e)
-                {
-                    Console.WriteLine("The Agent {0} is using a {1} shape.", e.AvatarID, (e.VisualParams[31] &gt; 0) : "male" ? "female")
-                }
-            </code>
-            </example>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.SessionRenderAudioStop(System.String)">
+            <summary>
+            This command is used to stop the audio render process.
+            </summary>
+            <param name="SoundFilePath">The fully qualified path to the sound file issued in the start render command.</param>
+            <returns>
+            </returns>
         </member>
-        <member name="M:OpenMetaverse.AvatarAppearanceEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,System.Boolean,OpenMetaverse.Primitive.TextureEntryFace,OpenMetaverse.Primitive.TextureEntryFace[],System.Collections.Generic.List{System.Byte})">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.SessionTerminate(System.String)">
             <summary>
-            Construct a new instance of the AvatarAppearanceEventArgs class
+            This is used to �end� an established session (i.e. hang-up or disconnect).
             </summary>
-            <param name="sim">The simulator request was from</param>
-            <param name="avatarID">The ID of the agent</param>
-            <param name="isTrial">true of the agent is a trial account</param>
-            <param name="defaultTexture">The default agent texture</param>
-            <param name="faceTextures">The agents appearance layer textures</param>
-            <param name="visualParams">The <see cref="P:OpenMetaverse.AvatarAppearanceEventArgs.VisualParams"/> for the agent</param>
+            <param name="SessionHandle">Handle returned from successful Session �create� request or a SessionNewEvent</param>
+            <returns>
+            </returns>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.Simulator">
-            <summary>Get the Simulator this request is from of the agent</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.SessionSet3DPosition(System.String,OpenMetaverse.Voice.VoicePosition,OpenMetaverse.Voice.VoicePosition)">
+            <summary>
+            Set the combined speaking and listening position in 3D space.
+            </summary>
+            <param name="SessionHandle">Handle returned from successful Session �create� request or a SessionNewEvent</param>
+            <param name="SpeakerPosition">Speaking position</param>
+            <param name="ListenerPosition">Listening position</param>
+            <returns>
+            </returns>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.AvatarID">
-            <summary>Get the ID of the agent</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.SessionSetParticipantVolumeForMe(System.String,System.String,System.Int32)">
+            <summary>
+            Set User Volume for a particular user. Does not affect how other users hear that user.
+            </summary>
+            <param name="SessionHandle">Handle returned from successful Session �create� request or a SessionNewEvent</param>
+            <param name="ParticipantURI">
+            </param>
+            <param name="Volume">The level of the audio, a number between -100 and 100 where 0 represents �normal� speaking volume</param>
+            <returns>
+            </returns>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.IsTrial">
-            <summary>true if the agent is a trial account</summary>
+        <member name="F:OpenMetaverse.Voice.VoicePosition.Position">
+            <summary>Positional vector of the users position</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.DefaultTexture">
-            <summary>Get the default agent texture</summary>
+        <member name="F:OpenMetaverse.Voice.VoicePosition.Velocity">
+            <summary>Velocity vector of the position</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.FaceTextures">
-            <summary>Get the agents appearance layer textures</summary>
+        <member name="F:OpenMetaverse.Voice.VoicePosition.AtOrientation">
+            <summary>At Orientation (X axis) of the position</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.VisualParams">
-            <summary>Get the <see cref="P:OpenMetaverse.AvatarAppearanceEventArgs.VisualParams"/> for the agent</summary>
+        <member name="F:OpenMetaverse.Voice.VoicePosition.UpOrientation">
+            <summary>Up Orientation (Y axis) of the position</summary>
         </member>
-        <member name="T:OpenMetaverse.AvatarInterestsReplyEventArgs">
-            <summary>Represents the interests from the profile of an agent</summary>
+        <member name="F:OpenMetaverse.Voice.VoicePosition.LeftOrientation">
+            <summary>Left Orientation (Z axis) of the position</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarInterestsReplyEventArgs.AvatarID">
-            <summary>Get the ID of the agent</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceParticipant.IDFromName(System.String)">
+            <summary>
+            Extract the avatar UUID encoded in a SIP URI
+            </summary>
+            <param name="inName">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="T:OpenMetaverse.AvatarPropertiesReplyEventArgs">
-            <summary>The properties of an agent</summary>
+        <member name="T:OpenMetaverse.Voice.VoiceSession">
+            <summary>
+            Represents a single Voice Session to the Vivox service.
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarPropertiesReplyEventArgs.AvatarID">
-            <summary>Get the ID of the agent</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceSession.Close">
+            <summary>
+            Close this session.
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarGroupsReplyEventArgs.AvatarID">
-            <summary>Get the ID of the agent</summary>
+        <member name="M:OpenMetaverse.Voice.VoiceSession.FindParticipant(System.String)">
+            <summary>
+            Look up an existing Participants in this session
+            </summary>
+            <param name="puri">
+            </param>
+            <returns>
+            </returns>
         </member>
-        <member name="P:OpenMetaverse.AvatarPicksReplyEventArgs.AvatarID">
-            <summary>Get the ID of the agent</summary>
+        <member name="T:OpenMetaverse.DictionaryChangeCallback">
+            <summary>
+            </summary>
+            <param name="action">
+            </param>
+            <param name="entry">
+            </param>
         </member>
-        <member name="P:OpenMetaverse.AvatarClassifiedReplyEventArgs.AvatarID">
-            <summary>Get the ID of the avatar</summary>
+        <member name="T:OpenMetaverse.TextureDownloadCallback">
+            <summary>
+            A callback fired to indicate the status or final state of the requested texture. For progressive
+            downloads this will fire each time new asset data is returned from the simulator.
+            </summary>
+            <param name="state">The <see cref="T:OpenMetaverse.TextureRequestState" /> indicating either Progress for textures not fully downloaded,
+            or the final result of the request after it has been processed through the TexturePipeline</param>
+            <param name="assetTexture">The <see cref="T:OpenMetaverse.Assets.AssetTexture" /> object containing the Assets ID, raw data
+            and other information. For progressive rendering the <see cref="F:OpenMetaverse.Assets.Asset.AssetData" /> will contain
+            the data from the beginning of the file. For failed, aborted and timed out requests it will contain
+            an empty byte array.</param>
         </member>
     </members>
 </doc>
diff --git a/bin/OpenMetaverseTypes.XML b/bin/OpenMetaverseTypes.XML
index befc8d4..ce1298e 100644
--- a/bin/OpenMetaverseTypes.XML
+++ b/bin/OpenMetaverseTypes.XML
@@ -1,131 +1,239 @@
 <?xml version="1.0"?>
 <doc>
     <assembly>
-        <name>OpenMetaverseTypes</name>
+        <name>/home/root/libomv-0.9.1-source/bin/OpenMetaverseTypes</name>
     </assembly>
     <members>
-        <member name="T:OpenMetaverse.Vector3d">
+        <member name="T:OpenMetaverse.BlockingQueue`1">
             <summary>
-            A three-dimensional vector with doubleing-point values
+            Same as Queue except Dequeue function blocks until there is an object to return.
+            Note: This class does not need to be synchronized
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Vector3d.X">
-            <summary>X value</summary>
+        <member name="M:OpenMetaverse.BlockingQueue`1.#ctor(System.Collections.Generic.IEnumerable{`0})">
+            <summary>
+            Create new BlockingQueue.
+            </summary>
+            <param name="col">The System.Collections.ICollection to copy elements from</param>
         </member>
-        <member name="F:OpenMetaverse.Vector3d.Y">
-            <summary>Y value</summary>
+        <member name="M:OpenMetaverse.BlockingQueue`1.#ctor(System.Int32)">
+            <summary>
+            Create new BlockingQueue.
+            </summary>
+            <param name="capacity">The initial number of elements that the queue can contain</param>
         </member>
-        <member name="F:OpenMetaverse.Vector3d.Z">
-            <summary>Z value</summary>
+        <member name="M:OpenMetaverse.BlockingQueue`1.#ctor">
+            <summary>
+            Create new BlockingQueue.
+            </summary>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.#ctor(System.Byte[],System.Int32)">
+        <member name="P:OpenMetaverse.BlockingQueue`1.Closed">
             <summary>
-            Constructor, builds a vector from a byte array
+            Gets flag indicating if queue has been closed.
             </summary>
-            <param name="byteArray">Byte array containing three eight-byte doubles</param>
-            <param name="pos">Beginning position in the byte array</param>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.ApproxEquals(OpenMetaverse.Vector3d,System.Double)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Finalize">
             <summary>
-            Test if this vector is equal to another vector, within a given
-            tolerance range
+            BlockingQueue Destructor (Close queue, resume any waiting thread).
             </summary>
-            <param name="vec">Vector to test against</param>
-            <param name="tolerance">The acceptable magnitude of difference
-            between the two vectors</param>
-            <returns>True if the magnitude of difference between the two vectors
-            is less than the given tolerance, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.CompareTo(OpenMetaverse.Vector3d)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Clear">
             <summary>
-            IComparable.CompareTo implementation
+            Remove all objects from the Queue.
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.IsFinite">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Close">
             <summary>
-            Test if this vector is composed of all finite numbers
+            Remove all objects from the Queue, resume all dequeue threads.
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.FromBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue">
             <summary>
-            Builds a vector from a byte array
+            Removes and returns the object at the beginning of the Queue.
             </summary>
-            <param name="byteArray">Byte array containing a 24 byte vector</param>
-            <param name="pos">Beginning position in the byte array</param>
+            <returns>Object in queue.</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.GetBytes">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue(System.TimeSpan)">
             <summary>
-            Returns the raw bytes for this vector
+            Removes and returns the object at the beginning of the Queue.
             </summary>
-            <returns>A 24 byte array containing X, Y, and Z</returns>
+            <param name="timeout">time to wait before returning</param>
+            <returns>Object in queue.</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.ToBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue(System.Int32)">
             <summary>
-            Writes the raw bytes for this vector to a byte array
+            Removes and returns the object at the beginning of the Queue.
             </summary>
-            <param name="dest">Destination byte array</param>
-            <param name="pos">Position in the destination array to start
-            writing. Must be at least 24 bytes before the end of the array</param>
+            <param name="timeout">time to wait before returning (in milliseconds)</param>
+            <returns>Object in queue.</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.Parse(System.String)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Enqueue(`0)">
             <summary>
-            Parse a vector from a string
+            Adds an object to the end of the Queue
             </summary>
-            <param name="val">A string representation of a 3D vector, enclosed 
-            in arrow brackets and separated by commas</param>
+            <param name="obj">Object to put in queue</param>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.SmoothStep(OpenMetaverse.Vector3d,OpenMetaverse.Vector3d,System.Double)">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Open">
             <summary>
-            Interpolates between two vectors using a cubic equation
+            Open Queue.
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.ToString">
+        <member name="M:OpenMetaverse.CircularQueue`1.#ctor(OpenMetaverse.CircularQueue{`0})">
             <summary>
-            Get a formatted string representation of the vector
+            Copy constructor
             </summary>
-            <returns>A string representation of the vector</returns>
+            <param name="queue">Circular queue to copy</param>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.ToRawString">
+        <member name="T:OpenMetaverse.Color4">
             <summary>
-            Get a string representation of the vector elements with up to three
-            decimal digits and separated by spaces only
+            An 8-bit color structure including an alpha channel
             </summary>
-            <returns>Raw string representation of the vector</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.op_Modulus(OpenMetaverse.Vector3d,OpenMetaverse.Vector3d)">
+        <member name="M:OpenMetaverse.Color4.#ctor(System.Byte,System.Byte,System.Byte,System.Byte)">
             <summary>
-            Cross product between two vectors
             </summary>
+            <param name="r">
+            </param>
+            <param name="g">
+            </param>
+            <param name="b">
+            </param>
+            <param name="a">
+            </param>
         </member>
-        <member name="F:OpenMetaverse.Vector3d.Zero">
-            <summary>A vector with a value of 0,0,0</summary>
+        <member name="M:OpenMetaverse.Color4.#ctor(System.Byte[],System.Int32,System.Boolean)">
+            <summary>
+            Builds a color from a byte array
+            </summary>
+            <param name="byteArray">Byte array containing a 16 byte color</param>
+            <param name="pos">Beginning position in the byte array</param>
+            <param name="inverted">True if the byte array stores inverted values,
+            otherwise false. For example the color black (fully opaque) inverted
+            would be 0xFF 0xFF 0xFF 0x00</param>
         </member>
-        <member name="F:OpenMetaverse.Vector3d.One">
-            <summary>A vector with a value of 1,1,1</summary>
+        <member name="M:OpenMetaverse.Color4.#ctor(System.Byte[],System.Int32,System.Boolean,System.Boolean)">
+            <summary>
+            Returns the raw bytes for this vector
+            </summary>
+            <param name="byteArray">Byte array containing a 16 byte color</param>
+            <param name="pos">Beginning position in the byte array</param>
+            <param name="inverted">True if the byte array stores inverted values,
+            otherwise false. For example the color black (fully opaque) inverted
+            would be 0xFF 0xFF 0xFF 0x00</param>
+            <param name="alphaInverted">True if the alpha value is inverted in
+            addition to whatever the inverted parameter is. Setting inverted true
+            and alphaInverted true will flip the alpha value back to non-inverted,
+            but keep the other color bytes inverted</param>
+            <returns>A 16 byte array containing R, G, B, and A</returns>
         </member>
-        <member name="F:OpenMetaverse.Vector3d.UnitX">
-            <summary>A unit vector facing forward (X axis), value of 1,0,0</summary>
+        <member name="M:OpenMetaverse.Color4.#ctor(OpenMetaverse.Color4)">
+            <summary>
+            Copy constructor
+            </summary>
+            <param name="color">Color to copy</param>
         </member>
-        <member name="F:OpenMetaverse.Vector3d.UnitY">
-            <summary>A unit vector facing left (Y axis), value of 0,1,0</summary>
+        <member name="F:OpenMetaverse.Color4.R">
+            <summary>Red</summary>
         </member>
-        <member name="F:OpenMetaverse.Vector3d.UnitZ">
-            <summary>A unit vector facing up (Z axis), value of 0,0,1</summary>
+        <member name="F:OpenMetaverse.Color4.G">
+            <summary>Green</summary>
+        </member>
+        <member name="F:OpenMetaverse.Color4.B">
+            <summary>Blue</summary>
+        </member>
+        <member name="F:OpenMetaverse.Color4.A">
+            <summary>Alpha</summary>
+        </member>
+        <member name="F:OpenMetaverse.Color4.Black">
+            <summary>A Color4 with zero RGB values and fully opaque (alpha 1.0)</summary>
+        </member>
+        <member name="F:OpenMetaverse.Color4.White">
+            <summary>A Color4 with full RGB values (1.0) and fully opaque (alpha 1.0)</summary>
+        </member>
+        <member name="M:OpenMetaverse.Color4.CompareTo(OpenMetaverse.Color4)">
+            <summary>
+            IComparable.CompareTo implementation
+            </summary>
+            <remarks>Sorting ends up like this: |--Grayscale--||--Color--|.
+            Alpha is only used when the colors are otherwise equivalent</remarks>
+        </member>
+        <member name="M:OpenMetaverse.Color4.FromBytes(System.Byte[],System.Int32,System.Boolean,System.Boolean)">
+            <summary>
+            Builds a color from a byte array
+            </summary>
+            <param name="byteArray">Byte array containing a 16 byte color</param>
+            <param name="pos">Beginning position in the byte array</param>
+            <param name="inverted">True if the byte array stores inverted values,
+            otherwise false. For example the color black (fully opaque) inverted
+            would be 0xFF 0xFF 0xFF 0x00</param>
+            <param name="alphaInverted">True if the alpha value is inverted in
+            addition to whatever the inverted parameter is. Setting inverted true
+            and alphaInverted true will flip the alpha value back to non-inverted,
+            but keep the other color bytes inverted</param>
+        </member>
+        <member name="M:OpenMetaverse.Color4.ToBytes(System.Byte[],System.Int32)">
+            <summary>
+            Writes the raw bytes for this color to a byte array
+            </summary>
+            <param name="dest">Destination byte array</param>
+            <param name="pos">Position in the destination array to start
+            writing. Must be at least 16 bytes before the end of the array</param>
+        </member>
+        <member name="M:OpenMetaverse.Color4.ToBytes(System.Byte[],System.Int32,System.Boolean)">
+            <summary>
+            Serializes this color into four bytes in a byte array
+            </summary>
+            <param name="dest">Destination byte array</param>
+            <param name="pos">Position in the destination array to start
+            writing. Must be at least 4 bytes before the end of the array</param>
+            <param name="inverted">True to invert the output (1.0 becomes 0
+            instead of 255)</param>
+        </member>
+        <member name="M:OpenMetaverse.Color4.ToFloatBytes(System.Byte[],System.Int32)">
+            <summary>
+            Writes the raw bytes for this color to a byte array
+            </summary>
+            <param name="dest">Destination byte array</param>
+            <param name="pos">Position in the destination array to start
+            writing. Must be at least 16 bytes before the end of the array</param>
+        </member>
+        <member name="M:OpenMetaverse.Color4.ClampValues">
+            <summary>
+            Ensures that values are in range 0-1
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Color4.FromHSV(System.Double,System.Double,System.Double)">
+            <summary>
+            Create an RGB color from a hue, saturation, value combination
+            </summary>
+            <param name="hue">Hue</param>
+            <param name="saturation">Saturation</param>
+            <param name="value">Value</param>
+            <returns>An fully opaque RGB color (alpha is 1.0)</returns>
+        </member>
+        <member name="M:OpenMetaverse.Color4.Lerp(OpenMetaverse.Color4,OpenMetaverse.Color4,System.Single)">
+            <summary>
+            Performs linear interpolation between two colors
+            </summary>
+            <param name="value1">Color to start at</param>
+            <param name="value2">Color to end at</param>
+            <param name="amount">Amount to interpolate</param>
+            <returns>The interpolated color</returns>
         </member>
         <member name="T:OpenMetaverse.EnumInfoAttribute">
             <summary>
             Attribute class that allows extra attributes to be attached to ENUMs
             </summary>
         </member>
-        <member name="F:OpenMetaverse.EnumInfoAttribute.Text">
-            <summary>Text used when presenting ENUM to user</summary>
-        </member>
         <member name="M:OpenMetaverse.EnumInfoAttribute.#ctor">
             <summary>Default initializer</summary>
         </member>
         <member name="M:OpenMetaverse.EnumInfoAttribute.#ctor(System.String)">
             <summary>Text used when presenting ENUM to user</summary>
         </member>
+        <member name="F:OpenMetaverse.EnumInfoAttribute.Text">
+            <summary>Text used when presenting ENUM to user</summary>
+        </member>
         <member name="T:OpenMetaverse.AssetType">
             <summary>
             The different types of grid assets
@@ -147,11 +255,11 @@
             <summary>Link to a location in world</summary>
         </member>
         <member name="F:OpenMetaverse.AssetType.Clothing">
-            <summary>Collection of textures and parameters that can be 
+            <summary>Collection of textures and parameters that can be
             worn by an avatar</summary>
         </member>
         <member name="F:OpenMetaverse.AssetType.Object">
-            <summary>Primitive that can contain textures, sounds, 
+            <summary>Primitive that can contain textures, sounds,
             scripts and more</summary>
         </member>
         <member name="F:OpenMetaverse.AssetType.Notecard">
@@ -259,34 +367,42 @@
             <summary>Notecard</summary>
         </member>
         <member name="F:OpenMetaverse.InventoryType.Category">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.InventoryType.Folder">
             <summary>Folder</summary>
         </member>
         <member name="F:OpenMetaverse.InventoryType.RootCategory">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.InventoryType.LSL">
             <summary>an LSL Script</summary>
         </member>
         <member name="F:OpenMetaverse.InventoryType.Snapshot">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.InventoryType.Attachment">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.InventoryType.Wearable">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.InventoryType.Animation">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.InventoryType.Gesture">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="F:OpenMetaverse.InventoryType.Mesh">
-            <summary></summary>
+            <summary>
+            </summary>
         </member>
         <member name="T:OpenMetaverse.SaleType">
             <summary>
@@ -355,107 +471,691 @@
         <member name="F:OpenMetaverse.WearableType.Tattoo">
             <summary>Tattoo</summary>
         </member>
+        <member name="F:OpenMetaverse.WearableType.Physics">
+            <summary>Physics</summary>
+        </member>
         <member name="F:OpenMetaverse.WearableType.Invalid">
             <summary>Invalid wearable asset</summary>
         </member>
-        <member name="T:OpenMetaverse.TokenBucket">
+        <member name="T:OpenMetaverse.PCode">
             <summary>
-            A hierarchical token bucket for bandwidth throttling. See
-            http://en.wikipedia.org/wiki/Token_bucket for more information
+            Identifier code for primitive types
             </summary>
         </member>
-        <member name="F:OpenMetaverse.TokenBucket.parent">
-            <summary>Parent bucket to this bucket, or null if this is a root
-            bucket</summary>
+        <member name="F:OpenMetaverse.PCode.None">
+            <summary>None</summary>
         </member>
-        <member name="F:OpenMetaverse.TokenBucket.maxBurst">
-            <summary>Size of the bucket in bytes. If zero, the bucket has 
-            infinite capacity</summary>
+        <member name="F:OpenMetaverse.PCode.Prim">
+            <summary>A Primitive</summary>
         </member>
-        <member name="F:OpenMetaverse.TokenBucket.tokensPerMS">
-            <summary>Rate that the bucket fills, in bytes per millisecond. If
-            zero, the bucket always remains full</summary>
+        <member name="F:OpenMetaverse.PCode.Avatar">
+            <summary>A Avatar</summary>
         </member>
-        <member name="F:OpenMetaverse.TokenBucket.content">
-            <summary>Number of tokens currently in the bucket</summary>
+        <member name="F:OpenMetaverse.PCode.Grass">
+            <summary>Linden grass</summary>
         </member>
-        <member name="F:OpenMetaverse.TokenBucket.lastDrip">
-            <summary>Time of the last drip, in system ticks</summary>
+        <member name="F:OpenMetaverse.PCode.NewTree">
+            <summary>Linden tree</summary>
         </member>
-        <member name="M:OpenMetaverse.TokenBucket.#ctor(OpenMetaverse.TokenBucket,System.Int32,System.Int32)">
+        <member name="F:OpenMetaverse.PCode.ParticleSystem">
+            <summary>A primitive that acts as the source for a particle stream</summary>
+        </member>
+        <member name="F:OpenMetaverse.PCode.Tree">
+            <summary>A Linden tree</summary>
+        </member>
+        <member name="T:OpenMetaverse.PrimFlags">
             <summary>
-            Default constructor
+            Primary parameters for primitives such as Physics Enabled or Phantom
             </summary>
-            <param name="parent">Parent bucket if this is a child bucket, or
-            null if this is a root bucket</param>
-            <param name="maxBurst">Maximum size of the bucket in bytes, or
-            zero if this bucket has no maximum capacity</param>
-            <param name="dripRate">Rate that the bucket fills, in bytes per
-            second. If zero, the bucket always remains full</param>
         </member>
-        <member name="M:OpenMetaverse.TokenBucket.RemoveTokens(System.Int32)">
+        <member name="F:OpenMetaverse.PrimFlags.None">
+            <summary>Deprecated</summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.Physics">
+            <summary>Whether physics are enabled for this object</summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.CreateSelected">
             <summary>
-            Remove a given number of tokens from the bucket
             </summary>
-            <param name="amount">Number of tokens to remove from the bucket</param>
-            <returns>True if the requested number of tokens were removed from
-            the bucket, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.TokenBucket.RemoveTokens(System.Int32,System.Boolean@)">
+        <member name="F:OpenMetaverse.PrimFlags.ObjectModify">
             <summary>
-            Remove a given number of tokens from the bucket
             </summary>
-            <param name="amount">Number of tokens to remove from the bucket</param>
-            <param name="dripSucceeded">True if tokens were added to the bucket
-            during this call, otherwise false</param>
-            <returns>True if the requested number of tokens were removed from
-            the bucket, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.TokenBucket.Drip">
+        <member name="F:OpenMetaverse.PrimFlags.ObjectCopy">
             <summary>
-            Add tokens to the bucket over time. The number of tokens added each
-            call depends on the length of time that has passed since the last 
-            call to Drip
             </summary>
-            <returns>True if tokens were added to the bucket, otherwise false</returns>
         </member>
-        <member name="P:OpenMetaverse.TokenBucket.Parent">
+        <member name="F:OpenMetaverse.PrimFlags.ObjectAnyOwner">
             <summary>
-            The parent bucket of this bucket, or null if this bucket has no
-            parent. The parent bucket will limit the aggregate bandwidth of all
-            of its children buckets
             </summary>
         </member>
-        <member name="P:OpenMetaverse.TokenBucket.MaxBurst">
+        <member name="F:OpenMetaverse.PrimFlags.ObjectYouOwner">
             <summary>
-            Maximum burst rate in bytes per second. This is the maximum number
-            of tokens that can accumulate in the bucket at any one time
             </summary>
         </member>
-        <member name="P:OpenMetaverse.TokenBucket.DripRate">
+        <member name="F:OpenMetaverse.PrimFlags.Scripted">
             <summary>
-            The speed limit of this bucket in bytes per second. This is the
-            number of tokens that are added to the bucket per second
             </summary>
-            <remarks>Tokens are added to the bucket any time 
-            <seealso cref="M:OpenMetaverse.TokenBucket.RemoveTokens(System.Int32)"/> is called, at the granularity of
-            the system tick interval (typically around 15-22ms)</remarks>
         </member>
-        <member name="P:OpenMetaverse.TokenBucket.Content">
+        <member name="F:OpenMetaverse.PrimFlags.Touch">
+            <summary>Whether this object contains an active touch script</summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.ObjectMove">
             <summary>
-            The number of bytes that can be sent at this moment. This is the
-            current number of tokens in the bucket
-            <remarks>If this bucket has a parent bucket that does not have
-            enough tokens for a request, <seealso cref="M:OpenMetaverse.TokenBucket.RemoveTokens(System.Int32)"/> will 
-            return false regardless of the content of this bucket</remarks>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.Money">
+            <summary>Whether this object can receive payments</summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.Phantom">
+            <summary>Whether this object is phantom (no collisions)</summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.InventoryEmpty">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.JointHinge">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.JointP2P">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.JointLP2P">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.JointWheel">
+            <summary>Deprecated</summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.AllowInventoryDrop">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.ObjectTransfer">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.ObjectGroupOwned">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.ObjectYouOfficer">
+            <summary>Deprecated</summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.CameraDecoupled">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.AnimSource">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.CameraSource">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.CastShadows">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.DieAtEdge">
+            <summary>Server flag, will not be sent to clients. Specifies that
+            the object is destroyed when it touches a simulator edge</summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.ReturnAtEdge">
+            <summary>Server flag, will not be sent to clients. Specifies that
+            the object will be returned to the owner's inventory when it
+            touches a simulator edge</summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.Sandbox">
+            <summary>Server flag, will not be sent to clients.</summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.Flying">
+            <summary>Server flag, will not be sent to client. Specifies that
+            the object is hovering/flying</summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.ObjectOwnerModify">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.TemporaryOnRez">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.Temporary">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.PrimFlags.ZlibCompressed">
+            <summary>
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.SoundFlags">
+            <summary>
+            Sound flags for sounds attached to primitives
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.SoundFlags.None">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.SoundFlags.Loop">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.SoundFlags.SyncMaster">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.SoundFlags.SyncSlave">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.SoundFlags.SyncPending">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.SoundFlags.Queue">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.SoundFlags.Stop">
+            <summary>
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.Material">
+            <summary>
+            Material type for a primitive
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Material.Stone">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Material.Metal">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Material.Glass">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Material.Wood">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Material.Flesh">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Material.Plastic">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Material.Rubber">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Material.Light">
+            <summary>
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.PrimType">
+            <summary>
+            Used in a helper function to roughly determine prim shape
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.ExtraParamType">
+            <summary>
+            Extra parameters for primitives, these flags are for features that have
+            been added after the original ObjectFlags that has all eight bits
+            reserved already
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ExtraParamType.Flexible">
+            <summary>Whether this object has flexible parameters</summary>
+        </member>
+        <member name="F:OpenMetaverse.ExtraParamType.Light">
+            <summary>Whether this object has light parameters</summary>
+        </member>
+        <member name="F:OpenMetaverse.ExtraParamType.Sculpt">
+            <summary>Whether this object is a sculpted prim</summary>
+        </member>
+        <member name="F:OpenMetaverse.ExtraParamType.Mesh">
+            <summary>Whether this object is a mesh</summary>
+        </member>
+        <member name="T:OpenMetaverse.JointType">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.JointType.Invalid">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.JointType.Hinge">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.JointType.Point">
+            <summary>
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.SculptType">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.SculptType.None">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.SculptType.Sphere">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.SculptType.Torus">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.SculptType.Plane">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.SculptType.Cylinder">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.SculptType.Mesh">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.SculptType.Invert">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.SculptType.Mirror">
+            <summary>
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.FaceType">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.FaceType.PathBegin">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.FaceType.PathEnd">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.FaceType.InnerSide">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.FaceType.ProfileBegin">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.FaceType.ProfileEnd">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.FaceType.OuterSide0">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.FaceType.OuterSide1">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.FaceType.OuterSide2">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.FaceType.OuterSide3">
+            <summary>
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.ObjectCategory">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ObjectCategory.Invalid">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ObjectCategory.None">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ObjectCategory.Owner">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ObjectCategory.Group">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ObjectCategory.Other">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ObjectCategory.Selected">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ObjectCategory.Temporary">
+            <summary>
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.AttachmentPoint">
+            <summary>
+            Attachment points for objects on avatar bodies
+            </summary>
+            <remarks>
+            Both InventoryObject and InventoryAttachment types can be attached
+            </remarks>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.Default">
+            <summary>Right hand if object was not previously attached</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.Chest">
+            <summary>Chest</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.Skull">
+            <summary>Skull</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.LeftShoulder">
+            <summary>Left shoulder</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.RightShoulder">
+            <summary>Right shoulder</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.LeftHand">
+            <summary>Left hand</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.RightHand">
+            <summary>Right hand</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.LeftFoot">
+            <summary>Left foot</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.RightFoot">
+            <summary>Right foot</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.Spine">
+            <summary>Spine</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.Pelvis">
+            <summary>Pelvis</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.Mouth">
+            <summary>Mouth</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.Chin">
+            <summary>Chin</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.LeftEar">
+            <summary>Left ear</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.RightEar">
+            <summary>Right ear</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.LeftEyeball">
+            <summary>Left eyeball</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.RightEyeball">
+            <summary>Right eyeball</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.Nose">
+            <summary>Nose</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.RightUpperArm">
+            <summary>Right upper arm</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.RightForearm">
+            <summary>Right forearm</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.LeftUpperArm">
+            <summary>Left upper arm</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.LeftForearm">
+            <summary>Left forearm</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.RightHip">
+            <summary>Right hip</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.RightUpperLeg">
+            <summary>Right upper leg</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.RightLowerLeg">
+            <summary>Right lower leg</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.LeftHip">
+            <summary>Left hip</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.LeftUpperLeg">
+            <summary>Left upper leg</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.LeftLowerLeg">
+            <summary>Left lower leg</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.Stomach">
+            <summary>Stomach</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.LeftPec">
+            <summary>Left pectoral</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.RightPec">
+            <summary>Right pectoral</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.HUDCenter2">
+            <summary>HUD Center position 2</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.HUDTopRight">
+            <summary>HUD Top-right</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.HUDTop">
+            <summary>HUD Top</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.HUDTopLeft">
+            <summary>HUD Top-left</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.HUDCenter">
+            <summary>HUD Center</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.HUDBottomLeft">
+            <summary>HUD Bottom-left</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.HUDBottom">
+            <summary>HUD Bottom</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.HUDBottomRight">
+            <summary>HUD Bottom-right</summary>
+        </member>
+        <member name="T:OpenMetaverse.Tree">
+            <summary>
+            Tree foliage types
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Tree.Pine1">
+            <summary>Pine1 tree</summary>
+        </member>
+        <member name="F:OpenMetaverse.Tree.Oak">
+            <summary>Oak tree</summary>
+        </member>
+        <member name="F:OpenMetaverse.Tree.TropicalBush1">
+            <summary>Tropical Bush1</summary>
+        </member>
+        <member name="F:OpenMetaverse.Tree.Palm1">
+            <summary>Palm1 tree</summary>
+        </member>
+        <member name="F:OpenMetaverse.Tree.Dogwood">
+            <summary>Dogwood tree</summary>
+        </member>
+        <member name="F:OpenMetaverse.Tree.TropicalBush2">
+            <summary>Tropical Bush2</summary>
+        </member>
+        <member name="F:OpenMetaverse.Tree.Palm2">
+            <summary>Palm2 tree</summary>
+        </member>
+        <member name="F:OpenMetaverse.Tree.Cypress1">
+            <summary>Cypress1 tree</summary>
+        </member>
+        <member name="F:OpenMetaverse.Tree.Cypress2">
+            <summary>Cypress2 tree</summary>
+        </member>
+        <member name="F:OpenMetaverse.Tree.Pine2">
+            <summary>Pine2 tree</summary>
+        </member>
+        <member name="F:OpenMetaverse.Tree.Plumeria">
+            <summary>Plumeria</summary>
+        </member>
+        <member name="F:OpenMetaverse.Tree.WinterPine1">
+            <summary>Winter pinetree1</summary>
+        </member>
+        <member name="F:OpenMetaverse.Tree.WinterAspen">
+            <summary>Winter Aspen tree</summary>
+        </member>
+        <member name="F:OpenMetaverse.Tree.WinterPine2">
+            <summary>Winter pinetree2</summary>
+        </member>
+        <member name="F:OpenMetaverse.Tree.Eucalyptus">
+            <summary>Eucalyptus tree</summary>
+        </member>
+        <member name="F:OpenMetaverse.Tree.Fern">
+            <summary>Fern</summary>
+        </member>
+        <member name="F:OpenMetaverse.Tree.Eelgrass">
+            <summary>Eelgrass</summary>
+        </member>
+        <member name="F:OpenMetaverse.Tree.SeaSword">
+            <summary>Sea Sword</summary>
+        </member>
+        <member name="F:OpenMetaverse.Tree.Kelp1">
+            <summary>Kelp1 plant</summary>
+        </member>
+        <member name="F:OpenMetaverse.Tree.BeachGrass1">
+            <summary>Beach grass</summary>
+        </member>
+        <member name="F:OpenMetaverse.Tree.Kelp2">
+            <summary>Kelp2 plant</summary>
+        </member>
+        <member name="T:OpenMetaverse.Grass">
+            <summary>
+            Grass foliage types
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Grass.Grass0">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Grass.Grass1">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Grass.Grass2">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Grass.Grass3">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Grass.Grass4">
+            <summary>
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Grass.Undergrowth1">
+            <summary>
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.ClickAction">
+            <summary>
+            Action associated with clicking on an object
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.ClickAction.Touch">
+            <summary>Touch object</summary>
+        </member>
+        <member name="F:OpenMetaverse.ClickAction.Sit">
+            <summary>Sit on object</summary>
+        </member>
+        <member name="F:OpenMetaverse.ClickAction.Buy">
+            <summary>Purchase object or contents</summary>
+        </member>
+        <member name="F:OpenMetaverse.ClickAction.Pay">
+            <summary>Pay the object</summary>
+        </member>
+        <member name="F:OpenMetaverse.ClickAction.OpenTask">
+            <summary>Open task inventory</summary>
+        </member>
+        <member name="F:OpenMetaverse.ClickAction.PlayMedia">
+            <summary>Play parcel media</summary>
+        </member>
+        <member name="F:OpenMetaverse.ClickAction.OpenMedia">
+            <summary>Open parcel media</summary>
+        </member>
+        <member name="T:OpenMetaverse.PhysicsShapeType">
+            <summary>
+            Type of physics representation used for this prim in the simulator
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.PhysicsShapeType.Prim">
+            <summary>Use prim physics form this object</summary>
+        </member>
+        <member name="F:OpenMetaverse.PhysicsShapeType.None">
+            <summary>No physics, prim doesn't collide</summary>
+        </member>
+        <member name="F:OpenMetaverse.PhysicsShapeType.ConvexHull">
+            <summary>Use convex hull represantion of this prim</summary>
+        </member>
+        <member name="F:OpenMetaverse.ExpiringCache`2.syncRoot">
+            <summary>For thread safety</summary>
+        </member>
+        <member name="F:OpenMetaverse.ExpiringCache`2.isPurging">
+            <summary>For thread safety</summary>
+        </member>
+        <member name="M:OpenMetaverse.ExpiringCache`2.PurgeCache(System.Object,System.Timers.ElapsedEventArgs)">
+            <summary>
+            Purges expired objects from the cache. Called automatically by the purge timer.
             </summary>
         </member>
         <member name="T:OpenMetaverse.LocklessQueue`1">
             <summary>
-            A thread-safe lockless queue that supports multiple readers and 
+            A thread-safe lockless queue that supports multiple readers and
             multiple writers
             </summary>
         </member>
+        <member name="M:OpenMetaverse.LocklessQueue`1.#ctor">
+            <summary>
+            Constructor
+            </summary>
+        </member>
+        <member name="T:OpenMetaverse.LocklessQueue`1.SingleLinkNode">
+            <summary>
+            Provides a node container for data in a singly linked list
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.LocklessQueue`1.SingleLinkNode.#ctor">
+            <summary>
+            Constructor
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.LocklessQueue`1.SingleLinkNode.#ctor(`0)">
+            <summary>
+            Constructor
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.LocklessQueue`1.SingleLinkNode.Next">
+            <summary>Pointer to the next node in list</summary>
+        </member>
+        <member name="F:OpenMetaverse.LocklessQueue`1.SingleLinkNode.Item">
+            <summary>The data contained by the node</summary>
+        </member>
         <member name="F:OpenMetaverse.LocklessQueue`1.head">
             <summary>Queue head</summary>
         </member>
@@ -465,10 +1165,10 @@
         <member name="F:OpenMetaverse.LocklessQueue`1.count">
             <summary>Queue item count</summary>
         </member>
-        <member name="M:OpenMetaverse.LocklessQueue`1.#ctor">
-            <summary>
-            Constructor
-            </summary>
+        <member name="P:OpenMetaverse.LocklessQueue`1.Count">
+            <summary>Gets the current number of items in the queue. Since this
+            is a lockless collection this value should be treated as a close
+            estimate</summary>
         </member>
         <member name="M:OpenMetaverse.LocklessQueue`1.Enqueue(`0)">
             <summary>
@@ -483,168 +1183,228 @@
             <param name="item">Dequeued item if the dequeue was successful</param>
             <returns>True if an item was successfully deqeued, otherwise false</returns>
         </member>
-        <member name="P:OpenMetaverse.LocklessQueue`1.Count">
-            <summary>Gets the current number of items in the queue. Since this
-            is a lockless collection this value should be treated as a close
-            estimate</summary>
+        <member name="F:OpenMetaverse.Matrix4.Zero">
+            <summary>A 4x4 matrix containing all zeroes</summary>
         </member>
-        <member name="T:OpenMetaverse.LocklessQueue`1.SingleLinkNode">
+        <member name="F:OpenMetaverse.Matrix4.Identity">
+            <summary>A 4x4 identity matrix</summary>
+        </member>
+        <member name="M:OpenMetaverse.Matrix4.GetEulerAngles(System.Single@,System.Single@,System.Single@)">
             <summary>
-            Provides a node container for data in a singly linked list
+            Convert this matrix to euler rotations
             </summary>
+            <param name="roll">X euler angle</param>
+            <param name="pitch">Y euler angle</param>
+            <param name="yaw">Z euler angle</param>
         </member>
-        <member name="F:OpenMetaverse.LocklessQueue`1.SingleLinkNode.Next">
-            <summary>Pointer to the next node in list</summary>
+        <member name="M:OpenMetaverse.Matrix4.GetQuaternion">
+            <summary>
+            Convert this matrix to a quaternion rotation
+            </summary>
+            <returns>A quaternion representation of this rotation matrix</returns>
         </member>
-        <member name="F:OpenMetaverse.LocklessQueue`1.SingleLinkNode.Item">
-            <summary>The data contained by the node</summary>
+        <member name="M:OpenMetaverse.Matrix4.CreateFromEulers(System.Single,System.Single,System.Single)">
+            <summary>
+            Construct a matrix from euler rotation values in radians
+            </summary>
+            <param name="roll">X euler angle in radians</param>
+            <param name="pitch">Y euler angle in radians</param>
+            <param name="yaw">Z euler angle in radians</param>
         </member>
-        <member name="M:OpenMetaverse.LocklessQueue`1.SingleLinkNode.#ctor">
+        <member name="M:OpenMetaverse.Matrix4.ToString">
             <summary>
-            Constructor
+            Get a formatted string representation of the vector
             </summary>
+            <returns>A string representation of the vector</returns>
         </member>
-        <member name="M:OpenMetaverse.LocklessQueue`1.SingleLinkNode.#ctor(`0)">
+        <member name="T:OpenMetaverse.Parallel">
             <summary>
-            Constructor
+            Provides helper methods for parallelizing loops
             </summary>
         </member>
-        <member name="T:OpenMetaverse.Color4">
+        <member name="M:OpenMetaverse.Parallel.For(System.Int32,System.Int32,System.Action{System.Int32})">
             <summary>
-            An 8-bit color structure including an alpha channel
+            Executes a for loop in which iterations may run in parallel
             </summary>
+            <param name="fromInclusive">The loop will be started at this index</param>
+            <param name="toExclusive">The loop will be terminated before this index is reached</param>
+            <param name="body">Method body to run for each iteration of the loop</param>
         </member>
-        <member name="F:OpenMetaverse.Color4.R">
-            <summary>Red</summary>
+        <member name="M:OpenMetaverse.Parallel.For(System.Int32,System.Int32,System.Int32,System.Action{System.Int32})">
+            <summary>
+            Executes a for loop in which iterations may run in parallel
+            </summary>
+            <param name="threadCount">The number of concurrent execution threads to run</param>
+            <param name="fromInclusive">The loop will be started at this index</param>
+            <param name="toExclusive">The loop will be terminated before this index is reached</param>
+            <param name="body">Method body to run for each iteration of the loop</param>
         </member>
-        <member name="F:OpenMetaverse.Color4.G">
-            <summary>Green</summary>
+        <member name="M:OpenMetaverse.Parallel.ForEach``1(System.Collections.Generic.IEnumerable{``0},System.Action{``0})">
+            <summary>
+            Executes a foreach loop in which iterations may run in parallel
+            </summary>
+            <typeparam name="T">Object type that the collection wraps</typeparam>
+            <param name="enumerable">An enumerable collection to iterate over</param>
+            <param name="body">Method body to run for each object in the collection</param>
         </member>
-        <member name="F:OpenMetaverse.Color4.B">
-            <summary>Blue</summary>
+        <member name="M:OpenMetaverse.Parallel.ForEach``1(System.Int32,System.Collections.Generic.IEnumerable{``0},System.Action{``0})">
+            <summary>
+            Executes a foreach loop in which iterations may run in parallel
+            </summary>
+            <typeparam name="T">Object type that the collection wraps</typeparam>
+            <param name="threadCount">The number of concurrent execution threads to run</param>
+            <param name="enumerable">An enumerable collection to iterate over</param>
+            <param name="body">Method body to run for each object in the collection</param>
         </member>
-        <member name="F:OpenMetaverse.Color4.A">
-            <summary>Alpha</summary>
+        <member name="M:OpenMetaverse.Parallel.Invoke(System.Action[])">
+            <summary>
+            Executes a series of tasks in parallel
+            </summary>
+            <param name="actions">A series of method bodies to execute</param>
         </member>
-        <member name="M:OpenMetaverse.Color4.#ctor(System.Byte,System.Byte,System.Byte,System.Byte)">
+        <member name="M:OpenMetaverse.Parallel.Invoke(System.Int32,System.Action[])">
             <summary>
-            
+            Executes a series of tasks in parallel
             </summary>
-            <param name="r"></param>
-            <param name="g"></param>
-            <param name="b"></param>
-            <param name="a"></param>
+            <param name="threadCount">The number of concurrent execution threads to run</param>
+            <param name="actions">A series of method bodies to execute</param>
         </member>
-        <member name="M:OpenMetaverse.Color4.#ctor(System.Byte[],System.Int32,System.Boolean)">
+        <member name="M:OpenMetaverse.Quaternion.#ctor(System.Single,System.Single,System.Single)">
             <summary>
-            Builds a color from a byte array
+            Build a quaternion from normalized float values
             </summary>
-            <param name="byteArray">Byte array containing a 16 byte color</param>
-            <param name="pos">Beginning position in the byte array</param>
-            <param name="inverted">True if the byte array stores inverted values,
-            otherwise false. For example the color black (fully opaque) inverted
-            would be 0xFF 0xFF 0xFF 0x00</param>
+            <param name="x">X value from -1.0 to 1.0</param>
+            <param name="y">Y value from -1.0 to 1.0</param>
+            <param name="z">Z value from -1.0 to 1.0</param>
         </member>
-        <member name="M:OpenMetaverse.Color4.#ctor(System.Byte[],System.Int32,System.Boolean,System.Boolean)">
+        <member name="M:OpenMetaverse.Quaternion.#ctor(System.Byte[],System.Int32,System.Boolean)">
             <summary>
-            Returns the raw bytes for this vector
+            Constructor, builds a quaternion object from a byte array
             </summary>
-            <param name="byteArray">Byte array containing a 16 byte color</param>
-            <param name="pos">Beginning position in the byte array</param>
-            <param name="inverted">True if the byte array stores inverted values,
-            otherwise false. For example the color black (fully opaque) inverted
-            would be 0xFF 0xFF 0xFF 0x00</param>
-            <param name="alphaInverted">True if the alpha value is inverted in
-            addition to whatever the inverted parameter is. Setting inverted true
-            and alphaInverted true will flip the alpha value back to non-inverted,
-            but keep the other color bytes inverted</param>
-            <returns>A 16 byte array containing R, G, B, and A</returns>
+            <param name="byteArray">Byte array containing four four-byte floats</param>
+            <param name="pos">Offset in the byte array to start reading at</param>
+            <param name="normalized">Whether the source data is normalized or
+            not. If this is true 12 bytes will be read, otherwise 16 bytes will
+            be read.</param>
         </member>
-        <member name="M:OpenMetaverse.Color4.#ctor(OpenMetaverse.Color4)">
+        <member name="F:OpenMetaverse.Quaternion.X">
+            <summary>X value</summary>
+        </member>
+        <member name="F:OpenMetaverse.Quaternion.Y">
+            <summary>Y value</summary>
+        </member>
+        <member name="F:OpenMetaverse.Quaternion.Z">
+            <summary>Z value</summary>
+        </member>
+        <member name="F:OpenMetaverse.Quaternion.W">
+            <summary>W value</summary>
+        </member>
+        <member name="F:OpenMetaverse.Quaternion.Identity">
+            <summary>A quaternion with a value of 0,0,0,1</summary>
+        </member>
+        <member name="M:OpenMetaverse.Quaternion.Normalize">
             <summary>
-            Copy constructor
+            Normalizes the quaternion
             </summary>
-            <param name="color">Color to copy</param>
         </member>
-        <member name="M:OpenMetaverse.Color4.CompareTo(OpenMetaverse.Color4)">
+        <member name="M:OpenMetaverse.Quaternion.FromBytes(System.Byte[],System.Int32,System.Boolean)">
             <summary>
-            IComparable.CompareTo implementation
+            Builds a quaternion object from a byte array
             </summary>
-            <remarks>Sorting ends up like this: |--Grayscale--||--Color--|.
-            Alpha is only used when the colors are otherwise equivalent</remarks>
+            <param name="byteArray">The source byte array</param>
+            <param name="pos">Offset in the byte array to start reading at</param>
+            <param name="normalized">Whether the source data is normalized or
+            not. If this is true 12 bytes will be read, otherwise 16 bytes will
+            be read.</param>
         </member>
-        <member name="M:OpenMetaverse.Color4.FromBytes(System.Byte[],System.Int32,System.Boolean,System.Boolean)">
+        <member name="M:OpenMetaverse.Quaternion.GetBytes">
             <summary>
-            Builds a color from a byte array
+            Normalize this quaternion and serialize it to a byte array
             </summary>
-            <param name="byteArray">Byte array containing a 16 byte color</param>
-            <param name="pos">Beginning position in the byte array</param>
-            <param name="inverted">True if the byte array stores inverted values,
-            otherwise false. For example the color black (fully opaque) inverted
-            would be 0xFF 0xFF 0xFF 0x00</param>
-            <param name="alphaInverted">True if the alpha value is inverted in
-            addition to whatever the inverted parameter is. Setting inverted true
-            and alphaInverted true will flip the alpha value back to non-inverted,
-            but keep the other color bytes inverted</param>
+            <returns>A 12 byte array containing normalized X, Y, and Z floating
+            point values in order using little endian byte ordering</returns>
         </member>
-        <member name="M:OpenMetaverse.Color4.ToBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Quaternion.ToBytes(System.Byte[],System.Int32)">
             <summary>
-            Writes the raw bytes for this color to a byte array
+            Writes the raw bytes for this quaternion to a byte array
             </summary>
             <param name="dest">Destination byte array</param>
             <param name="pos">Position in the destination array to start
-            writing. Must be at least 16 bytes before the end of the array</param>
+            writing. Must be at least 12 bytes before the end of the array</param>
         </member>
-        <member name="M:OpenMetaverse.Color4.ToBytes(System.Byte[],System.Int32,System.Boolean)">
+        <member name="M:OpenMetaverse.Quaternion.GetEulerAngles(System.Single@,System.Single@,System.Single@)">
             <summary>
-            Serializes this color into four bytes in a byte array
+            Convert this quaternion to euler angles
             </summary>
-            <param name="dest">Destination byte array</param>
-            <param name="pos">Position in the destination array to start
-            writing. Must be at least 4 bytes before the end of the array</param>
-            <param name="inverted">True to invert the output (1.0 becomes 0
-            instead of 255)</param>
+            <param name="roll">X euler angle</param>
+            <param name="pitch">Y euler angle</param>
+            <param name="yaw">Z euler angle</param>
         </member>
-        <member name="M:OpenMetaverse.Color4.ToFloatBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Quaternion.GetAxisAngle(OpenMetaverse.Vector3@,System.Single@)">
             <summary>
-            Writes the raw bytes for this color to a byte array
+            Convert this quaternion to an angle around an axis
             </summary>
-            <param name="dest">Destination byte array</param>
-            <param name="pos">Position in the destination array to start
-            writing. Must be at least 16 bytes before the end of the array</param>
+            <param name="axis">Unit vector describing the axis</param>
+            <param name="angle">Angle around the axis, in radians</param>
         </member>
-        <member name="M:OpenMetaverse.Color4.ClampValues">
+        <member name="M:OpenMetaverse.Quaternion.Conjugate(OpenMetaverse.Quaternion)">
             <summary>
-            Ensures that values are in range 0-1
+            Returns the conjugate (spatial inverse) of a quaternion
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Color4.FromHSV(System.Double,System.Double,System.Double)">
+        <member name="M:OpenMetaverse.Quaternion.CreateFromAxisAngle(System.Single,System.Single,System.Single,System.Single)">
             <summary>
-            Create an RGB color from a hue, saturation, value combination
+            Build a quaternion from an axis and an angle of rotation around
+            that axis
             </summary>
-            <param name="hue">Hue</param>
-            <param name="saturation">Saturation</param>
-            <param name="value">Value</param>
-            <returns>An fully opaque RGB color (alpha is 1.0)</returns>
         </member>
-        <member name="M:OpenMetaverse.Color4.Lerp(OpenMetaverse.Color4,OpenMetaverse.Color4,System.Single)">
+        <member name="M:OpenMetaverse.Quaternion.CreateFromAxisAngle(OpenMetaverse.Vector3,System.Single)">
             <summary>
-            Performs linear interpolation between two colors
+            Build a quaternion from an axis and an angle of rotation around
+            that axis
             </summary>
-            <param name="value1">Color to start at</param>
-            <param name="value2">Color to end at</param>
-            <param name="amount">Amount to interpolate</param>
-            <returns>The interpolated color</returns>
+            <param name="axis">Axis of rotation</param>
+            <param name="angle">Angle of rotation</param>
         </member>
-        <member name="F:OpenMetaverse.Color4.Black">
-            <summary>A Color4 with zero RGB values and fully opaque (alpha 1.0)</summary>
+        <member name="M:OpenMetaverse.Quaternion.CreateFromEulers(OpenMetaverse.Vector3)">
+            <summary>
+            Creates a quaternion from a vector containing roll, pitch, and yaw
+            in radians
+            </summary>
+            <param name="eulers">Vector representation of the euler angles in
+            radians</param>
+            <returns>Quaternion representation of the euler angles</returns>
         </member>
-        <member name="F:OpenMetaverse.Color4.White">
-            <summary>A Color4 with full RGB values (1.0) and fully opaque (alpha 1.0)</summary>
+        <member name="M:OpenMetaverse.Quaternion.CreateFromEulers(System.Single,System.Single,System.Single)">
+            <summary>
+            Creates a quaternion from roll, pitch, and yaw euler angles in
+            radians
+            </summary>
+            <param name="roll">X angle in radians</param>
+            <param name="pitch">Y angle in radians</param>
+            <param name="yaw">Z angle in radians</param>
+            <returns>Quaternion representation of the euler angles</returns>
+        </member>
+        <member name="M:OpenMetaverse.Quaternion.Inverse(OpenMetaverse.Quaternion)">
+            <summary>
+            Conjugates and renormalizes a vector
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Quaternion.Slerp(OpenMetaverse.Quaternion,OpenMetaverse.Quaternion,System.Single)">
+            <summary>
+            Spherical linear interpolation between two quaternions
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Quaternion.ToRawString">
+            <summary>
+            Get a string representation of the quaternion elements with up to three
+            decimal digits and separated by spaces only
+            </summary>
+            <returns>Raw string representation of the quaternion</returns>
         </member>
         <member name="M:OpenMetaverse.ReaderWriterLockSlim.ExitAndWakeUpAppropriateWaiters">
             <summary>
-            Determines the appropriate events to set, leaves the locks, and sets the events. 
+            Determines the appropriate events to set, leaves the locks, and sets the events.
             </summary>
         </member>
         <member name="M:OpenMetaverse.ReaderWriterLockSlim.LazyCreateEvent(System.Threading.EventWaitHandle@,System.Boolean)">
@@ -652,20 +1412,105 @@
             A routine for lazily creating a event outside the lock (so if errors
             happen they are outside the lock and that we don't do much work
             while holding a spin lock).  If all goes well, reenter the lock and
-            set 'waitEvent' 
+            set 'waitEvent'
             </summary>
         </member>
         <member name="M:OpenMetaverse.ReaderWriterLockSlim.WaitOnEvent(System.Threading.EventWaitHandle,System.UInt32@,System.Int32)">
             <summary>
-            Waits on 'waitEvent' with a timeout of 'millisceondsTimeout.  
+            Waits on 'waitEvent' with a timeout of 'millisceondsTimeout.
             Before the wait 'numWaiters' is incremented and is restored before leaving this routine.
             </summary>
         </member>
-        <member name="M:OpenMetaverse.CircularQueue`1.#ctor(OpenMetaverse.CircularQueue{`0})">
+        <member name="T:OpenMetaverse.TokenBucket">
             <summary>
-            Copy constructor
+            A hierarchical token bucket for bandwidth throttling. See
+            http://en.wikipedia.org/wiki/Token_bucket for more information
             </summary>
-            <param name="queue">Circular queue to copy</param>
+        </member>
+        <member name="M:OpenMetaverse.TokenBucket.#ctor(OpenMetaverse.TokenBucket,System.Int32,System.Int32)">
+            <summary>
+            Default constructor
+            </summary>
+            <param name="parent">Parent bucket if this is a child bucket, or
+            null if this is a root bucket</param>
+            <param name="maxBurst">Maximum size of the bucket in bytes, or
+            zero if this bucket has no maximum capacity</param>
+            <param name="dripRate">Rate that the bucket fills, in bytes per
+            second. If zero, the bucket always remains full</param>
+        </member>
+        <member name="F:OpenMetaverse.TokenBucket.parent">
+            <summary>Parent bucket to this bucket, or null if this is a root
+            bucket</summary>
+        </member>
+        <member name="F:OpenMetaverse.TokenBucket.maxBurst">
+            <summary>Size of the bucket in bytes. If zero, the bucket has
+            infinite capacity</summary>
+        </member>
+        <member name="F:OpenMetaverse.TokenBucket.tokensPerMS">
+            <summary>Rate that the bucket fills, in bytes per millisecond. If
+            zero, the bucket always remains full</summary>
+        </member>
+        <member name="F:OpenMetaverse.TokenBucket.content">
+            <summary>Number of tokens currently in the bucket</summary>
+        </member>
+        <member name="F:OpenMetaverse.TokenBucket.lastDrip">
+            <summary>Time of the last drip, in system ticks</summary>
+        </member>
+        <member name="P:OpenMetaverse.TokenBucket.Parent">
+            <summary>
+            The parent bucket of this bucket, or null if this bucket has no
+            parent. The parent bucket will limit the aggregate bandwidth of all
+            of its children buckets
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.TokenBucket.MaxBurst">
+            <summary>
+            Maximum burst rate in bytes per second. This is the maximum number
+            of tokens that can accumulate in the bucket at any one time
+            </summary>
+        </member>
+        <member name="P:OpenMetaverse.TokenBucket.DripRate">
+            <summary>
+            The speed limit of this bucket in bytes per second. This is the
+            number of tokens that are added to the bucket per second
+            </summary>
+            <remarks>Tokens are added to the bucket any time
+            <seealso cref="M:OpenMetaverse.TokenBucket.RemoveTokens(System.Int32,System.Boolean)" /> is called, at the granularity of
+            the system tick interval (typically around 15-22ms)</remarks>
+        </member>
+        <member name="P:OpenMetaverse.TokenBucket.Content">
+            <summary>
+            The number of bytes that can be sent at this moment. This is the
+            current number of tokens in the bucket
+            <remarks>If this bucket has a parent bucket that does not have
+            enough tokens for a request, <seealso cref="M:OpenMetaverse.TokenBucket.RemoveTokens(System.Int32,System.Boolean)" /> will
+            return false regardless of the content of this bucket</remarks></summary>
+        </member>
+        <member name="M:OpenMetaverse.TokenBucket.RemoveTokens(System.Int32)">
+            <summary>
+            Remove a given number of tokens from the bucket
+            </summary>
+            <param name="amount">Number of tokens to remove from the bucket</param>
+            <returns>True if the requested number of tokens were removed from
+            the bucket, otherwise false</returns>
+        </member>
+        <member name="M:OpenMetaverse.TokenBucket.RemoveTokens(System.Int32,System.Boolean@)">
+            <summary>
+            Remove a given number of tokens from the bucket
+            </summary>
+            <param name="amount">Number of tokens to remove from the bucket</param>
+            <param name="dripSucceeded">True if tokens were added to the bucket
+            during this call, otherwise false</param>
+            <returns>True if the requested number of tokens were removed from
+            the bucket, otherwise false</returns>
+        </member>
+        <member name="M:OpenMetaverse.TokenBucket.Drip">
+            <summary>
+            Add tokens to the bucket over time. The number of tokens added each
+            call depends on the length of time that has passed since the last
+            call to Drip
+            </summary>
+            <returns>True if tokens were added to the bucket, otherwise false</returns>
         </member>
         <member name="T:OpenMetaverse.UUID">
             <summary>
@@ -673,14 +1518,11 @@
             Life networking protocol
             </summary>
         </member>
-        <member name="F:OpenMetaverse.UUID.Guid">
-            <summary>The System.Guid object this struct wraps around</summary>
-        </member>
         <member name="M:OpenMetaverse.UUID.#ctor(System.String)">
             <summary>
             Constructor that takes a string UUID representation
             </summary>
-            <param name="val">A string representation of a UUID, case 
+            <param name="val">A string representation of a UUID, case
             insensitive and can either be hyphenated or non-hyphenated</param>
             <example>UUID("11f8aa9c-b071-4242-836b-13b7abe0d489")</example>
         </member>
@@ -700,7 +1542,7 @@
         </member>
         <member name="M:OpenMetaverse.UUID.#ctor(System.UInt64)">
             <summary>
-            Constructor that takes an unsigned 64-bit unsigned integer to 
+            Constructor that takes an unsigned 64-bit unsigned integer to
             convert to a UUID
             </summary>
             <param name="val">64-bit unsigned integer to convert to a UUID</param>
@@ -711,6 +1553,15 @@
             </summary>
             <param name="val">UUID to copy</param>
         </member>
+        <member name="F:OpenMetaverse.UUID.Guid">
+            <summary>The System.Guid object this struct wraps around</summary>
+        </member>
+        <member name="F:OpenMetaverse.UUID.Zero">
+            <summary>An UUID with a value of all zeroes</summary>
+        </member>
+        <member name="F:OpenMetaverse.UUID.ZeroString">
+            <summary>A cache of UUID.Zero as a string to optimize a common path</summary>
+        </member>
         <member name="M:OpenMetaverse.UUID.CompareTo(OpenMetaverse.UUID)">
             <summary>
             IComparable.CompareTo implementation
@@ -753,7 +1604,7 @@
             <summary>
             Generate a UUID from a string
             </summary>
-            <param name="val">A string representation of a UUID, case 
+            <param name="val">A string representation of a UUID, case
             insensitive and can either be hyphenated or non-hyphenated</param>
             <example>UUID.Parse("11f8aa9c-b071-4242-836b-13b7abe0d489")</example>
         </member>
@@ -761,7 +1612,7 @@
             <summary>
             Generate a UUID from a string
             </summary>
-            <param name="val">A string representation of a UUID, case 
+            <param name="val">A string representation of a UUID, case
             insensitive and can either be hyphenated or non-hyphenated</param>
             <param name="result">Will contain the parsed UUID if successful,
             otherwise null</param>
@@ -779,9 +1630,9 @@
         </member>
         <member name="M:OpenMetaverse.UUID.Random">
             <summary>
-            
             </summary>
-            <returns></returns>
+            <returns>
+            </returns>
         </member>
         <member name="M:OpenMetaverse.UUID.GetHashCode">
             <summary>
@@ -807,7 +1658,7 @@
             <summary>
             Get a hyphenated string representation of this UUID
             </summary>
-            <returns>A string representation of this UUID, lowercase and 
+            <returns>A string representation of this UUID, lowercase and
             with hyphens</returns>
             <example>11f8aa9c-b071-4242-836b-13b7abe0d489</example>
         </member>
@@ -839,15 +1690,40 @@
             <summary>
             String typecasting operator
             </summary>
-            <param name="val">A UUID in string form. Case insensitive, 
+            <param name="val">A UUID in string form. Case insensitive,
             hyphenated or non-hyphenated</param>
             <returns>A UUID built from the string representation</returns>
         </member>
-        <member name="F:OpenMetaverse.UUID.Zero">
-            <summary>An UUID with a value of all zeroes</summary>
+        <member name="T:OpenMetaverse.Utils.Platform">
+            <summary>
+            Operating system
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.UUID.ZeroString">
-            <summary>A cache of UUID.Zero as a string to optimize a common path</summary>
+        <member name="F:OpenMetaverse.Utils.Platform.Unknown">
+            <summary>Unknown</summary>
+        </member>
+        <member name="F:OpenMetaverse.Utils.Platform.Windows">
+            <summary>Microsoft Windows</summary>
+        </member>
+        <member name="F:OpenMetaverse.Utils.Platform.WindowsCE">
+            <summary>Microsoft Windows CE</summary>
+        </member>
+        <member name="F:OpenMetaverse.Utils.Platform.Linux">
+            <summary>Linux</summary>
+        </member>
+        <member name="F:OpenMetaverse.Utils.Platform.OSX">
+            <summary>Apple OSX</summary>
+        </member>
+        <member name="T:OpenMetaverse.Utils.Runtime">
+            <summary>
+            Runtime platform
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Utils.Runtime.Windows">
+            <summary>.NET runtime</summary>
+        </member>
+        <member name="F:OpenMetaverse.Utils.Runtime.Mono">
+            <summary>Mono runtime: http://www.mono-project.com/</summary>
         </member>
         <member name="F:OpenMetaverse.Utils.DEG_TO_RAD">
             <summary>Used for converting degrees to radians</summary>
@@ -857,7 +1733,7 @@
         </member>
         <member name="F:OpenMetaverse.Utils.EnUsCulture">
             <summary>Provide a single instance of the CultureInfo class to
-            help parsing in situations where the grid assumes an en-us 
+            help parsing in situations where the grid assumes an en-us
             culture</summary>
         </member>
         <member name="F:OpenMetaverse.Utils.Epoch">
@@ -1279,7 +2155,7 @@
             <summary>
             Takes an AssetType and returns the string representation
             </summary>
-            <param name="type">The source <seealso cref="T:OpenMetaverse.AssetType"/></param>
+            <param name="type">The source <seealso cref="T:OpenMetaverse.AssetType" /></param>
             <returns>The string version of the AssetType</returns>
         </member>
         <member name="M:OpenMetaverse.Utils.StringToAssetType(System.String)">
@@ -1293,7 +2169,7 @@
             <summary>
             Convert an InventoryType to a string
             </summary>
-            <param name="type">The <seealso cref="T:InventoryType"/> to convert</param>
+            <param name="type">The <seealso cref="T:InventoryType" /> to convert</param>
             <returns>A string representation of the source</returns>
         </member>
         <member name="M:OpenMetaverse.Utils.StringToInventoryType(System.String)">
@@ -1307,7 +2183,7 @@
             <summary>
             Convert a SaleType to a string
             </summary>
-            <param name="type">The <seealso cref="T:SaleType"/> to convert</param>
+            <param name="type">The <seealso cref="T:SaleType" /> to convert</param>
             <returns>A string representation of the source</returns>
         </member>
         <member name="M:OpenMetaverse.Utils.StringToSaleType(System.String)">
@@ -1382,7 +2258,7 @@
             <summary>
             Convert a native DateTime object to a UNIX timestamp
             </summary>
-            <param name="time">A DateTime object you want to convert to a 
+            <param name="time">A DateTime object you want to convert to a
             timestamp</param>
             <returns>An unsigned integer representing a UNIX timestamp</returns>
         </member>
@@ -1413,356 +2289,35 @@
         <member name="M:OpenMetaverse.Utils.HostnameToIPv4(System.String)">
             <summary>
             Attempts to convert a string representation of a hostname or IP
-            address to a <seealso cref="T:System.Net.IPAddress"/>
-            </summary>
+            address to a <seealso cref="T:System.Net.IPAddress" /></summary>
             <param name="hostname">Hostname to convert to an IPAddress</param>
             <returns>Converted IP address object, or null if the conversion
             failed</returns>
         </member>
-        <member name="T:OpenMetaverse.Utils.Platform">
-            <summary>
-            Operating system
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Utils.Platform.Unknown">
-            <summary>Unknown</summary>
-        </member>
-        <member name="F:OpenMetaverse.Utils.Platform.Windows">
-            <summary>Microsoft Windows</summary>
-        </member>
-        <member name="F:OpenMetaverse.Utils.Platform.WindowsCE">
-            <summary>Microsoft Windows CE</summary>
-        </member>
-        <member name="F:OpenMetaverse.Utils.Platform.Linux">
-            <summary>Linux</summary>
-        </member>
-        <member name="F:OpenMetaverse.Utils.Platform.OSX">
-            <summary>Apple OSX</summary>
-        </member>
-        <member name="T:OpenMetaverse.Utils.Runtime">
+        <member name="T:OpenMetaverse.Vector2">
             <summary>
-            Runtime platform
+            A two-dimensional vector with floating-point values
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Utils.Runtime.Windows">
-            <summary>.NET runtime</summary>
-        </member>
-        <member name="F:OpenMetaverse.Utils.Runtime.Mono">
-            <summary>Mono runtime: http://www.mono-project.com/</summary>
-        </member>
-        <member name="F:OpenMetaverse.Quaternion.X">
+        <member name="F:OpenMetaverse.Vector2.X">
             <summary>X value</summary>
         </member>
-        <member name="F:OpenMetaverse.Quaternion.Y">
+        <member name="F:OpenMetaverse.Vector2.Y">
             <summary>Y value</summary>
         </member>
-        <member name="F:OpenMetaverse.Quaternion.Z">
-            <summary>Z value</summary>
-        </member>
-        <member name="F:OpenMetaverse.Quaternion.W">
-            <summary>W value</summary>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.#ctor(System.Single,System.Single,System.Single)">
-            <summary>
-            Build a quaternion from normalized float values
-            </summary>
-            <param name="x">X value from -1.0 to 1.0</param>
-            <param name="y">Y value from -1.0 to 1.0</param>
-            <param name="z">Z value from -1.0 to 1.0</param>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.#ctor(System.Byte[],System.Int32,System.Boolean)">
-            <summary>
-            Constructor, builds a quaternion object from a byte array
-            </summary>
-            <param name="byteArray">Byte array containing four four-byte floats</param>
-            <param name="pos">Offset in the byte array to start reading at</param>
-            <param name="normalized">Whether the source data is normalized or
-            not. If this is true 12 bytes will be read, otherwise 16 bytes will
-            be read.</param>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.Normalize">
-            <summary>
-            Normalizes the quaternion
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.FromBytes(System.Byte[],System.Int32,System.Boolean)">
-            <summary>
-            Builds a quaternion object from a byte array
-            </summary>
-            <param name="byteArray">The source byte array</param>
-            <param name="pos">Offset in the byte array to start reading at</param>
-            <param name="normalized">Whether the source data is normalized or
-            not. If this is true 12 bytes will be read, otherwise 16 bytes will
-            be read.</param>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.GetBytes">
-            <summary>
-            Normalize this quaternion and serialize it to a byte array
-            </summary>
-            <returns>A 12 byte array containing normalized X, Y, and Z floating
-            point values in order using little endian byte ordering</returns>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.ToBytes(System.Byte[],System.Int32)">
-            <summary>
-            Writes the raw bytes for this quaternion to a byte array
-            </summary>
-            <param name="dest">Destination byte array</param>
-            <param name="pos">Position in the destination array to start
-            writing. Must be at least 12 bytes before the end of the array</param>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.GetEulerAngles(System.Single@,System.Single@,System.Single@)">
-            <summary>
-            Convert this quaternion to euler angles
-            </summary>
-            <param name="roll">X euler angle</param>
-            <param name="pitch">Y euler angle</param>
-            <param name="yaw">Z euler angle</param>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.GetAxisAngle(OpenMetaverse.Vector3@,System.Single@)">
-            <summary>
-            Convert this quaternion to an angle around an axis
-            </summary>
-            <param name="axis">Unit vector describing the axis</param>
-            <param name="angle">Angle around the axis, in radians</param>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.Conjugate(OpenMetaverse.Quaternion)">
-            <summary>
-            Returns the conjugate (spatial inverse) of a quaternion
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.CreateFromAxisAngle(System.Single,System.Single,System.Single,System.Single)">
-            <summary>
-            Build a quaternion from an axis and an angle of rotation around
-            that axis
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.CreateFromAxisAngle(OpenMetaverse.Vector3,System.Single)">
-            <summary>
-            Build a quaternion from an axis and an angle of rotation around
-            that axis
-            </summary>
-            <param name="axis">Axis of rotation</param>
-            <param name="angle">Angle of rotation</param>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.CreateFromEulers(OpenMetaverse.Vector3)">
-            <summary>
-            Creates a quaternion from a vector containing roll, pitch, and yaw
-            in radians
-            </summary>
-            <param name="eulers">Vector representation of the euler angles in
-            radians</param>
-            <returns>Quaternion representation of the euler angles</returns>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.CreateFromEulers(System.Single,System.Single,System.Single)">
-            <summary>
-            Creates a quaternion from roll, pitch, and yaw euler angles in
-            radians
-            </summary>
-            <param name="roll">X angle in radians</param>
-            <param name="pitch">Y angle in radians</param>
-            <param name="yaw">Z angle in radians</param>
-            <returns>Quaternion representation of the euler angles</returns>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.Inverse(OpenMetaverse.Quaternion)">
-            <summary>
-            Conjugates and renormalizes a vector
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.Slerp(OpenMetaverse.Quaternion,OpenMetaverse.Quaternion,System.Single)">
-            <summary>
-            Spherical linear interpolation between two quaternions
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Quaternion.ToRawString">
-            <summary>
-            Get a string representation of the quaternion elements with up to three
-            decimal digits and separated by spaces only
-            </summary>
-            <returns>Raw string representation of the quaternion</returns>
-        </member>
-        <member name="F:OpenMetaverse.Quaternion.Identity">
-            <summary>A quaternion with a value of 0,0,0,1</summary>
-        </member>
-        <member name="T:OpenMetaverse.BlockingQueue`1">
-            <summary>
-            Same as Queue except Dequeue function blocks until there is an object to return.
-            Note: This class does not need to be synchronized
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.#ctor(System.Collections.Generic.IEnumerable{`0})">
-            <summary>
-            Create new BlockingQueue.
-            </summary>
-            <param name="col">The System.Collections.ICollection to copy elements from</param>
-        </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.#ctor(System.Int32)">
-            <summary>
-            Create new BlockingQueue.
-            </summary>
-            <param name="capacity">The initial number of elements that the queue can contain</param>
-        </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.#ctor">
-            <summary>
-            Create new BlockingQueue.
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Finalize">
-            <summary>
-            BlockingQueue Destructor (Close queue, resume any waiting thread).
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Clear">
-            <summary>
-            Remove all objects from the Queue.
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Close">
-            <summary>
-            Remove all objects from the Queue, resume all dequeue threads.
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue">
-            <summary>
-            Removes and returns the object at the beginning of the Queue.
-            </summary>
-            <returns>Object in queue.</returns>
-        </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue(System.TimeSpan)">
-            <summary>
-            Removes and returns the object at the beginning of the Queue.
-            </summary>
-            <param name="timeout">time to wait before returning</param>
-            <returns>Object in queue.</returns>
-        </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue(System.Int32)">
-            <summary>
-            Removes and returns the object at the beginning of the Queue.
-            </summary>
-            <param name="timeout">time to wait before returning (in milliseconds)</param>
-            <returns>Object in queue.</returns>
-        </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Enqueue(`0)">
-            <summary>
-            Adds an object to the end of the Queue
-            </summary>
-            <param name="obj">Object to put in queue</param>
-        </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Open">
-            <summary>
-            Open Queue.
-            </summary>
-        </member>
-        <member name="P:OpenMetaverse.BlockingQueue`1.Closed">
-            <summary>
-            Gets flag indicating if queue has been closed.
-            </summary>
-        </member>
-        <member name="T:OpenMetaverse.Parallel">
-            <summary>
-            Provides helper methods for parallelizing loops
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Parallel.For(System.Int32,System.Int32,System.Action{System.Int32})">
-            <summary>
-            Executes a for loop in which iterations may run in parallel
-            </summary>
-            <param name="fromInclusive">The loop will be started at this index</param>
-            <param name="toExclusive">The loop will be terminated before this index is reached</param>
-            <param name="body">Method body to run for each iteration of the loop</param>
-        </member>
-        <member name="M:OpenMetaverse.Parallel.For(System.Int32,System.Int32,System.Int32,System.Action{System.Int32})">
-            <summary>
-            Executes a for loop in which iterations may run in parallel
-            </summary>
-            <param name="threadCount">The number of concurrent execution threads to run</param>
-            <param name="fromInclusive">The loop will be started at this index</param>
-            <param name="toExclusive">The loop will be terminated before this index is reached</param>
-            <param name="body">Method body to run for each iteration of the loop</param>
-        </member>
-        <member name="M:OpenMetaverse.Parallel.ForEach``1(System.Collections.Generic.IEnumerable{``0},System.Action{``0})">
-            <summary>
-            Executes a foreach loop in which iterations may run in parallel
-            </summary>
-            <typeparam name="T">Object type that the collection wraps</typeparam>
-            <param name="enumerable">An enumerable collection to iterate over</param>
-            <param name="body">Method body to run for each object in the collection</param>
-        </member>
-        <member name="M:OpenMetaverse.Parallel.ForEach``1(System.Int32,System.Collections.Generic.IEnumerable{``0},System.Action{``0})">
-            <summary>
-            Executes a foreach loop in which iterations may run in parallel
-            </summary>
-            <typeparam name="T">Object type that the collection wraps</typeparam>
-            <param name="threadCount">The number of concurrent execution threads to run</param>
-            <param name="enumerable">An enumerable collection to iterate over</param>
-            <param name="body">Method body to run for each object in the collection</param>
-        </member>
-        <member name="M:OpenMetaverse.Parallel.Invoke(System.Action[])">
-            <summary>
-            Executes a series of tasks in parallel
-            </summary>
-            <param name="actions">A series of method bodies to execute</param>
-        </member>
-        <member name="M:OpenMetaverse.Parallel.Invoke(System.Int32,System.Action[])">
-            <summary>
-            Executes a series of tasks in parallel
-            </summary>
-            <param name="threadCount">The number of concurrent execution threads to run</param>
-            <param name="actions">A series of method bodies to execute</param>
-        </member>
-        <member name="M:OpenMetaverse.Matrix4.GetEulerAngles(System.Single@,System.Single@,System.Single@)">
-            <summary>
-            Convert this matrix to euler rotations
-            </summary>
-            <param name="roll">X euler angle</param>
-            <param name="pitch">Y euler angle</param>
-            <param name="yaw">Z euler angle</param>
-        </member>
-        <member name="M:OpenMetaverse.Matrix4.GetQuaternion">
-            <summary>
-            Convert this matrix to a quaternion rotation
-            </summary>
-            <returns>A quaternion representation of this rotation matrix</returns>
-        </member>
-        <member name="M:OpenMetaverse.Matrix4.CreateFromEulers(System.Single,System.Single,System.Single)">
-            <summary>
-            Construct a matrix from euler rotation values in radians
-            </summary>
-            <param name="roll">X euler angle in radians</param>
-            <param name="pitch">Y euler angle in radians</param>
-            <param name="yaw">Z euler angle in radians</param>
-        </member>
-        <member name="M:OpenMetaverse.Matrix4.ToString">
-            <summary>
-            Get a formatted string representation of the vector
-            </summary>
-            <returns>A string representation of the vector</returns>
-        </member>
-        <member name="F:OpenMetaverse.Matrix4.Zero">
-            <summary>A 4x4 matrix containing all zeroes</summary>
-        </member>
-        <member name="F:OpenMetaverse.Matrix4.Identity">
-            <summary>A 4x4 identity matrix</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector4.X">
-            <summary>X value</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector4.Y">
-            <summary>Y value</summary>
+        <member name="F:OpenMetaverse.Vector2.Zero">
+            <summary>A vector with a value of 0,0</summary>
         </member>
-        <member name="F:OpenMetaverse.Vector4.Z">
-            <summary>Z value</summary>
+        <member name="F:OpenMetaverse.Vector2.One">
+            <summary>A vector with a value of 1,1</summary>
         </member>
-        <member name="F:OpenMetaverse.Vector4.W">
-            <summary>W value</summary>
+        <member name="F:OpenMetaverse.Vector2.UnitX">
+            <summary>A vector with a value of 1,0</summary>
         </member>
-        <member name="M:OpenMetaverse.Vector4.#ctor(System.Byte[],System.Int32)">
-            <summary>
-            Constructor, builds a vector from a byte array
-            </summary>
-            <param name="byteArray">Byte array containing four four-byte floats</param>
-            <param name="pos">Beginning position in the byte array</param>
+        <member name="F:OpenMetaverse.Vector2.UnitY">
+            <summary>A vector with a value of 0,1</summary>
         </member>
-        <member name="M:OpenMetaverse.Vector4.ApproxEquals(OpenMetaverse.Vector4,System.Single)">
+        <member name="M:OpenMetaverse.Vector2.ApproxEquals(OpenMetaverse.Vector2,System.Single)">
             <summary>
             Test if this vector is equal to another vector, within a given
             tolerance range
@@ -1773,78 +2328,74 @@
             <returns>True if the magnitude of difference between the two vectors
             is less than the given tolerance, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector4.CompareTo(OpenMetaverse.Vector4)">
+        <member name="M:OpenMetaverse.Vector2.IsFinite">
             <summary>
-            IComparable.CompareTo implementation
+            Test if this vector is composed of all finite numbers
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Vector4.IsFinite">
+        <member name="M:OpenMetaverse.Vector2.CompareTo(OpenMetaverse.Vector2)">
             <summary>
-            Test if this vector is composed of all finite numbers
+            IComparable.CompareTo implementation
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Vector4.FromBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Vector2.FromBytes(System.Byte[],System.Int32)">
             <summary>
             Builds a vector from a byte array
             </summary>
-            <param name="byteArray">Byte array containing a 16 byte vector</param>
+            <param name="byteArray">Byte array containing two four-byte floats</param>
             <param name="pos">Beginning position in the byte array</param>
         </member>
-        <member name="M:OpenMetaverse.Vector4.GetBytes">
+        <member name="M:OpenMetaverse.Vector2.GetBytes">
             <summary>
             Returns the raw bytes for this vector
             </summary>
-            <returns>A 16 byte array containing X, Y, Z, and W</returns>
+            <returns>An eight-byte array containing X and Y</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector4.ToBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Vector2.ToBytes(System.Byte[],System.Int32)">
             <summary>
             Writes the raw bytes for this vector to a byte array
             </summary>
             <param name="dest">Destination byte array</param>
             <param name="pos">Position in the destination array to start
-            writing. Must be at least 16 bytes before the end of the array</param>
+            writing. Must be at least 8 bytes before the end of the array</param>
         </member>
-        <member name="M:OpenMetaverse.Vector4.ToRawString">
+        <member name="M:OpenMetaverse.Vector2.Parse(System.String)">
             <summary>
-            Get a string representation of the vector elements with up to three
-            decimal digits and separated by spaces only
+            Parse a vector from a string
             </summary>
-            <returns>Raw string representation of the vector</returns>
-        </member>
-        <member name="F:OpenMetaverse.Vector4.Zero">
-            <summary>A vector with a value of 0,0,0,0</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector4.One">
-            <summary>A vector with a value of 1,1,1,1</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector4.UnitX">
-            <summary>A vector with a value of 1,0,0,0</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector4.UnitY">
-            <summary>A vector with a value of 0,1,0,0</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector4.UnitZ">
-            <summary>A vector with a value of 0,0,1,0</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector4.UnitW">
-            <summary>A vector with a value of 0,0,0,1</summary>
+            <param name="val">A string representation of a 2D vector, enclosed
+            in arrow brackets and separated by commas</param>
         </member>
-        <member name="F:OpenMetaverse.ExpiringCache`2.syncRoot">
-            <summary>For thread safety</summary>
+        <member name="M:OpenMetaverse.Vector2.SmoothStep(OpenMetaverse.Vector2,OpenMetaverse.Vector2,System.Single)">
+            <summary>
+            Interpolates between two vectors using a cubic equation
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ExpiringCache`2.isPurging">
-            <summary>For thread safety</summary>
+        <member name="M:OpenMetaverse.Vector2.ToString">
+            <summary>
+            Get a formatted string representation of the vector
+            </summary>
+            <returns>A string representation of the vector</returns>
         </member>
-        <member name="M:OpenMetaverse.ExpiringCache`2.PurgeCache(System.Object,System.Timers.ElapsedEventArgs)">
+        <member name="M:OpenMetaverse.Vector2.ToRawString">
             <summary>
-            Purges expired objects from the cache. Called automatically by the purge timer.
+            Get a string representation of the vector elements with up to three
+            decimal digits and separated by spaces only
             </summary>
+            <returns>Raw string representation of the vector</returns>
         </member>
         <member name="T:OpenMetaverse.Vector3">
             <summary>
             A three-dimensional vector with floating-point values
             </summary>
         </member>
+        <member name="M:OpenMetaverse.Vector3.#ctor(System.Byte[],System.Int32)">
+            <summary>
+            Constructor, builds a vector from a byte array
+            </summary>
+            <param name="byteArray">Byte array containing three four-byte floats</param>
+            <param name="pos">Beginning position in the byte array</param>
+        </member>
         <member name="F:OpenMetaverse.Vector3.X">
             <summary>X value</summary>
         </member>
@@ -1854,12 +2405,20 @@
         <member name="F:OpenMetaverse.Vector3.Z">
             <summary>Z value</summary>
         </member>
-        <member name="M:OpenMetaverse.Vector3.#ctor(System.Byte[],System.Int32)">
-            <summary>
-            Constructor, builds a vector from a byte array
-            </summary>
-            <param name="byteArray">Byte array containing three four-byte floats</param>
-            <param name="pos">Beginning position in the byte array</param>
+        <member name="F:OpenMetaverse.Vector3.Zero">
+            <summary>A vector with a value of 0,0,0</summary>
+        </member>
+        <member name="F:OpenMetaverse.Vector3.One">
+            <summary>A vector with a value of 1,1,1</summary>
+        </member>
+        <member name="F:OpenMetaverse.Vector3.UnitX">
+            <summary>A unit vector facing forward (X axis), value 1,0,0</summary>
+        </member>
+        <member name="F:OpenMetaverse.Vector3.UnitY">
+            <summary>A unit vector facing left (Y axis), value 0,1,0</summary>
+        </member>
+        <member name="F:OpenMetaverse.Vector3.UnitZ">
+            <summary>A unit vector facing up (Z axis), value 0,0,1</summary>
         </member>
         <member name="M:OpenMetaverse.Vector3.ApproxEquals(OpenMetaverse.Vector3,System.Single)">
             <summary>
@@ -1907,7 +2466,7 @@
             <summary>
             Parse a vector from a string
             </summary>
-            <param name="val">A string representation of a 3D vector, enclosed 
+            <param name="val">A string representation of a 3D vector, enclosed
             in arrow brackets and separated by commas</param>
         </member>
         <member name="M:OpenMetaverse.Vector3.RotationBetween(OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
@@ -1940,586 +2499,152 @@
             Cross product between two vectors
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Vector3.Zero">
-            <summary>A vector with a value of 0,0,0</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector3.One">
-            <summary>A vector with a value of 1,1,1</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector3.UnitX">
-            <summary>A unit vector facing forward (X axis), value 1,0,0</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector3.UnitY">
-            <summary>A unit vector facing left (Y axis), value 0,1,0</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector3.UnitZ">
-            <summary>A unit vector facing up (Z axis), value 0,0,1</summary>
-        </member>
-        <member name="T:OpenMetaverse.PCode">
+        <member name="T:OpenMetaverse.Vector3d">
             <summary>
-            Identifier code for primitive types
+            A three-dimensional vector with doubleing-point values
             </summary>
         </member>
-        <member name="F:OpenMetaverse.PCode.None">
-            <summary>None</summary>
-        </member>
-        <member name="F:OpenMetaverse.PCode.Prim">
-            <summary>A Primitive</summary>
-        </member>
-        <member name="F:OpenMetaverse.PCode.Avatar">
-            <summary>A Avatar</summary>
-        </member>
-        <member name="F:OpenMetaverse.PCode.Grass">
-            <summary>Linden grass</summary>
-        </member>
-        <member name="F:OpenMetaverse.PCode.NewTree">
-            <summary>Linden tree</summary>
-        </member>
-        <member name="F:OpenMetaverse.PCode.ParticleSystem">
-            <summary>A primitive that acts as the source for a particle stream</summary>
-        </member>
-        <member name="F:OpenMetaverse.PCode.Tree">
-            <summary>A Linden tree</summary>
-        </member>
-        <member name="T:OpenMetaverse.PrimFlags">
+        <member name="M:OpenMetaverse.Vector3d.#ctor(System.Byte[],System.Int32)">
             <summary>
-            Primary parameters for primitives such as Physics Enabled or Phantom
+            Constructor, builds a vector from a byte array
             </summary>
+            <param name="byteArray">Byte array containing three eight-byte doubles</param>
+            <param name="pos">Beginning position in the byte array</param>
         </member>
-        <member name="F:OpenMetaverse.PrimFlags.None">
-            <summary>Deprecated</summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.Physics">
-            <summary>Whether physics are enabled for this object</summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.CreateSelected">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.ObjectModify">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.ObjectCopy">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.ObjectAnyOwner">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.ObjectYouOwner">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.Scripted">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.Touch">
-            <summary>Whether this object contains an active touch script</summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.ObjectMove">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.Money">
-            <summary>Whether this object can receive payments</summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.Phantom">
-            <summary>Whether this object is phantom (no collisions)</summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.InventoryEmpty">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.JointHinge">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.JointP2P">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.JointLP2P">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.JointWheel">
-            <summary>Deprecated</summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.AllowInventoryDrop">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.ObjectTransfer">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.ObjectGroupOwned">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.ObjectYouOfficer">
-            <summary>Deprecated</summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.CameraDecoupled">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.AnimSource">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.CameraSource">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.CastShadows">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.PrimFlags.DieAtEdge">
-            <summary>Server flag, will not be sent to clients. Specifies that
-            the object is destroyed when it touches a simulator edge</summary>
+        <member name="F:OpenMetaverse.Vector3d.X">
+            <summary>X value</summary>
         </member>
-        <member name="F:OpenMetaverse.PrimFlags.ReturnAtEdge">
-            <summary>Server flag, will not be sent to clients. Specifies that
-            the object will be returned to the owner's inventory when it
-            touches a simulator edge</summary>
+        <member name="F:OpenMetaverse.Vector3d.Y">
+            <summary>Y value</summary>
         </member>
-        <member name="F:OpenMetaverse.PrimFlags.Sandbox">
-            <summary>Server flag, will not be sent to clients.</summary>
+        <member name="F:OpenMetaverse.Vector3d.Z">
+            <summary>Z value</summary>
         </member>
-        <member name="F:OpenMetaverse.PrimFlags.Flying">
-            <summary>Server flag, will not be sent to client. Specifies that
-            the object is hovering/flying</summary>
+        <member name="F:OpenMetaverse.Vector3d.Zero">
+            <summary>A vector with a value of 0,0,0</summary>
         </member>
-        <member name="F:OpenMetaverse.PrimFlags.ObjectOwnerModify">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Vector3d.One">
+            <summary>A vector with a value of 1,1,1</summary>
         </member>
-        <member name="F:OpenMetaverse.PrimFlags.TemporaryOnRez">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Vector3d.UnitX">
+            <summary>A unit vector facing forward (X axis), value of 1,0,0</summary>
         </member>
-        <member name="F:OpenMetaverse.PrimFlags.Temporary">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Vector3d.UnitY">
+            <summary>A unit vector facing left (Y axis), value of 0,1,0</summary>
         </member>
-        <member name="F:OpenMetaverse.PrimFlags.ZlibCompressed">
-            <summary></summary>
+        <member name="F:OpenMetaverse.Vector3d.UnitZ">
+            <summary>A unit vector facing up (Z axis), value of 0,0,1</summary>
         </member>
-        <member name="T:OpenMetaverse.SoundFlags">
+        <member name="M:OpenMetaverse.Vector3d.ApproxEquals(OpenMetaverse.Vector3d,System.Double)">
             <summary>
-            Sound flags for sounds attached to primitives
+            Test if this vector is equal to another vector, within a given
+            tolerance range
             </summary>
+            <param name="vec">Vector to test against</param>
+            <param name="tolerance">The acceptable magnitude of difference
+            between the two vectors</param>
+            <returns>True if the magnitude of difference between the two vectors
+            is less than the given tolerance, otherwise false</returns>
         </member>
-        <member name="F:OpenMetaverse.SoundFlags.None">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.SoundFlags.Loop">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.SoundFlags.SyncMaster">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.SoundFlags.SyncSlave">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.SoundFlags.SyncPending">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.SoundFlags.Queue">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.SoundFlags.Stop">
-            <summary></summary>
-        </member>
-        <member name="T:OpenMetaverse.Material">
+        <member name="M:OpenMetaverse.Vector3d.CompareTo(OpenMetaverse.Vector3d)">
             <summary>
-            Material type for a primitive
+            IComparable.CompareTo implementation
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Material.Stone">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Material.Metal">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Material.Glass">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Material.Wood">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Material.Flesh">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Material.Plastic">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Material.Rubber">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Material.Light">
-            <summary></summary>
-        </member>
-        <member name="T:OpenMetaverse.PrimType">
+        <member name="M:OpenMetaverse.Vector3d.IsFinite">
             <summary>
-            Used in a helper function to roughly determine prim shape
+            Test if this vector is composed of all finite numbers
             </summary>
         </member>
-        <member name="T:OpenMetaverse.ExtraParamType">
+        <member name="M:OpenMetaverse.Vector3d.FromBytes(System.Byte[],System.Int32)">
             <summary>
-            Extra parameters for primitives, these flags are for features that have
-            been added after the original ObjectFlags that has all eight bits 
-            reserved already
+            Builds a vector from a byte array
             </summary>
+            <param name="byteArray">Byte array containing a 24 byte vector</param>
+            <param name="pos">Beginning position in the byte array</param>
         </member>
-        <member name="F:OpenMetaverse.ExtraParamType.Flexible">
-            <summary>Whether this object has flexible parameters</summary>
-        </member>
-        <member name="F:OpenMetaverse.ExtraParamType.Light">
-            <summary>Whether this object has light parameters</summary>
-        </member>
-        <member name="F:OpenMetaverse.ExtraParamType.Sculpt">
-            <summary>Whether this object is a sculpted prim</summary>
-        </member>
-        <member name="T:OpenMetaverse.JointType">
+        <member name="M:OpenMetaverse.Vector3d.GetBytes">
             <summary>
-            
+            Returns the raw bytes for this vector
             </summary>
+            <returns>A 24 byte array containing X, Y, and Z</returns>
         </member>
-        <member name="F:OpenMetaverse.JointType.Invalid">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.JointType.Hinge">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.JointType.Point">
-            <summary></summary>
-        </member>
-        <member name="T:OpenMetaverse.SculptType">
+        <member name="M:OpenMetaverse.Vector3d.ToBytes(System.Byte[],System.Int32)">
             <summary>
-            
+            Writes the raw bytes for this vector to a byte array
             </summary>
+            <param name="dest">Destination byte array</param>
+            <param name="pos">Position in the destination array to start
+            writing. Must be at least 24 bytes before the end of the array</param>
         </member>
-        <member name="F:OpenMetaverse.SculptType.None">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.SculptType.Sphere">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.SculptType.Torus">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.SculptType.Plane">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.SculptType.Cylinder">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.SculptType.Mesh">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.SculptType.Invert">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.SculptType.Mirror">
-            <summary></summary>
-        </member>
-        <member name="T:OpenMetaverse.FaceType">
+        <member name="M:OpenMetaverse.Vector3d.Parse(System.String)">
             <summary>
-            
+            Parse a vector from a string
             </summary>
+            <param name="val">A string representation of a 3D vector, enclosed
+            in arrow brackets and separated by commas</param>
         </member>
-        <member name="F:OpenMetaverse.FaceType.PathBegin">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FaceType.PathEnd">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FaceType.InnerSide">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FaceType.ProfileBegin">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FaceType.ProfileEnd">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FaceType.OuterSide0">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FaceType.OuterSide1">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FaceType.OuterSide2">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.FaceType.OuterSide3">
-            <summary></summary>
-        </member>
-        <member name="T:OpenMetaverse.ObjectCategory">
+        <member name="M:OpenMetaverse.Vector3d.SmoothStep(OpenMetaverse.Vector3d,OpenMetaverse.Vector3d,System.Double)">
             <summary>
-            
+            Interpolates between two vectors using a cubic equation
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectCategory.Invalid">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.ObjectCategory.None">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.ObjectCategory.Owner">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.ObjectCategory.Group">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.ObjectCategory.Other">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.ObjectCategory.Selected">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.ObjectCategory.Temporary">
-            <summary></summary>
-        </member>
-        <member name="T:OpenMetaverse.AttachmentPoint">
-             <summary>
-             Attachment points for objects on avatar bodies
-             </summary>
-             <remarks>
-             Both InventoryObject and InventoryAttachment types can be attached
-            </remarks>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.Default">
-            <summary>Right hand if object was not previously attached</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.Chest">
-            <summary>Chest</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.Skull">
-            <summary>Skull</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.LeftShoulder">
-            <summary>Left shoulder</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.RightShoulder">
-            <summary>Right shoulder</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.LeftHand">
-            <summary>Left hand</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.RightHand">
-            <summary>Right hand</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.LeftFoot">
-            <summary>Left foot</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.RightFoot">
-            <summary>Right foot</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.Spine">
-            <summary>Spine</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.Pelvis">
-            <summary>Pelvis</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.Mouth">
-            <summary>Mouth</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.Chin">
-            <summary>Chin</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.LeftEar">
-            <summary>Left ear</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.RightEar">
-            <summary>Right ear</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.LeftEyeball">
-            <summary>Left eyeball</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.RightEyeball">
-            <summary>Right eyeball</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.Nose">
-            <summary>Nose</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.RightUpperArm">
-            <summary>Right upper arm</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.RightForearm">
-            <summary>Right forearm</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.LeftUpperArm">
-            <summary>Left upper arm</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.LeftForearm">
-            <summary>Left forearm</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.RightHip">
-            <summary>Right hip</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.RightUpperLeg">
-            <summary>Right upper leg</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.RightLowerLeg">
-            <summary>Right lower leg</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.LeftHip">
-            <summary>Left hip</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.LeftUpperLeg">
-            <summary>Left upper leg</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.LeftLowerLeg">
-            <summary>Left lower leg</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.Stomach">
-            <summary>Stomach</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.LeftPec">
-            <summary>Left pectoral</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.RightPec">
-            <summary>Right pectoral</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.HUDCenter2">
-            <summary>HUD Center position 2</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.HUDTopRight">
-            <summary>HUD Top-right</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.HUDTop">
-            <summary>HUD Top</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.HUDTopLeft">
-            <summary>HUD Top-left</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.HUDCenter">
-            <summary>HUD Center</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.HUDBottomLeft">
-            <summary>HUD Bottom-left</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.HUDBottom">
-            <summary>HUD Bottom</summary>
-        </member>
-        <member name="F:OpenMetaverse.AttachmentPoint.HUDBottomRight">
-            <summary>HUD Bottom-right</summary>
-        </member>
-        <member name="T:OpenMetaverse.Tree">
+        <member name="M:OpenMetaverse.Vector3d.ToString">
             <summary>
-            Tree foliage types
+            Get a formatted string representation of the vector
             </summary>
+            <returns>A string representation of the vector</returns>
         </member>
-        <member name="F:OpenMetaverse.Tree.Pine1">
-            <summary>Pine1 tree</summary>
-        </member>
-        <member name="F:OpenMetaverse.Tree.Oak">
-            <summary>Oak tree</summary>
-        </member>
-        <member name="F:OpenMetaverse.Tree.TropicalBush1">
-            <summary>Tropical Bush1</summary>
-        </member>
-        <member name="F:OpenMetaverse.Tree.Palm1">
-            <summary>Palm1 tree</summary>
-        </member>
-        <member name="F:OpenMetaverse.Tree.Dogwood">
-            <summary>Dogwood tree</summary>
-        </member>
-        <member name="F:OpenMetaverse.Tree.TropicalBush2">
-            <summary>Tropical Bush2</summary>
-        </member>
-        <member name="F:OpenMetaverse.Tree.Palm2">
-            <summary>Palm2 tree</summary>
-        </member>
-        <member name="F:OpenMetaverse.Tree.Cypress1">
-            <summary>Cypress1 tree</summary>
-        </member>
-        <member name="F:OpenMetaverse.Tree.Cypress2">
-            <summary>Cypress2 tree</summary>
-        </member>
-        <member name="F:OpenMetaverse.Tree.Pine2">
-            <summary>Pine2 tree</summary>
-        </member>
-        <member name="F:OpenMetaverse.Tree.Plumeria">
-            <summary>Plumeria</summary>
-        </member>
-        <member name="F:OpenMetaverse.Tree.WinterPine1">
-            <summary>Winter pinetree1</summary>
-        </member>
-        <member name="F:OpenMetaverse.Tree.WinterAspen">
-            <summary>Winter Aspen tree</summary>
-        </member>
-        <member name="F:OpenMetaverse.Tree.WinterPine2">
-            <summary>Winter pinetree2</summary>
-        </member>
-        <member name="F:OpenMetaverse.Tree.Eucalyptus">
-            <summary>Eucalyptus tree</summary>
-        </member>
-        <member name="F:OpenMetaverse.Tree.Fern">
-            <summary>Fern</summary>
-        </member>
-        <member name="F:OpenMetaverse.Tree.Eelgrass">
-            <summary>Eelgrass</summary>
-        </member>
-        <member name="F:OpenMetaverse.Tree.SeaSword">
-            <summary>Sea Sword</summary>
-        </member>
-        <member name="F:OpenMetaverse.Tree.Kelp1">
-            <summary>Kelp1 plant</summary>
-        </member>
-        <member name="F:OpenMetaverse.Tree.BeachGrass1">
-            <summary>Beach grass</summary>
-        </member>
-        <member name="F:OpenMetaverse.Tree.Kelp2">
-            <summary>Kelp2 plant</summary>
-        </member>
-        <member name="T:OpenMetaverse.Grass">
+        <member name="M:OpenMetaverse.Vector3d.ToRawString">
             <summary>
-            Grass foliage types
+            Get a string representation of the vector elements with up to three
+            decimal digits and separated by spaces only
             </summary>
+            <returns>Raw string representation of the vector</returns>
         </member>
-        <member name="F:OpenMetaverse.Grass.Grass0">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Grass.Grass1">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Grass.Grass2">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Grass.Grass3">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Grass.Grass4">
-            <summary></summary>
-        </member>
-        <member name="F:OpenMetaverse.Grass.Undergrowth1">
-            <summary></summary>
+        <member name="M:OpenMetaverse.Vector3d.op_Modulus(OpenMetaverse.Vector3d,OpenMetaverse.Vector3d)">
+            <summary>
+            Cross product between two vectors
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.ClickAction">
+        <member name="M:OpenMetaverse.Vector4.#ctor(System.Byte[],System.Int32)">
             <summary>
-            Action associated with clicking on an object
+            Constructor, builds a vector from a byte array
             </summary>
+            <param name="byteArray">Byte array containing four four-byte floats</param>
+            <param name="pos">Beginning position in the byte array</param>
         </member>
-        <member name="F:OpenMetaverse.ClickAction.Touch">
-            <summary>Touch object</summary>
+        <member name="F:OpenMetaverse.Vector4.X">
+            <summary>X value</summary>
         </member>
-        <member name="F:OpenMetaverse.ClickAction.Sit">
-            <summary>Sit on object</summary>
+        <member name="F:OpenMetaverse.Vector4.Y">
+            <summary>Y value</summary>
         </member>
-        <member name="F:OpenMetaverse.ClickAction.Buy">
-            <summary>Purchase object or contents</summary>
+        <member name="F:OpenMetaverse.Vector4.Z">
+            <summary>Z value</summary>
         </member>
-        <member name="F:OpenMetaverse.ClickAction.Pay">
-            <summary>Pay the object</summary>
+        <member name="F:OpenMetaverse.Vector4.W">
+            <summary>W value</summary>
         </member>
-        <member name="F:OpenMetaverse.ClickAction.OpenTask">
-            <summary>Open task inventory</summary>
+        <member name="F:OpenMetaverse.Vector4.Zero">
+            <summary>A vector with a value of 0,0,0,0</summary>
         </member>
-        <member name="F:OpenMetaverse.ClickAction.PlayMedia">
-            <summary>Play parcel media</summary>
+        <member name="F:OpenMetaverse.Vector4.One">
+            <summary>A vector with a value of 1,1,1,1</summary>
         </member>
-        <member name="F:OpenMetaverse.ClickAction.OpenMedia">
-            <summary>Open parcel media</summary>
+        <member name="F:OpenMetaverse.Vector4.UnitX">
+            <summary>A vector with a value of 1,0,0,0</summary>
         </member>
-        <member name="T:OpenMetaverse.Vector2">
-            <summary>
-            A two-dimensional vector with floating-point values
-            </summary>
+        <member name="F:OpenMetaverse.Vector4.UnitY">
+            <summary>A vector with a value of 0,1,0,0</summary>
         </member>
-        <member name="F:OpenMetaverse.Vector2.X">
-            <summary>X value</summary>
+        <member name="F:OpenMetaverse.Vector4.UnitZ">
+            <summary>A vector with a value of 0,0,1,0</summary>
         </member>
-        <member name="F:OpenMetaverse.Vector2.Y">
-            <summary>Y value</summary>
+        <member name="F:OpenMetaverse.Vector4.UnitW">
+            <summary>A vector with a value of 0,0,0,1</summary>
         </member>
-        <member name="M:OpenMetaverse.Vector2.ApproxEquals(OpenMetaverse.Vector2,System.Single)">
+        <member name="M:OpenMetaverse.Vector4.ApproxEquals(OpenMetaverse.Vector4,System.Single)">
             <summary>
             Test if this vector is equal to another vector, within a given
             tolerance range
@@ -2530,73 +2655,43 @@
             <returns>True if the magnitude of difference between the two vectors
             is less than the given tolerance, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector2.IsFinite">
+        <member name="M:OpenMetaverse.Vector4.CompareTo(OpenMetaverse.Vector4)">
             <summary>
-            Test if this vector is composed of all finite numbers
+            IComparable.CompareTo implementation
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Vector2.CompareTo(OpenMetaverse.Vector2)">
+        <member name="M:OpenMetaverse.Vector4.IsFinite">
             <summary>
-            IComparable.CompareTo implementation
+            Test if this vector is composed of all finite numbers
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Vector2.FromBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Vector4.FromBytes(System.Byte[],System.Int32)">
             <summary>
             Builds a vector from a byte array
             </summary>
-            <param name="byteArray">Byte array containing two four-byte floats</param>
+            <param name="byteArray">Byte array containing a 16 byte vector</param>
             <param name="pos">Beginning position in the byte array</param>
         </member>
-        <member name="M:OpenMetaverse.Vector2.GetBytes">
+        <member name="M:OpenMetaverse.Vector4.GetBytes">
             <summary>
             Returns the raw bytes for this vector
             </summary>
-            <returns>An eight-byte array containing X and Y</returns>
+            <returns>A 16 byte array containing X, Y, Z, and W</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector2.ToBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Vector4.ToBytes(System.Byte[],System.Int32)">
             <summary>
             Writes the raw bytes for this vector to a byte array
             </summary>
             <param name="dest">Destination byte array</param>
             <param name="pos">Position in the destination array to start
-            writing. Must be at least 8 bytes before the end of the array</param>
-        </member>
-        <member name="M:OpenMetaverse.Vector2.Parse(System.String)">
-            <summary>
-            Parse a vector from a string
-            </summary>
-            <param name="val">A string representation of a 2D vector, enclosed 
-            in arrow brackets and separated by commas</param>
-        </member>
-        <member name="M:OpenMetaverse.Vector2.SmoothStep(OpenMetaverse.Vector2,OpenMetaverse.Vector2,System.Single)">
-            <summary>
-            Interpolates between two vectors using a cubic equation
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.Vector2.ToString">
-            <summary>
-            Get a formatted string representation of the vector
-            </summary>
-            <returns>A string representation of the vector</returns>
+            writing. Must be at least 16 bytes before the end of the array</param>
         </member>
-        <member name="M:OpenMetaverse.Vector2.ToRawString">
+        <member name="M:OpenMetaverse.Vector4.ToRawString">
             <summary>
             Get a string representation of the vector elements with up to three
             decimal digits and separated by spaces only
             </summary>
             <returns>Raw string representation of the vector</returns>
         </member>
-        <member name="F:OpenMetaverse.Vector2.Zero">
-            <summary>A vector with a value of 0,0</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector2.One">
-            <summary>A vector with a value of 1,1</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector2.UnitX">
-            <summary>A vector with a value of 1,0</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector2.UnitY">
-            <summary>A vector with a value of 0,1</summary>
-        </member>
     </members>
 </doc>
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 653de5c..7e7b231 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -97,10 +97,6 @@
     ;; from the selected region_info_source.
     ; allow_regionless = false
 
-    ;# {MaxPrimUndos} {} {Maximum number of undos avialable for position, rotation and scale changes of each prim} {} 20
-    ;; Increasing the number of undos available number will increase memory usage.
-    MaxPrimUndos = 20
-
     ;# {NonPhysicalPrimMin} {} {Minimum size of nonphysical prims?} {} 0.001
     ;; Minimum size for non-physical prims.  Affects resizing of existing 
     ;; prims.  This can be overriden in the region config file (as 
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 2512428..e2d952a 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -81,10 +81,6 @@
     ;; from the selected region_info_source.
     allow_regionless = false
 
-    ; Maximum number of position, rotation and scale changes for each prim that the simulator will store for later undos
-    ; Increasing this number will increase memory usage.
-    MaxPrimUndos = 20
-
     ; Maximum size of non physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file (as NonPhysicalPrimMax!).
     NonPhysicalPrimMax = 256
 
@@ -478,7 +474,7 @@
     ; clients login by starting each connection more slowly. Disabled by
     ; default
     ;
-    enable_adaptive_throttles = true
+    enable_adaptive_throttles = false
 
     ; Per-client bytes per second rates for the various throttle categories.
     ; These are default values that will be overriden by clients. These
@@ -1561,7 +1557,7 @@
     GroupsCacheTimeout = 30
 
     ; Specify which messaging module to use for groups messaging and if it's enabled
-    MessagingModule = GroupsMessagingModule
+    ;MessagingModule = GroupsMessagingModule
     ;MessagingEnabled = true 
 
     ; Experimental option to only message cached online users rather than all users
diff --git a/bin/OpenSimDefaults.ini.example b/bin/OpenSimDefaults.ini.example
new file mode 100644
index 0000000..ef8f73a
--- /dev/null
+++ b/bin/OpenSimDefaults.ini.example
@@ -0,0 +1,1325 @@
+[Startup]
+    ; Set this to true if you want to log crashes to disk
+    ; this can be useful when submitting bug reports.
+    save_crashes = false
+
+    ; Directory to save crashes to if above is enabled
+    ; (default is /opensimdir/crashes/*.txt or C:\opensim\crashes\*.txt)
+    crash_dir = "crashes"
+
+    ; Place to create a PID file
+    ; PIDFile = "/tmp/my.pid"
+
+    ; Http proxy support for llHTTPRequest and dynamic texture loading
+    ; Set HttpProxy to the URL for your proxy server if you would like
+    ; to proxy llHTTPRequests through a firewall
+    ; HttpProxy = "http://proxy.com"
+    ; Set HttpProxyExceptions to a list of regular expressions for
+    ; URLs that you don't want going through the proxy such as servers
+    ; inside your firewall, separate patterns with a ';'
+    ; HttpProxyExceptions = ".mydomain.com;localhost"
+
+    startup_console_commands_file = "startup_commands.txt"
+    shutdown_console_commands_file = "shutdown_commands.txt"
+
+    ; To run a script every few minutes, set the script filename here
+    ; timer_Script = "filename"
+
+    ; ##
+    ; ## SYSTEM
+    ; ##
+
+    ; Sets the method that OpenSim will use to fire asynchronous
+    ; events. Valid values are UnsafeQueueUserWorkItem,
+    ; QueueUserWorkItem, BeginInvoke, SmartThreadPool, and Thread.
+    ; SmartThreadPool is reported to work well on Mono/Linux, but
+    ; UnsafeQueueUserWorkItem has been benchmarked with better
+    ; performance on .NET/Windows
+    async_call_method = SmartThreadPool
+
+    ; Max threads to allocate on the FireAndForget thread pool
+    ; when running with the SmartThreadPool option above
+    MaxPoolThreads = 15
+
+    ; ##
+    ; ## CLIENTS
+    ; ##
+
+    ; Enables EventQueueGet Service.
+    EventQueue = true
+
+    ; Set this to the DLL containing the client stack to use.
+    clientstack_plugin="OpenSim.Region.ClientStack.LindenUDP.dll"
+
+    ; ##
+    ; ## REGIONS
+    ; ##
+
+    ; Determine where OpenSimulator looks for the files which tell it which regions to server
+    ; Defaults to "filesystem" if this setting isn't present
+    region_info_source = "filesystem"
+    ; region_info_source = "web"
+
+    ; Determines where the region XML files are stored if you are loading these from the filesystem.
+    ; Defaults to bin/Regions in your OpenSimulator installation directory
+    ; regionload_regionsdir="C:\somewhere\xmlfiles\"
+
+    ; Determines the page from which regions xml is retrieved if you are loading these from the web
+    ; The XML here has the same format as it does on the filesystem (including the <Root> tag),
+    ; except that everything is also enclosed in a <Regions> tag.
+    ; regionload_webserver_url = "http://example.com/regions.xml";
+
+    ; Draw objects on maptile.  This step might take a long time if you've got a large number of
+    ; objects, so you can turn it off here if you'd like.
+    DrawPrimOnMapTile = true
+    ; Use terrain texture for maptiles if true, use shaded green if false
+    TextureOnMapTile = false
+
+    ; Maximum total size, and maximum size where a prim can be physical
+    NonPhysicalPrimMax = 256
+    PhysicalPrimMax = 10 ; (I think this was moved to the Regions.ini!)
+    ClampPrimSize = false
+
+    ; Allow scripts to cross region boundaries.  These are recompiled on the new region.
+    AllowScriptCrossing = false
+
+    ; Allow compiled script binary code to cross region boundaries.
+    ; If you set this to "true", any region that can teleport to you can
+    ; inject ARBITRARY BINARY CODE into your system. Use at your own risk.
+    ; YOU HAVE BEEN WARNED!!!
+    TrustBinaries = false
+
+    ; Combine all contiguous regions into one large megaregion
+    ; Order your regions from South to North, West to East in your regions.ini and then set this to true
+    ; Warning!  Don't use this with regions that have existing content!, This will likely break them
+    CombineContiguousRegions = false
+
+    ; If you have only one region in an instance, or to avoid the many bugs
+    ; that you can trigger in modules by restarting a region, set this to
+    ; true to make the entire instance exit instead of restarting the region.
+    ; This is meant to be used on systems where some external system like
+    ; Monit will restart any instance that exits, thereby making the shutdown
+    ; into a restart.
+    ;InworldRestartShutsDown = false
+
+    ; ##
+    ; ## PRIM STORAGE
+    ; ##
+
+    ; Persistence of changed objects happens during regular sweeps. The following control that behaviour to
+    ; prevent frequently changing objects from heavily loading the region data store.
+    ; If both of these values are set to zero then persistence of all changed objects will happen on every sweep.
+    ;
+    ; Objects will be considered for persistance in the next sweep when they have not changed for this number of seconds
+    MinimumTimeBeforePersistenceConsidered = 60
+    ; Objects will always be considered for persistance in the next sweep if the first change occurred this number of seconds ago
+    MaximumTimeBeforePersistenceConsidered = 600
+
+    ; Should avatars in neighbor sims see objects in this sim?
+    see_into_this_sim_from_neighbor = true
+
+    ; ##
+    ; ## PHYSICS
+    ; ##
+
+    ; if you would like to allow prims to be physical and move by physics with the physical checkbox in the client set this to true.
+    physical_prim = true
+
+    ; Select a mesher here.
+    ;
+    ; Meshmerizer properly handles complex prims by using triangle meshes.
+    ; Note that only the ODE physics engine currently deals with meshed prims in a satisfactory way
+    ;
+    ; ZeroMesher is faster but leaves the physics engine to model the mesh using the basic shapes that it supports
+    ; Usually this is only a box
+
+    meshing = Meshmerizer
+    ;meshing = ZeroMesher
+
+    ; Choose one of the physics engines below
+    ; OpenDynamicsEngine is by some distance the most developed physics engine
+    ; basicphysics effectively does not model physics at all, making all objects phantom
+
+    physics = OpenDynamicsEngine
+    ;physics = basicphysics
+    ;physics = POS
+    ;physics = modified_BulletX
+
+    ; ##
+    ; ## PERMISSIONS
+    ; ##
+
+    ;permissionmodules = "DefaultPermissionsModule"
+
+    ;If any of the specified permissions modules fail to load, quit?
+    SecurePermissionsLoading = true
+
+    ; If set to false, then, in theory, the server never carries out permission checks (allowing anybody to copy
+    ; any item, etc.  This may not yet be implemented uniformally.
+    ; If set to true, then all permissions checks are carried out
+    ; Default is false
+    serverside_object_permissions = false
+
+    allow_grid_gods = false
+
+    ; This allows somne control over permissions
+    ; please note that this still doesn't duplicate SL, and is not intended to
+    ;region_owner_is_god = true
+    ;region_manager_is_god = false
+    ;parcel_owner_is_god = true
+
+    ; Control user types that are allowed to create new scripts
+    ; Only enforced if serviceside_object_permissions is true
+    ;
+    ; Current possible values are
+    ;     all - anyone can create scripts (subject to normal permissions)
+    ;     gods - only administrators can create scripts (as long as allow_grid_gods is true)
+    ; Default value is all
+    ; allowed_script_creators = all
+
+    ; Control user types that are allowed to edit (save) scripts
+    ; Only enforced if serviceside_object_permissions is true
+    ;
+    ; Current possible values are
+    ;     all - anyone can edit scripts (subject to normal permissions)
+    ;     gods - only administrators can edit scripts (as long as allow_grid_gods is true)
+    ; Default value is all
+    ; allowed_script_editors = all
+
+    ; ##
+    ; ## SCRIPT ENGINE
+    ; ##
+
+    DefaultScriptEngine = "XEngine"
+
+    ; ##
+    ; ## WORLD MAP
+    ; ##
+
+    ;WorldMapModule = "WorldMap"
+    ;MapImageModule = "MapImageModule"
+    ; Set to false to not generate any maptiles
+    ;GenerateMaptiles = "true"
+    ; Refresh (in seconds) the map tile periodically
+    ;MaptileRefresh = 0
+    ; If not generating maptiles, use this static texture asset ID
+    ;MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
+
+    ; ##
+    ; ## EMAIL MODULE
+    ; ##
+
+    ;emailmodule = DefaultEmailModule
+
+    ; ##
+    ; ## ANIMATIONS
+    ; ##
+
+    ; If enabled, enableFlySlow will change the primary fly state to
+    ; FLYSLOW, and the "always run" state will be the regular fly.
+
+    enableflyslow = false
+
+    ; PreJump is an additional animation state, but it probably
+    ; won't look right until the physics engine supports it
+    ; (i.e delays takeoff for a moment)
+
+    ; This is commented so it will come on automatically once it's
+    ; supported.
+
+    ; enableprejump = true
+
+    ; Simulator Stats URI
+    ; Enable JSON simulator data by setting a URI name (case sensitive)
+    ; Stats_URI = "jsonSimStats"
+
+    ; Make OpenSim start all regions woth logins disabled. They will need
+    ; to be enabled from the console if this is set
+    ; StartDisabled = false
+
+    ; Image decoding. Use CSJ2K for layer boundary decoding if true,
+    ; OpenJPEG if false
+    ; UseCSJ2K = true
+
+[SMTP]
+    enabled=false
+
+    ;enabled=true
+    ;internal_object_host=lsl.opensim.local
+    ;host_domain_header_from=127.0.0.1
+    ;SMTP_SERVER_HOSTNAME=127.0.0.1
+    ;SMTP_SERVER_PORT=25
+    ;SMTP_SERVER_LOGIN=foo
+    ;SMTP_SERVER_PASSWORD=bar
+
+[Network]
+    ConsoleUser = "Test"
+    ConsolePass = "secret"
+    http_listener_port = 9000
+    console_port = 0
+
+    ; ssl config: Experimental!  The auto https config only really works definately on windows XP now
+    ; you need a Cert Request/Signed pair installed in the MY store with the CN specified below
+    ; you can use https on other platforms, but you'll need to configure the httpapi yourself for now
+    http_listener_ssl = false ; Also create a SSL server
+    http_listener_cn = "localhost" ; Use the cert with the common name
+    http_listener_sslport = 9001 ; Use this port for SSL connections
+    http_listener_ssl_cert = "" ; Currently unused, but will be used for OSHttpServer
+
+    ; Hostname to use in llRequestURL/llRequestSecureURL
+    ; if not defined - default machine name is being used
+    ; (on Windows this mean NETBIOS name - useably only inside local network)
+    ; ExternalHostNameForLSL=127.0.0.1
+
+    ; What is reported as the "X-Secondlife-Shard"
+    ; Defaults to the user server url if not set
+    ; The old default is "OpenSim", set here for compatibility
+    shard = "OpenSim"
+
+    ; What is reported as the "User-Agent" when using llHTTPRequest
+    ; Defaults to not sent if not set here. See the notes section in the wiki at
+    ; http://wiki.secondlife.com/wiki/LlHTTPRequest for comments on adding
+    ; " (Mozilla Compatible)" to the text where there are problems with a web server
+    ;user_agent = "OpenSim LSL (Mozilla Compatible)"
+
+[XMLRPC]
+    ; ##
+    ; ## Scripting XMLRPC mapper
+    ; ##
+
+    ; If enabled, this will post an event, "xmlrpc_uri(string)" to the
+    ; script concurrently with the first remote_data event.
+    ; This will contain the fully qualified URI an external site needs
+    ; to use to send XMLRPC requests to that script
+
+    ;XmlRpcRouterModule = "XmlRpcRouterModule"
+    ;XmlRpcPort = 20800
+
+[ClientStack.LindenUDP]
+    ; Set this to true to process incoming packets asynchronously. Networking is
+    ; already separated from packet handling with a queue, so this will only
+    ; affect whether networking internals such as packet decoding and
+    ; acknowledgement accounting are done synchronously or asynchronously
+    ;
+    ;async_packet_handling = false
+
+    ; The client socket receive buffer size determines how many
+    ; incoming requests we can process; the default on .NET is 8192
+    ; which is about 2 4k-sized UDP datagrams. On mono this is
+    ; whatever the underlying operating system has as default; for
+    ; example, ubuntu 8.04 or SLES11 have about 111k, which is about
+    ; 27 4k-sized UDP datagrams (on linux platforms you can [as root]
+    ; do "sysctl net.core.rmem_default" to find out what your system
+    ; uses a default socket receive buffer size.
+    ;
+    ; client_socket_rcvbuf_size allows you to specify the receive
+    ; buffer size LLUDPServer should use. NOTE: this will be limited
+    ; by the system's settings for the maximum client receive buffer
+    ; size (on linux systems you can set that with "sysctl -w
+    ; net.core.rmem_max=X")
+    ;
+    ;client_socket_rcvbuf_size = 8388608
+
+    ; Maximum outbound bytes per second for a single scene. This can be used to
+    ; throttle total outbound UDP traffic for a simulator. The default value is
+    ; 0, meaning no throttling at the scene level. The example given here is
+    ; 20 megabits
+    ;
+    ;scene_throttle_max_bps = 2621440
+
+    ; Maximum bits per second to send to any single client. This will override
+    ; the user's viewer preference settings. The default value is 0, meaning no
+    ; aggregate throttling on clients (only per-category throttling). The
+    ; example given here is 1.5 megabits
+    ;
+    ;client_throttle_max_bps = 196608
+
+    ; Per-client bytes per second rates for the various throttle categories.
+    ; These are default values that will be overriden by clients
+    ;
+    ;resend_default = 12500
+    ;land_default = 1000
+    ;wind_default = 1000
+    ;cloud_default = 1000
+    ;task_default = 1000
+    ;texture_default = 1000
+    ;asset_default = 1000
+    ;state_default = 1000
+
+    ; Per-client maximum burst rates in bytes per second for the various
+    ; throttle categories. These are default values that will be overriden by
+    ; clients
+    ;
+    ;resend_limit = 18750
+    ;land_limit = 29750
+    ;wind_limit = 18750
+    ;cloud_limit = 18750
+    ;task_limit = 18750
+    ;texture_limit = 55750
+    ;asset_limit = 27500
+    ;state_limit = 37000
+
+    ; Configures how ObjectUpdates are aggregated. These numbers
+    ; do not literally mean how many updates will be put in each
+    ; packet that goes over the wire, as packets are
+    ; automatically split on a 1400 byte boundary. These control
+    ; the balance between responsiveness of interest list updates
+    ; and total throughput. Higher numbers will ensure more full-
+    ; sized packets and faster sending of data, but more delay in
+    ; updating interest lists
+    ;
+    ;PrimTerseUpdatesPerPacket = 25
+    ;AvatarTerseUpdatesPerPacket = 10
+    ;PrimFullUpdatesPerPacket = 100
+
+    ; TextureSendLimit determines how many packets will be put on
+    ; the outgoing queue each cycle. Like the settings above, this
+    ; is a balance between responsiveness to priority updates and
+    ; total throughput. Higher numbers will give a better
+    ; throughput at the cost of reduced responsiveness to client
+    ; priority changes or transfer aborts
+    ;
+    ;TextureSendLimit = 20
+
+    ; Quash and remove any light properties from attachments not on the
+    ; hands. This allows flashlights and lanterns to function, but kills
+    ; silly vanity "Facelights" dead. Sorry, head mounted miner's lamps
+    ; will also be affected.
+    ;
+    ;DisableFacelights = "false"
+
+[Chat]
+    ; Controls whether the chat module is enabled.  Default is true.
+    enabled = true;
+
+    ; Distance in meters that whispers should travel.  Default is 10m
+    whisper_distance = 10
+
+    ; Distance in meters that ordinary chat should travel.  Default is 30m
+    say_distance = 30
+
+    ; Distance in meters that shouts should travel.  Default is 100m
+    shout_distance = 100
+    
+    ; Append a prefix to the god avatar names appearing in chat whilst in god mode
+    ; admin_prefix = "@"
+
+
+[Messaging]
+    ; Control which region module is used for instant messaging.
+    ; Default is InstantMessageModule (this is the name of the core IM module as well as the setting)
+    InstantMessageModule = InstantMessageModule
+    ; MessageTransferModule = MessageTransferModule
+    ; OfflineMessageModule = OfflineMessageModule
+    ; OfflineMessageURL = http://yourserver/Offline.php
+    ; MuteListModule = MuteListModule
+    ; MuteListURL = http://yourserver/Mute.php
+
+    ; Control whether group messages are forwarded to offline users.  Default is true.
+    ; ForwardOfflineGroupMessages = true
+
+
+[ODEPhysicsSettings]
+    ;##
+    ;## World Settings
+    ;##
+
+    ;Gravity.  Feel like falling up?  change world_gravityz to 9.8 instead of -9.8.  m/s
+    world_gravityx = 0
+    world_gravityy = 0
+    world_gravityz = -9.8
+
+    ; World Step size. (warning these are dangerous.  Changing these will probably cause your scene to explode dramatically)
+    ; reference: fps = (0.09375/ODE_STEPSIZE) * 1000;
+    world_stepsize = 0.020
+    world_internal_steps_without_collisions = 10
+
+    ;World Space settings. Affects memory consumption vs Collider CPU time for avatar and physical prim
+    world_hashspace_size_low = -4
+    world_hashSpace_size_high = 128
+
+    ;Dynamic space settings Affects memory consumption vs Collider CPU time for static prim
+    meters_in_small_space = 29.9
+    small_hashspace_size_low = -4
+    small_hashspace_size_high = 66
+
+    ; ##
+    ; ## Contact properties. (the stuff that happens when things come in contact with each other)
+    ; ##
+
+    ; surface layer around geometries other geometries can sink into before generating a contact
+    world_contact_surface_layer = 0.001
+
+    ; Filtering collisions helps keep things stable physics wise, but sometimes
+    ; it can be overzealous.  If you notice bouncing, chances are it's that.
+    filter_collisions = false
+
+    ; Non Moving Terrain Contact (avatar isn't moving)
+    nm_terraincontact_friction = 255.0
+    nm_terraincontact_bounce = 0.1
+    nm_terraincontact_erp = 0.1025
+
+    ; Moving Terrain Contact (avatar is moving)
+    m_terraincontact_friction = 75.0
+    m_terraincontact_bounce = 0.05
+    m_terrainContact_erp = 0.05025
+
+    ; Moving Avatar to object Contact
+    m_avatarobjectcontact_friction = 75.0
+    m_avatarobjectcontact_bounce = 0.1
+
+    ; Object to Object Contact and Non-Moving Avatar to object
+    objectcontact_friction = 250.0
+    objectcontact_bounce = 0.2
+
+    ; ##
+    ; ## Avatar Control
+    ; ##
+
+    ; PID Controller Settings. These affect the math that causes the avatar to reach the
+    ; desired velocity
+    ; See http://en.wikipedia.org/wiki/PID_controller
+
+    av_pid_derivative_linux = 2200.0
+    av_pid_proportional_linux = 900.0;
+
+    av_pid_derivative_win = 2200.0
+    av_pid_proportional_win = 900.0;
+
+    ;girth of the avatar.  Adds radius to the height also
+    av_capsule_radius = 0.37
+
+    ; Max force permissible to use to keep the avatar standing up straight
+    av_capsule_standup_tensor_win = 550000
+    av_capsule_standup_tensor_linux = 550000
+
+    ; specifies if the capsule should be tilted (=true; old compatibility mode)
+    ; or straight up-and-down (=false; better and more consistent physics behavior)
+    av_capsule_tilted = false
+
+    ; used to calculate mass of avatar.
+    ; float AVvolume = (float) (Math.PI*Math.Pow(CAPSULE_RADIUS, 2)*CAPSULE_LENGTH);
+    ; av_density * AVvolume;
+    av_density = 80
+
+    ; use this value to cut 52% of the height the sim gives us
+    av_height_fudge_factor = 0.52
+
+    ; Movement.  Smaller is faster.
+
+    ; speed of movement with Always Run off
+    av_movement_divisor_walk = 1.3
+
+    ; speed of movement with Always Run on
+    av_movement_divisor_run = 0.8
+
+    ; When the avatar flies, it will be moved up by this amount off the ground (in meters)
+    minimum_ground_flight_offset = 3.0
+
+    ; ##
+    ; ## Object options
+    ; ##
+
+    ; used in the mass calculation.
+    geometry_default_density = 10.000006836
+
+    ; amount of ODE steps where object is non moving for ODE to automatically put it to sleep
+    body_frames_auto_disable = 20
+
+    ; used to control llMove2Target
+    body_pid_derivative = 35
+    body_pid_gain = 25
+
+    ; maximum number of contact points to generate per collision
+    contacts_per_collision = 80
+
+    ; amount of time a geom/body will try to cross a region border before it gets disabled
+    geom_crossing_failures_before_outofbounds = 5
+
+    ; start throttling the object updates if object comes in contact with 3 or more other objects
+    geom_contactpoints_start_throttling = 3
+
+    ; send 1 update for every x updates below when throttled
+    geom_updates_before_throttled_update = 15
+
+    ; Used for llSetStatus.  How rigid the object rotation is held on the axis specified
+    body_motor_joint_maxforce_tensor_linux = 5
+    body_motor_joint_maxforce_tensor_win = 5
+
+    ; Maximum mass an object can be before it is clamped
+    maximum_mass_object = 10000.01
+
+    ; ##
+    ; ## Sculpted Prim settings
+    ; ##
+
+    ; Do we want to mesh sculpted prim to collide like they look?
+    mesh_sculpted_prim = true
+
+    ; number^2 non-physical level of detail of the sculpt texture.  32x32 - 1024 verticies
+    mesh_lod = 32
+
+    ; number^2 physical level of detail of the sculpt texture.  16x16 - 256 verticies
+    mesh_physical_lod = 16
+
+    ; ##
+    ; ## Physics logging settings - logfiles are saved to *.DIF files
+    ; ##
+
+    ; default is false
+    ;physics_logging = true
+    ;; every n simulation iterations, the physics snapshot file is updated
+    ;physics_logging_interval = 50
+    ;; append to existing physics logfile, or overwrite existing logfiles?
+    ;physics_logging_append_existing_logfile = true
+
+    ; ##
+    ; ## Joint support
+    ; ##
+
+    ; if you would like physics joints to be enabled through a special naming convention in the client, set this to true.
+    ; (see NINJA Physics documentation, http://opensimulator.org/wiki/NINJA_Physics)
+    ; default is false
+    ;use_NINJA_physics_joints = true
+
+    ; ##
+    ; ## additional meshing options
+    ; ##
+
+    ; physical collision mesh proxies are normally created for complex prim shapes, and collisions for simple boxes and
+    ; spheres are computed algorithmically. If you would rather have mesh proxies for simple prims, you can set this to
+    ; true. Note that this will increase memory usage and region startup time. Default is false.
+    ;force_simple_prim_meshing = true
+
+
+[RemoteAdmin]
+    enabled = false
+
+    ; Set this to a nonzero value to have remote admin use a different port
+    port = 0
+
+    ; This password is required to make any XMLRPC call (should be set as the "password" parameter)
+    access_password = unknown
+
+    ; set this variable to true if you want the create_region XmlRpc
+    ; call to unconditionally enable voice on all parcels for a newly
+    ; created region [default: false]
+    create_region_enable_voice = false
+
+    ; set this variable to false if you want the create_region XmlRpc
+    ; call to create all regions as private per default (can be
+    ; overridden in the XmlRpc call) [default: true]
+    create_region_public = false
+
+    ; the create_region XmlRpc call uses region_file_template to generate
+    ; the file name of newly create regions (if they are created
+    ; persistent). the parameter available are:
+    ;     {0} - X location
+    ;     {1} - Y location
+    ;     {2} - region UUID
+    ;     {3} - region port
+    ;     {4} - region name with " ", ":", "/" mapped to  "_"
+    region_file_template = "{0}x{1}-{2}.ini"
+
+    ; we can limit the number of regions that XmlRpcCreateRegion will
+    ; allow by setting this to a positive, non-0 number: as long as the
+    ; number of regions is below region_limits, XmlRpcCreateRegion will
+    ; succeed. setting region_limit to 0 disables the check.
+    ; default is 0
+    ;region_limit = 0
+
+    ; enable only those methods you deem to be appropriate using a | delimited whitelist
+    ; for example, enabled_methods = admin_broadcast|admin_region_query|admin_save_oar|admin_save_xml
+    ; if this parameter is not specified but enabled = true, all methods will be available
+    enabled_methods = all
+
+    ; specify the default appearance for an avatar created through the remote admin interface
+    ; This will only take effect is the file specified by the default_appearance setting below exists
+    ;default_male = Default Male
+    ;default_female = Default Female
+
+    ; update appearance copies inventory items and wearables of default avatars. if this value is false
+    ; (default), just worn assets are copied to the Clothes folder; if true, all Clothes and Bodyparts
+    ; subfolders are copied. the receiver will wear the same items the default avatar did wear.
+    ;copy_folders = false
+
+    ; path to default appearance XML file that specifies the look of the default avatars
+    ;default_appearance = default_appearance.xml 
+
+[RestPlugins]
+    ; Change this to true to enable REST Plugins. This must be true if you wish to use
+    ; REST Region or REST Asset and Inventory Plugins
+    enabled = false
+    god_key = SECRET
+    prefix = /admin
+
+
+[RestRegionPlugin]
+    ; Change this to true to enable the REST Region Plugin
+    enabled = false
+
+
+[RestHandler]
+    ; Change this to true to enable the REST Asset and Inventory Plugin
+    enabled = false
+    authenticate = true
+    secured = true
+    extended-escape = true
+    realm = OpenSim REST
+    dump-asset = false
+    path-fill = true
+    dump-line-size = 32
+    flush-on-error = true
+
+
+; Uncomment the following for IRC bridge
+; experimental, so if it breaks... keep both parts... yada yada
+; also, not good error detection when it fails
+;[IRC]
+    ;enabled = true ; you need to set this otherwise it won't connect
+    ;server  = name.of.irc.server.on.the.net
+    ;; user password - only use this if the server requires one
+    ;password = mypass
+    ;nick    = OpenSimBotNameProbablyMakeThisShorter
+    ;channel = #the_irc_channel_you_want_to_connect_to
+    ;user    = "USER OpenSimBot 8 * :I'm an OpenSim to IRC bot"
+    ;port = 6667
+    ;; channel to listen for configuration commands
+    ;commands_enabled = false
+    ;command_channel = 2777
+    ;report_clients = true
+    ;; relay private chat connections
+    ;; relay_private_channels = true: will relay IRC chat from/to private in-world channels
+    ;; relay_private_channel_out -- channel to send messages out to the IRC bridge
+    ;; relay_private_channel_in -- channel to receive message from the IRC bridge
+    ;; relay_chat = false: IRC bridge will not relay normal chat
+    ;; access_password -- simple security device
+    ;;
+    ;; so, to just relay chat from an IRC channel to in-world region and vice versa:
+    ;;
+    ;;     relay_private_channels = false
+    ;;     relay_chat = true
+    ;;
+    ;; to relay chat only to/from private in-world channels:
+    ;;
+    ;;     relay_chat = false
+    ;;     relay_private_channels = true
+    ;;     relay_private_channel_in = 2226
+    ;;     relay_private_channel_out = 2225
+    ;;
+    ;; in this example, all chat coming in from IRC will be send out via
+    ;; in-world channel 2226, and all chat from in-world channel 2225 will
+    ;; be relayed to the IRC channel.
+    ;;
+    ;relay_private_channels = false
+    ;relay_private_channel_in = 2226
+    ;relay_private_channel_out = 2225
+    ;relay_chat = true
+    ;access_password = foobar
+
+    ;;fallback_region = name of "default" region
+    ;;MSGformat fields : 0=botnick, 1=user, 2=region, 3=message
+    ;; must start with "PRIVMSG {0} : " or irc server will get upset
+    ;;for <bot>:<user in region> :<message>
+    ;;msgformat = "PRIVMSG {0} :<{1} in {2}>: {3}"
+    ;;for <bot>:<message> - <user of region> :
+    ;msgformat = "PRIVMSG {0} : {3} - {1} of {2}"
+    ;;for <bot>:<message> - from <user> :
+    ;;msgformat = "PRIVMSG {0} : {3} - from {1}"
+
+    ;; exclude_list allows you to stop the IRC connector from announcing the
+    ;;arrival and departure of certain users. For example: admins, bots.
+
+    ;exclude_list=User 1,User 2,User 3
+
+
+;[CMS]
+    ;enabled = true
+    ;channel = 345
+
+
+; Uncomment the following to control the progression of daytime
+; in the Sim.  The defaults are what is shown below
+;[Sun]
+    ; number of wall clock hours for an opensim day.  24.0 would mean realtime
+    ;day_length = 4
+    ; Year length in days
+    ;year_length = 60
+    ; Day to Night Ratio
+    ;day_night_offset = 0.45
+    ; send a Sun update every update_interval # of frames.  A lower number will
+    ; make for smoother sun transition at the cost of network
+    ;update_interval = 100
+
+
+[Wind]
+    ; Enables the wind module.  Default is true
+    enabled = true
+
+    ; How often should wind be updated, as a function of world frames.  Approximately 50 frames a second
+    wind_update_rate = 150
+
+    ; The Default Wind Plugin to load
+    wind_plugin = SimpleRandomWind
+
+    ; These settings are specific to the ConfigurableWind plugin
+    ; To use ConfigurableWind as the default, simply change wind_plugin to ConfigurableWind and uncomment the following.
+    ; avg_strength  = 5.0
+    ; avg_direction = 0.0
+    ; var_strength  = 0.0
+    ; var_direction = 0.0
+    ; rate_change   = 1.0
+
+    ; This setting is specific to the SimpleRandomWind plugin
+    ; Adjusts wind strength. 0.0 = no wind, 1.0 = normal wind.  Default is 1.0
+    strength = 1.0
+
+
+[Cloud]
+    ; Enable this to generate classic particle clouds above the sim.
+    ; default is disabled - turn it on here
+    enabled = false
+
+    ; Density of cloud cover 0.0 to 1.0 Defult 0.5
+    density = 0.5
+
+    ; update interval for the cloud cover data returned by llCloud().
+    ; default is 1000
+    cloud_update_rate = 1000
+
+[LightShare]
+
+    ; This enables the transmission of Windlight scenes to supporting clients, such as the Meta7 viewer.
+    ; It has no ill effect on viewers which do not support server-side windlight settings.
+    ; Currently we only have support for MySQL databases.
+    enable_windlight = false;
+
+[Trees]
+    ; Enable this to allow the tree module to manage your sim trees, including growing, reproducing and dying
+    ; default is false
+    active_trees = false
+
+    ; Density of tree population
+    tree_density = 1000.0
+
+
+[VectorRender]
+
+    ; the font to use for rendering text (default: Arial)
+    ; font_name = "Arial"
+
+
+[LL-Functions]
+    ; Set the following to true to allow administrator owned scripts to execute console commands
+    ; currently unused
+    ; AllowosConsoleCommand=false
+
+    AllowGodFunctions = false
+
+    ; Maximum number of llListen events we allow per script
+    ; Set this to 0 to have no limit imposed.
+    max_listens_per_script = 64
+
+
+[DataSnapshot]
+    ; The following set of configs pertains to search.
+    ; Set index_sims to true to enable search engines to index your searchable data
+    ; If false, no data will be exposed, DataSnapshot module will be off, and you can ignore the rest of these search-related configs
+    ; default is false
+    index_sims = false
+
+    ; The variable data_exposure controls what the regions expose:
+    ;    minimum: exposes only things explicitly marked for search
+    ;    all: exposes everything
+    data_exposure = minimum
+
+    ; If search is on, change this to your grid name; will be ignored for standalones
+    gridname = "OSGrid"
+
+    ; Period between data snapshots, in seconds. 20 minutes, for starters, so that you see the initial changes fast.
+    ; Later, you may want to increase this to 3600 (1 hour) or more
+    default_snapshot_period = 1200
+
+    ; This will be created in bin, if it doesn't exist already. It will hold the data snapshots.
+    snapshot_cache_directory = "DataSnapshot"
+
+    ; This semicolon-separated string serves to notify specific data services about the existence
+    ; of this sim. Uncomment if you want to index your data with this and/or other search providers.
+    ;data_services="http://metaverseink.com/cgi-bin/register.py"
+
+
+[Economy]
+    ; These economy values get used in the BetaGridLikeMoneyModule.  - This module is for demonstration only -
+
+    ; Enables selling things for $0
+    SellEnabled = "false"
+
+    ; 45000 is the highest value that the sim could possibly report because of protocol constraints
+    ObjectCapacity = 45000
+
+    ; Money Unit fee to upload textures, animations etc
+    PriceUpload = 0
+
+    ; Money Unit fee to create groups
+    PriceGroupCreate = 0
+
+    ; We don't really know what the rest of these values do.  These get sent to the client
+    ; These taken from Agni at a Public Telehub.  Change at your own risk.
+    ObjectCount = 0
+    PriceEnergyUnit = 100
+    PriceObjectClaim = 10
+    PricePublicObjectDecay = 4
+    PricePublicObjectDelete = 4
+    PriceParcelClaim = 1
+    PriceParcelClaimFactor = 1
+
+    PriceRentLight = 5
+    TeleportMinPrice = 2
+    TeleportPriceExponent = 2
+    EnergyEfficiency = 1
+    PriceObjectRent = 1
+    PriceObjectScaleFactor = 10
+    PriceParcelRent = 1
+
+[Git]
+Enabled = true
+RepoPath = "git"
+
+;How many seconds between the scheduled commits?
+CommitInterval = 21600
+
+;Disable all except the initial commit?
+DisableNonEssentialCommits = false
+
+;Should we automatically commit when necessary to avoid objects never making it into the repo?
+UseSafetyCommit = true
+
+
+[SVN]
+    Enabled = false
+    Directory = SVNmodule\repo
+    URL = "svn://your.repo.here/"
+    Username = "user"
+    Password = "password"
+    ImportOnStartup = false
+    Autosave = false
+    AutoSavePeriod = 15 ; Number of minutes between autosave backups
+
+
+[XEngine]
+    ; Enable this engine in this OpenSim instance
+    Enabled = true
+
+    ; How many threads to keep alive even if nothing is happening
+    MinThreads = 2
+
+    ; How many threads to start at maximum load
+    MaxThreads = 100
+
+    ; Time a thread must be idle (in seconds) before it dies
+    IdleTimeout = 60
+
+    ; Thread priority ("Lowest", "BelowNormal", "Normal", "AboveNormal", "Highest")
+    Priority = "BelowNormal"
+
+    ; Maximum number of events to queue for a script (excluding timers)
+    MaxScriptEventQueue = 300
+
+    ; Stack size per thread created
+    ThreadStackSize = 262144
+
+    ; Set this to true (the default) to load each script into a separate
+    ; AppDomain. Setting this to false will load all script assemblies into the
+    ; current AppDomain, which will reduce the per-script overhead at the
+    ; expense of reduced security and the inability to garbage collect the
+    ; script assemblies
+    AppDomainLoading = true
+
+    ; Rate to poll for asynchronous command replies (ms)
+    ; currently unused
+    ;AsyncLLCommandLoopms = 50
+
+    ; Save the source of all compiled scripts
+    WriteScriptSourceToDebugFile = false
+
+    ; Default language for scripts
+    DefaultCompileLanguage = lsl
+
+    ; List of allowed languages (lsl,vb,js,cs)
+    ; AllowedCompilers=lsl,cs,js,vb.
+    ; *warning*, non lsl languages have access to static methods such as System.IO.File.  Enable at your own risk.
+    AllowedCompilers=lsl
+
+    ; Compile debug info (line numbers) into the script assemblies
+    CompileWithDebugInformation = true
+
+    ; Allow the user of mod* functions.  This allows a script to pass messages
+    ; to a region module via the modSendCommand() function
+    ; Default is false
+    AllowMODFunctions = false
+
+    ; Allow the use of os* functions (some are dangerous)
+    AllowOSFunctions = false
+    
+    ; Allow the user of LightShare functions
+    AllowLightShareFunctions = false
+
+    ; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe
+    OSFunctionThreatLevel = VeryLow
+
+    ; Interval (s) between background save of script states
+    SaveInterval = 120
+
+    ; Interval (s) between maintenance runs (0 = disable)
+    MaintenanceInterval = 10
+
+    ; Time a script can spend in an event handler before it is interrupted
+    EventLimit = 30
+
+    ; If a script overruns it's event limit, kill the script?
+    KillTimedOutScripts = false
+
+    ; Sets the multiplier for the scripting delays
+    ScriptDelayFactor = 1.0
+
+    ; The factor the 10 m distances llimits are multiplied by
+    ScriptDistanceLimitFactor = 1.0
+
+    ; Maximum length of notecard line read
+    ; Increasing this to large values potentially opens
+    ; up the system to malicious scripters
+    ; NotecardLineReadCharsMax = 255
+
+    ; Sensor settings
+    SensorMaxRange = 96.0
+    SensorMaxResults = 16
+
+    ; OS Functions enable/disable
+    ; For each function, you can add one line, as shown
+    ; The default for all functions allows them if below threat level
+
+    ; true allows the use of the function unconditionally
+    ; Allow_osSetRegionWaterHeight = true
+
+    ; false disables the function completely
+    ; Allow_osSetRegionWaterHeight = false
+
+    ; Comma separated list of UUIDS allows the function for that list of UUIDS
+    ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
+
+    ; You can also use script creators as the uuid
+    ; Creators_osSetRegionWaterHeight = <uuid>, ...
+
+    ; If both Allow_ and Creators_ are given, effective permissions
+    ; are the union of the two.
+
+    ; Allow for llCreateLink and llBreakLink to work without asking for permission
+    ; only enable this in a trusted environment otherwise you may be subject to hijacking
+    ; AutomaticLinkPermission = false
+
+    ; Disable underground movement of prims (default true); set to
+    ; false to allow script controlled underground positioning of
+    ; prims
+    ; DisableUndergroundMovement = true
+
+
+[OpenGridProtocol]
+    ;These are the settings for the Open Grid Protocol..  the Agent Domain, Region Domain,   you know..
+    ;On/true or Off/false
+    ogp_enabled=false
+
+    ;Name Prefix/suffix when using OGP
+    ogp_firstname_prefix=""
+    ogp_lastname_suffix="_EXTERNAL"
+
+
+[Concierge]
+    ; Enable concierge module
+    ; Default is false
+    enabled = false
+
+    ; name of the concierge
+    whoami = "jeeves"
+
+    ; password for updating the welcome message templates via XmlRpc
+    password = SECRET
+
+    ; regex specifying for which regions concierge service is desired; if
+    ; empty, then for all
+    regions = "^MeetingSpace-"
+
+    ; for each region that matches the regions regexp you can provide
+    ; (optionally) a welcome template using format substitution:
+    ; {0} is replaced with the name of the avatar entering the region
+    ; {1} is replaced with the name of the region
+    ; {2} is replaced with the name of the concierge (whoami variable above)
+
+    welcomes = /path/to/welcome/template/directory
+
+    ; Concierge can send attendee lists to an event broker whenever an
+    ; avatar enters or leaves a concierged region. the URL is subject
+    ; to format substitution:
+    ; {0} is replaced with the region's name
+    ; {1} is replaced with the region's UUID
+    broker = "http://broker.place.com/{1}"
+
+
+[RegionReady]
+    ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled
+    ; default is false
+    enabled = false
+
+    ; Channel on which to signal region readiness through a message
+    ; formatted as follows: "{server_startup|oar_file_load},{0|1},n,[oar error]"
+    ; - the first field indicating whether this is an initial server startup
+    ; - the second field is a number indicating whether the OAR file loaded ok (1 == ok, 0 == error)
+    ; - the third field is a number indicating how many scripts failed to compile
+    ; - "oar error" if supplied, provides the error message from the OAR load
+    channel_notify = -800
+
+
+[MRM]
+    ; Enables the Mini Region Modules Script Engine.
+    ; default is false
+    Enabled = false
+
+    ; Runs MRM in a Security Sandbox
+    ; WARNING: DISABLING IS A SECURITY RISK.
+    Sandboxed = true
+
+    ; The level sandbox to use, adjust at your OWN RISK.
+    ; Valid values are:
+    ; *  FullTrust
+    ; *  SkipVerification
+    ; *  Execution
+    ; *  Nothing
+    ; *  LocalIntranet
+    ; *  Internet
+    ; *  Everything
+    SandboxLevel = "Internet"
+
+    ; Only allow Region Owners to run MRMs
+    ; May represent a security risk if you disable this.
+    OwnerOnly = true
+
+[Hypergrid]
+    ; Keep it false for now. Making it true requires the use of a special client in order to access inventory
+    safemode = false
+
+[VivoxVoice]
+    ; The VivoxVoice module will allow you to provide voice on your
+    ; region(s). It uses the same voice technology as the LL grid and
+    ; works with recent LL clients (we have tested 1.22.9.110075, so
+    ; anything later ought to be fine as well).
+    ;
+    ; For this to work you need to obtain an admin account from Vivox
+    ; that allows you to create voice accounts and region channels.
+
+    enabled = false
+
+    ; vivox voice server
+    vivox_server = www.foobar.vivox.com
+
+    ; vivox SIP URI
+    vivox_sip_uri = foobar.vivox.com
+
+    ; vivox admin user name
+    vivox_admin_user = DeepThroat
+
+    ; vivox admin password
+    vivox_admin_password = VoiceG4te
+
+    ; channel type: "channel" or "positional"
+    ; - positional: spatial sound (default)
+    ; - channel: normal "conference call", no spatial sound
+    ;vivox_channel_type = positional
+
+    ; channel characteristics (unless you know what you are doing, i'd
+    ; leave them as they are --- now you WILL muck around with them,
+    ; huh? sigh)
+
+    ; channel distance model:
+    ; 0 - no attenuation
+    ; 1 - inverse distance attenuation
+    ; 2 - linear attenuation (default)
+    ; 3 - exponential attenuation
+    ;vivox_channel_distance_model = 2
+
+    ; channel mode:
+    ; - "open" (default)
+    ; - "lecture"
+    ; - "presentation"
+    ; - "auditorium"
+    ;vivox_channel_mode = "open"
+
+    ; channel roll off: rate of attenuation
+    ; - a value between 1.0 and 4.0, default is 2.0
+    ;vivox_channel_roll_off = 2.0
+
+    ; channel max range: distance at which channel is silent
+    ; - a value between 0 and 160, default is 80
+    ;vivox_channel_max_range = 80
+
+    ; channel clamping distance: distance before attenuation applies
+    ; - a value between 0 and 160, default is 10
+    ;vivox_channel_clamping_distance = 10
+
+[FreeSwitchVoice]
+    ; In order for this to work you need a functioning FreeSWITCH PBX set up.
+    ; Configuration details at http://opensimulator.org/wiki/Freeswitch_Module
+    enabled = false
+    ; FreeSWITCH server is going to contact us and ask us all sorts of things
+    freeswitch_server_user = freeswitch
+    freeswitch_server_pass = password
+    freeswitch_api_prefix = /api
+    ; external IP address of your OpenSim voice enabled region
+    ; note: all regions running on same OpenSim.exe will be enabled
+    freeswitch_service_server = ip.address.of.your.sim
+    ; this should be the same port the region listens on
+    freeswitch_service_port = 9000
+    freeswitch_realm = ip.address.of.freeswitch.server
+    freeswitch_sip_proxy = ip.address.of.freeswitch.server:5060
+    ; STUN = Simple Traversal of UDP through NATs
+    ; See http://wiki.freeswitch.org/wiki/NAT_Traversal
+    ; stun.freeswitch.org is not guaranteed to be running so use it in production at your own risk
+    freeswitch_attempt_stun = false
+    freeswitch_stun_server = ip.address.of.stun.server
+    freeswitch_echo_server = ip.address.of.freeswitch.server
+    freeswitch_echo_port = 50505
+    freeswitch_well_known_ip = ip.address.of.freeswitch.server
+    ;
+    ; Type the address of your http server here, hostname is allowed.  This is provided so you can specify a hostname
+    ; This is used by client for account verification.  By default, it's the same as the freeswitch service server.
+    ;
+    ; opensim_well_known_http_address = Address_Of_Your_SIM_HTTP_Server_Hostname_Allowed
+    ;
+    freeswitch_default_timeout = 5000
+    freeswitch_subscribe_retry = 120
+    ; freeswitch_password_reset_url =
+
+[Groups]
+    Enabled = false
+
+    ; This is the current groups stub in Region.CoreModules.Avatar.Groups.  All the other settings below only really
+    ; apply to the Flotsam/SimianGrid GroupsModule
+    Module  = Default
+
+    ; This module can use a PHP XmlRpc server from the Flotsam project at http://code.google.com/p/flotsam/
+    ; or from the SimianGrid project at http://code.google.com/p/openmetaverse
+    ;Module  = GroupsModule
+
+    ; Enable Group Notices
+    ;NoticesEnabled   = true 
+
+    ; This makes the Groups modules very chatty on the console.
+    DebugEnabled     = false
+
+    ; Specify which messaging module to use for groups messaging and if it's enabled
+    ;MessagingModule = GroupsMessagingModule
+    ;MessagingEnabled = true 
+
+    ; Service connectors to the Groups Service.  Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
+  
+    ; SimianGrid Service for Groups
+    ;ServicesConnectorModule = SimianGroupsServicesConnector
+    ;GroupsServerURI = http://mygridserver.com:82/Grid/
+
+    ; Flotsam XmlRpc Service for Groups
+    ;ServicesConnectorModule = XmlRpcGroupsServicesConnector
+    ;GroupsServerURI        = http://yourxmlrpcserver.com/xmlrpc.php
+
+    ; XmlRpc Security settings.  These must match those set on your backend groups service.
+    ;XmlRpcServiceReadKey    = 1234 
+    ;XmlRpcServiceWriteKey   = 1234 
+
+    ; Disables HTTP Keep-Alive for XmlRpcGroupsServicesConnector HTTP Requests,
+    ; this is a work around fora problem discovered on some Windows based region servers.
+    ; Only disable keep alive if you see a large number (dozens) of the following Exceptions:
+    ; System.Net.WebException: The request was aborted: The request was canceled.
+    ; XmlRpcDisableKeepAlive = false
+
+
+[PacketPool]
+    ; Enables the experimental packet pool. Yes, we've been here before.
+    ;RecyclePackets = true;
+    ;RecycleDataBlocks = true;
+
+
+[InterestManagement]
+     ; This section controls how state updates are prioritized for each client
+     ; Valid values are Time, Distance, SimpleAngularDistance, and FrontBack
+     UpdatePrioritizationScheme = FrontBack
+     ReprioritizationEnabled = true
+     ReprioritizationInterval = 2000.0
+     RootReprioritizationDistance = 10.0
+     ChildReprioritizationDistance = 20.0
+
+
+[WebStats]
+; View region statistics via a web page
+; See http://opensimulator.org/wiki/FAQ#Region_Statistics_on_a_Web_Page
+; Use a web browser and type in the "Login URI" + "/SStats/"
+; For example- http://127.0.0.1:9000/SStats/
+; enabled=false
+
+[LandManagement]
+; DefaultAdministratorGroupUUID = "";
+; DefaultAdministratorParcelName = "";
+
+[MediaOnAPrim]
+    ; Enable media on a prim facilities
+    Enabled = true;
+
+[MOTD]
+Enabled = false
+Message = "The MOTD module is working!"
+
+
+;;
+;; These are defaults that are overwritten below in [Architecture].
+;; These defaults allow OpenSim to work out of the box with
+;; zero configuration
+;;
+[AssetService]
+    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
+    AssetLoaderArgs = "assets/AssetSets.xml"
+
+    ; Disable this to prevent the default asset set from being inserted into the
+    ; asset store each time the region starts
+    AssetLoaderEnabled = true
+
+[GridService]
+    ;; default standalone, overridable in StandaloneCommon.ini
+    StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+
+    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+    ;; The following is the configuration section for the new style services
+    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[Architecture]
+    ; Choose exactly one and only one of the architectures below.
+
+    Include-Standalone      = "config-include/Standalone.ini"
+    ;Include-HGStandalone    = "config-include/StandaloneHypergrid.ini"
+    ;Include-Grid            = "config-include/Grid.ini"
+    ;Include-HGGrid          = "config-include/GridHypergrid.ini"
+    ;Include-SimianGrid      = "config-include/SimianGrid.ini"
+    ;Include-HyperSimianGrid = "config-include/HyperSimianGrid.ini"
+
+    ; Then choose
+    ; config-include/StandaloneCommon.ini.example (if you're in standlone) OR
+    ; config-include/GridCommon.ini.example (if you're connected to a grid)
+    ; Copy to your own .ini there (without .example extension) and edit it
+    ; to customize your data
+
+
+    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+    ;; The below pulls in optional module config files
+    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[Modules]
+    Include-modules = "addon-modules/*/config/*.ini"
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; ENSURE [Architecture] and [Modules] Sections with their "includes"
+;; are last to allow for overrides
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/bin/Physics/OpenSim.Region.Physics.UbitOdePlugin.dll.config b/bin/Physics/OpenSim.Region.Physics.UbitOdePlugin.dll.config
new file mode 100644
index 0000000..c72c281
--- /dev/null
+++ b/bin/Physics/OpenSim.Region.Physics.UbitOdePlugin.dll.config
@@ -0,0 +1,7 @@
+<configuration>
+  <dllmap os="osx" dll="ode" target="lib64/libode.dylib" />
+  <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="ode" target="lib64/libode-x86_64" />
+  <dllmap os="!windows,osx" cpu="x86" dll="ode" target="lib32/libode" />
+  <dllmap os="!windows,osx" cpu="ppc64" dll="ode" target="lib64/libode-ppc64" />
+  <dllmap os="!windows,osx" cpu="s390x" dll="ode" target="lib64/libode-s390x" />
+</configuration>
diff --git a/bin/assets/TexturesAssetSet/defaultalpha.jp2 b/bin/assets/TexturesAssetSet/defaultalpha.jp2
new file mode 100644
index 0000000..af73c1e
--- /dev/null
+++ b/bin/assets/TexturesAssetSet/defaultalpha.jp2
diff --git a/bin/lib32/libode.so b/bin/lib32/libode.so
index 6bb85fb..5b110ae 100644..100755
--- a/bin/lib32/libode.so
+++ b/bin/lib32/libode.so
diff --git a/bin/lib32/ode.dll b/bin/lib32/ode.dll
index f310358..c3263ae 100755
--- a/bin/lib32/ode.dll
+++ b/bin/lib32/ode.dll
diff --git a/bin/lib64/ode.dll b/bin/lib64/ode.dll
index df3a6c4..6f5b504 100755
--- a/bin/lib64/ode.dll
+++ b/bin/lib64/ode.dll
diff --git a/prebuild.xml b/prebuild.xml
index 68a9539..2bee760 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -6,7 +6,7 @@
         <CompilerDefines>TRACE;DEBUG</CompilerDefines>
         <OptimizeCode>false</OptimizeCode>
         <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
-        <AllowUnsafe>false</AllowUnsafe>
+        <AllowUnsafe>true</AllowUnsafe>
         <WarningLevel>4</WarningLevel>
         <WarningsAsErrors>false</WarningsAsErrors>
         <SuppressWarnings/>
@@ -21,7 +21,7 @@
         <CompilerDefines>TRACE</CompilerDefines>
         <OptimizeCode>true</OptimizeCode>
         <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
-        <AllowUnsafe>false</AllowUnsafe>
+        <AllowUnsafe>true</AllowUnsafe>
         <WarningLevel>4</WarningLevel>
         <WarningsAsErrors>false</WarningsAsErrors>
         <SuppressWarnings/>
@@ -191,6 +191,7 @@
       <Reference name="XMLRPC" path="../../../../bin/"/>
       <Reference name="log4net" path="../../../../bin/"/>
       <Reference name="HttpServer_OpenSim" path="../../../../bin/"/>
+      <Reference name="SmartThreadPool"/>
 
       <Files>
         <Match pattern="*.cs" recurse="true">
@@ -558,6 +559,93 @@
       </Files>
     </Project>
 
+    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Core"/>
+      <Reference name="System.Data"/>
+      <Reference name="System.Xml"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true">
+          <Exclude name="Tests" pattern="Tests"/>
+        </Match>
+      </Files>
+    </Project>
+
+ <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ChOdePlugin" path="OpenSim/Region/Physics/ChOdePlugin" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../../bin/Physics/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../../bin/Physics/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Core"/>
+      <Reference name="OpenMetaverseTypes.dll"/>
+      <Reference name="Nini.dll" />
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/>
+      <Reference name="Ode.NET.dll" />    
+      <Reference name="log4net.dll"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true">
+          <Exclude name="Tests" pattern="Tests"/>
+        </Match>
+      </Files>
+    </Project>
+
+   <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.UbitOdePlugin" path="OpenSim/Region/Physics/UbitOdePlugin" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../../bin/Physics/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../../bin/Physics/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Core"/>
+      <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
+      <Reference name="Nini" path="../../../../bin/"/>
+
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/>
+      <Reference name="log4net" path="../../../../bin/"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true">
+          <Exclude name="Tests" pattern="Tests"/>
+        </Match>
+      </Files>
+    </Project>  
+        
     <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.Meshing" path="OpenSim/Region/Physics/Meshing" type="Library">
       <Configuration name="Debug">
         <Options>
@@ -589,6 +677,38 @@
       </Files>
     </Project>
 
+    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.UbitMeshing" path="OpenSim/Region/Physics/UbitMeshing" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../../bin/Physics/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../../bin/Physics/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Drawing"/>
+      <Reference name="CSJ2K" path="../../../../bin/"/>
+      <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
+      <Reference name="OpenMetaverse" path="../../../../bin/"/>
+      <Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/>
+      <Reference name="Nini" path="../../../../bin/"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/>
+      <Reference name="log4net" path="../../../../bin/"/>
+      <Reference name="zlib.net" path="../../../../bin/"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
     <Project frameworkVersion="v3_5" name="OpenSim.Capabilities" path="OpenSim/Capabilities" type="Library">
       <Configuration name="Debug">
         <Options>
@@ -996,6 +1116,7 @@
       <Reference name="OpenSim.Server.Base"/>
       <Reference name="OpenSim.Services.Interfaces"/>
       <Reference name="OpenSim.Services.Base"/>
+      <Reference name="OpenSim.Server.Base"/>
       <Reference name="OpenSim.Services.Connectors"/>
       <Reference name="OpenSim.Data"/>
       <Reference name="Nini" path="../../../bin/"/>
@@ -1486,13 +1607,15 @@
       <Reference name="System.Drawing"/>
       <Reference name="System.Xml"/>
       <Reference name="System.Web"/>
+      <Reference name="OpenMetaverse" path="../../../../../bin/"/>
       <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/>
       <Reference name="OpenMetaverse.StructuredData" path="../../../../../bin/"/>
-      <Reference name="OpenMetaverse" path="../../../../../bin/"/>
+
       <Reference name="OpenSim.Region.Framework"/>
       <Reference name="OpenSim.Capabilities"/>
       <Reference name="OpenSim.Capabilities.Handlers"/>
       <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Monitoring"/>
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
       <Reference name="OpenSim.Framework.Console"/>
@@ -1502,6 +1625,7 @@
       <Reference name="Nini" path="../../../../../bin/"/>
       <Reference name="log4net" path="../../../../../bin/"/>
       <Reference name="Nini" path="../../../../../bin/"/>
+      <Reference name="zlib.net" path="../../../../../bin/"/>
 
       <Files>
         <Match pattern="*.cs" recurse="true">
@@ -1568,6 +1692,7 @@
 
       <!-- To allow regions to have mono addins -->
       <Reference name="Mono.Addins" path="../../../bin/"/>
+      <Reference name="SmartThreadPool"/>
 
       <Files>
         <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
@@ -2298,6 +2423,7 @@
 
       <ReferencePath>../../../../../../bin/</ReferencePath>
       <Reference name="System"/>
+      <Reference name="System.Core"/>
       <Reference name="System.Data"/>
       <Reference name="System.Web"/>
       <Reference name="System.Xml"/>
diff --git a/runprebuild.bat b/runprebuild.bat
index 8927e9a..9265391 100755
--- a/runprebuild.bat
+++ b/runprebuild.bat
@@ -1,4 +1,4 @@
 bin\Prebuild.exe /target nant
 bin\Prebuild.exe /target vs2008
-echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild opensim.sln > compile.bat
+echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild OpenSim.sln > compile.bat